diff --git a/plat/rockchip/px30/platform.mk b/plat/rockchip/px30/platform.mk index b1bb80701..d14ffc4d6 100644 --- a/plat/rockchip/px30/platform.mk +++ b/plat/rockchip/px30/platform.mk @@ -4,6 +4,7 @@ #SPDX-License-Identifier: BSD-3-Clause # +include drivers/arm/gic/v2/gicv2.mk RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} @@ -24,9 +25,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ -I${RK_PLAT_SOC}/drivers/soc/ \ -I${RK_PLAT_SOC}/include/ -RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v2/gicv2_main.c \ - drivers/arm/gic/v2/gicv2_helpers.c \ +RK_GIC_SOURCES := ${GICV2_SOURCES} \ plat/common/plat_gicv2.c \ plat/common/aarch64/crash_console_helpers.S \ ${RK_PLAT}/common/rockchip_gicv2.c diff --git a/plat/rockchip/rk3288/platform.mk b/plat/rockchip/rk3288/platform.mk index faf7a1520..b8dd1953d 100644 --- a/plat/rockchip/rk3288/platform.mk +++ b/plat/rockchip/rk3288/platform.mk @@ -4,6 +4,8 @@ # SPDX-License-Identifier: BSD-3-Clause # +include drivers/arm/gic/v2/gicv2.mk + ARM_CORTEX_A12 := yes ARM_ARCH_MAJOR := 7 @@ -24,9 +26,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -I${RK_PLAT_SOC}/include/ \ -I${RK_PLAT_SOC}/include/shared/ \ -RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v2/gicv2_main.c \ - drivers/arm/gic/v2/gicv2_helpers.c \ +RK_GIC_SOURCES := ${GICV2_SOURCES} \ plat/common/plat_gicv2.c \ ${RK_PLAT}/common/rockchip_gicv2.c diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk index 5a307e491..5b4766d51 100644 --- a/plat/rockchip/rk3328/platform.mk +++ b/plat/rockchip/rk3328/platform.mk @@ -4,6 +4,8 @@ # SPDX-License-Identifier: BSD-3-Clause # +include drivers/arm/gic/v2/gicv2.mk + RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common @@ -22,9 +24,7 @@ PLAT_INCLUDES := -Idrivers/arm/gic/common/ \ -I${RK_PLAT_SOC}/drivers/soc/ \ -I${RK_PLAT_SOC}/include/ -RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v2/gicv2_main.c \ - drivers/arm/gic/v2/gicv2_helpers.c \ +RK_GIC_SOURCES := ${GICV2_SOURCES} \ plat/common/plat_gicv2.c \ ${RK_PLAT}/common/rockchip_gicv2.c diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk index e78729357..e6c62def0 100644 --- a/plat/rockchip/rk3368/platform.mk +++ b/plat/rockchip/rk3368/platform.mk @@ -4,6 +4,8 @@ # SPDX-License-Identifier: BSD-3-Clause # +include drivers/arm/gic/v2/gicv2.mk + RK_PLAT := plat/rockchip RK_PLAT_SOC := ${RK_PLAT}/${PLAT} RK_PLAT_COMMON := ${RK_PLAT}/common @@ -20,9 +22,7 @@ PLAT_INCLUDES := -I${RK_PLAT_COMMON}/ \ -I${RK_PLAT_SOC}/drivers/ddr/ \ -I${RK_PLAT_SOC}/include/ -RK_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ - drivers/arm/gic/v2/gicv2_main.c \ - drivers/arm/gic/v2/gicv2_helpers.c \ +RK_GIC_SOURCES := ${GICV2_SOURCES} \ plat/common/plat_gicv2.c \ ${RK_PLAT}/common/rockchip_gicv2.c