summaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorChris Kay <chris.kay@arm.com>2023-01-16 16:53:45 +0000
committerChris Kay <chris.kay@arm.com>2023-02-10 17:01:46 +0000
commit82274936374bf630bf5256370e93a531fdda6372 (patch)
treed40922c4ed0df403d503efaac3a20f75fc080544 /bl31
parentf90fe02f061b8a203391e566682221396b656c6f (diff)
downloadarm-trusted-firmware-82274936374bf630bf5256370e93a531fdda6372.tar.gz
build: clarify linker script generation
The following build system variables have been renamed: - `LINKERFILE` -> `DEFAULT_LINKER_SCRIPT` - `BL_LINKERFILE` -> `DEFAULT_LINKER_SCRIPT_SOURCE` - `<IMAGE>_LINKERFILE` -> `<IMAGE>_DEFAULT_LINKER_SCRIPT_SOURCE` These new names better reflect how each variable is used: 1. the default linker script is passed via `-dT` instead of `-T` 2. linker script source files are first preprocessed Additionally, linker scripts are now placed in the build directory relative to where they exist in the source directory. For example, the `bl32/sp_min/sp_min.ld.S` would now preprocess to `sp_min/sp_min.ld` instead of just `bl32.ld` BREAKING-CHANGE: The `LINKERFILE`, `BL_LINKERFILE` and `<IMAGE_LINKERFILE>` build system variables have been renamed. See the commit message for more information. Change-Id: If8cef65dcb8820e8993736702c8741e97a66e6cc Signed-off-by: Chris Kay <chris.kay@arm.com>
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index ac15f9f58..e6609fe86 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -157,7 +157,7 @@ BL31_SOURCES += services/std_svc/drtm/drtm_main.c \
${MBEDTLS_SOURCES}
endif
-BL31_LINKERFILE := bl31/bl31.ld.S
+BL31_DEFAULT_LINKER_SCRIPT_SOURCE := bl31/bl31.ld.S
# Flag used to indicate if Crash reporting via console should be included
# in BL31. This defaults to being present in DEBUG builds only