aboutsummaryrefslogtreecommitdiff
path: root/bl31/bl31.mk
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2014-02-12 15:54:48 +0000
committerDan Handley <dan.handley@arm.com>2014-03-05 16:21:14 +0000
commit6d55d109a31139c316b28b1b4b307a9f1ec0924d (patch)
treef807b6849d04f252736b1443169f83b8e5519b1a /bl31/bl31.mk
parentcf6eeb8a60bfb8c6b2e49c3839eed173d814f2ba (diff)
downloadtrusted-firmware-a-6d55d109a31139c316b28b1b4b307a9f1ec0924d.tar.gz
Update Makefiles to get proper dependency checking working.
This change requires all platforms to now specify a list of source files rather than object files. New source files should preferably be specified by using the path as well and we should add this in the future for all files so we can remove use of vpath. This is desirable because vpath hides issues like the fact that BL2 currently pulls in a BL1 file bl1/aarch64/early_exceptions.S and if in the future we added bl2/aarch64/early_exceptions.S then it's likely only one of the two version would be used for both bootloaders. This change also removes the 'dump' build target and simply gets bootloaders to always generate a dump file. At the same time the -x option is added so the section headers and symbols table are listed. Fixes ARM-software/tf-issues#11 Change-Id: Ie38f7be76fed95756c8576cf3f3ea3b7015a18dc Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'bl31/bl31.mk')
-rw-r--r--bl31/bl31.mk39
1 files changed, 19 insertions, 20 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 1522b8399d..5bc58c5978 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -47,25 +47,24 @@ vpath %.S lib/arch/${ARCH} \
arch/system/gic/${ARCH} \
${PLAT_BL31_S_VPATH}
-BL31_OBJS += bl31_arch_setup.o \
- bl31_entrypoint.o \
- runtime_exceptions.o \
- bl31_main.o \
- psci_entry.o \
- psci_setup.o \
- psci_common.o \
- psci_afflvl_on.o \
- psci_main.o \
- psci_afflvl_off.o \
- psci_afflvl_suspend.o \
- spinlock.o \
- gic_v3_sysregs.o \
- bakery_lock.o \
- runtime_svc.o \
- early_exceptions.o \
- context_mgmt.o \
- context.o
+BL31_SOURCES += bl31_arch_setup.c \
+ bl31_entrypoint.S \
+ runtime_exceptions.S \
+ bl31_main.c \
+ psci_entry.S \
+ psci_setup.c \
+ psci_common.c \
+ psci_afflvl_on.c \
+ psci_main.c \
+ psci_afflvl_off.c \
+ psci_afflvl_suspend.c \
+ spinlock.S \
+ gic_v3_sysregs.S \
+ bakery_lock.c \
+ runtime_svc.c \
+ early_exceptions.S \
+ context_mgmt.c \
+ context.S
BL31_ENTRY_POINT := bl31_entrypoint
-BL31_MAPFILE := bl31.map
-BL31_LINKERFILE := bl31.ld
+BL31_LINKERFILE := bl31.ld.S