Skip to content

GitLab

Commit 23be96cb authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "plat/rockchip: Use common gicv2.mk" into integration

parents 4e5c3104 c414019b
Show whitespace changes
Inline Side-by-side
plat/rockchip/px30/platform.mk
View file @ 23be96cb
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#SPDX-License-Identifier: BSD-3-Clause #SPDX-License-Identifier: BSD-3-Clause
# #
include drivers/arm/gic/v2/gicv2.mk
RK_PLAT := plat/rockchip RK_PLAT := plat/rockchip
RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_SOC := ${RK_PLAT}/${PLAT}
...@@ -24,9 +25,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ ...@@ -24,9 +25,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \
-I${RK_PLAT_SOC}/drivers/soc/ \ -I${RK_PLAT_SOC}/drivers/soc/ \
-I${RK_PLAT_SOC}/include/ -I${RK_PLAT_SOC}/include/
RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ RK_GIC_SOURCES := ${GICV2_SOURCES} \
drivers/arm/gic/v2/gicv2_main.c \
drivers/arm/gic/v2/gicv2_helpers.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
plat/common/aarch64/crash_console_helpers.S \ plat/common/aarch64/crash_console_helpers.S \
${RK_PLAT}/common/rockchip_gicv2.c ${RK_PLAT}/common/rockchip_gicv2.c
......
plat/rockchip/rk3288/platform.mk
View file @ 23be96cb
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
include drivers/arm/gic/v2/gicv2.mk
ARM_CORTEX_A12 := yes ARM_CORTEX_A12 := yes
ARM_ARCH_MAJOR := 7 ARM_ARCH_MAJOR := 7
...@@ -24,9 +26,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ ...@@ -24,9 +26,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \
-I${RK_PLAT_SOC}/include/ \ -I${RK_PLAT_SOC}/include/ \
-I${RK_PLAT_SOC}/include/shared/ \ -I${RK_PLAT_SOC}/include/shared/ \
RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ RK_GIC_SOURCES := ${GICV2_SOURCES} \
drivers/arm/gic/v2/gicv2_main.c \
drivers/arm/gic/v2/gicv2_helpers.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
${RK_PLAT}/common/rockchip_gicv2.c ${RK_PLAT}/common/rockchip_gicv2.c
......
plat/rockchip/rk3328/platform.mk
View file @ 23be96cb
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
include drivers/arm/gic/v2/gicv2.mk
RK_PLAT := plat/rockchip RK_PLAT := plat/rockchip
RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_SOC := ${RK_PLAT}/${PLAT}
RK_PLAT_COMMON := ${RK_PLAT}/common RK_PLAT_COMMON := ${RK_PLAT}/common
...@@ -22,9 +24,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ ...@@ -22,9 +24,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \
-I${RK_PLAT_SOC}/drivers/soc/ \ -I${RK_PLAT_SOC}/drivers/soc/ \
-I${RK_PLAT_SOC}/include/ -I${RK_PLAT_SOC}/include/
RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ RK_GIC_SOURCES := ${GICV2_SOURCES} \
drivers/arm/gic/v2/gicv2_main.c \
drivers/arm/gic/v2/gicv2_helpers.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
${RK_PLAT}/common/rockchip_gicv2.c ${RK_PLAT}/common/rockchip_gicv2.c
......
plat/rockchip/rk3368/platform.mk
View file @ 23be96cb
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
include drivers/arm/gic/v2/gicv2.mk
RK_PLAT := plat/rockchip RK_PLAT := plat/rockchip
RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_SOC := ${RK_PLAT}/${PLAT}
RK_PLAT_COMMON := ${RK_PLAT}/common RK_PLAT_COMMON := ${RK_PLAT}/common
...@@ -20,9 +22,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ ...@@ -20,9 +22,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \
-I${RK_PLAT_SOC}/drivers/ddr/ \ -I${RK_PLAT_SOC}/drivers/ddr/ \
-I${RK_PLAT_SOC}/include/ -I${RK_PLAT_SOC}/include/
RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ RK_GIC_SOURCES := ${GICV2_SOURCES} \
drivers/arm/gic/v2/gicv2_main.c \
drivers/arm/gic/v2/gicv2_helpers.c \
plat/common/plat_gicv2.c \ plat/common/plat_gicv2.c \
${RK_PLAT}/common/rockchip_gicv2.c ${RK_PLAT}/common/rockchip_gicv2.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment