From 25cff83ee4300f26d5b7661ad6359525aaa36b94 Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Mon, 13 Jan 2014 12:37:03 +0000 Subject: Build system: Fixes #2: Add multi-platform support Move all explicit platform or architecture specific references into a new platform.mk file that is defined for each platform. Change-Id: I9d6320d1ba957e0cc8d9b316b3578132331fa428 Signed-off-by: Ryan Harkin --- bl1/bl1.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'bl1/bl1.mk') diff --git a/bl1/bl1.mk b/bl1/bl1.mk index 68a7ef72..012967a9 100644 --- a/bl1/bl1.mk +++ b/bl1/bl1.mk @@ -28,19 +28,21 @@ # POSSIBILITY OF SUCH DAMAGE. # -vpath %.c drivers/arm/interconnect/cci-400/ plat/fvp \ - plat/fvp/${ARCH} drivers/arm/peripherals/pl011 common/ lib/ \ - lib/semihosting arch/aarch64/ lib/stdlib +vpath %.c plat/${PLAT} plat/${PLAT}/${ARCH} \ + common/ lib/ arch/${ARCH} \ + ${PLAT_BL1_C_VPATH} -vpath %.S arch/${ARCH}/cpu plat/common/aarch64 \ - plat/fvp/${ARCH} lib/semihosting/aarch64 \ - include/ lib/arch/aarch64 +vpath %.S arch/${ARCH}/cpu plat/common/${ARCH} \ + plat/${PLAT}/${ARCH} \ + include/ lib/arch/${ARCH} \ + ${PLAT_BL1_S_VPATH} + +BL1_OBJS += bl1_arch_setup.o \ + bl1_entrypoint.o \ + early_exceptions.o \ + bl1_main.o \ + cpu_helpers.o -BL1_ASM_OBJS := bl1_entrypoint.o bl1_plat_helpers.o cpu_helpers.o -BL1_C_OBJS := bl1_main.o cci400.o bl1_plat_setup.o bl1_arch_setup.o \ - fvp_common.o fvp_helpers.o early_exceptions.o BL1_ENTRY_POINT := reset_handler BL1_MAPFILE := bl1.map BL1_LINKERFILE := bl1.ld - -BL1_OBJS := $(BL1_C_OBJS) $(BL1_ASM_OBJS) -- cgit v1.2.3