summaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorJeenu Viswambharan <jeenu.viswambharan@arm.com>2014-03-11 11:06:45 +0000
committerDan Handley <dan.handley@arm.com>2014-03-20 11:16:23 +0000
commit9f98aa1a7e33dd55851fd4feec0de9b40b6d9f10 (patch)
treebc3138bc69671cee12ca01c7dd46c1d45c36c7d7 /bl31
parent52538b9b3e1fcaa96a1bb466c86a35199d4fea67 (diff)
Specify image entry in linker script
At present, the entry point for each BL image is specified via the Makefiles and provided on the command line to the linker. When using a link script the entry point should rather be specified via the ENTRY() directive in the link script. This patch updates linker scripts of all BL images to specify the entry point using the ENTRY() directive. It also removes the --entry flag passed to the linker through Makefile. Fixes issue ARM-software/tf-issues#66 Change-Id: I1369493ebbacea31885b51185441f6b628cf8da0
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31.ld.S1
-rw-r--r--bl31/bl31.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 0a78c41a..844f1696 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -32,6 +32,7 @@
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
+ENTRY(bl31_entrypoint)
MEMORY {
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 8f6998c6..dffe3368 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -69,5 +69,4 @@ BL31_SOURCES += bl31_arch_setup.c \
context_mgmt.c \
context.S
-BL31_ENTRY_POINT := bl31_entrypoint
BL31_LINKERFILE := bl31.ld.S