diff options
| author | Chris Kay <chris.kay@arm.com> | 2023-01-16 16:53:45 +0000 |
|---|---|---|
| committer | Chris Kay <chris.kay@arm.com> | 2023-02-10 17:01:46 +0000 |
| commit | 82274936374bf630bf5256370e93a531fdda6372 (patch) | |
| tree | d40922c4ed0df403d503efaac3a20f75fc080544 /services | |
| parent | f90fe02f061b8a203391e566682221396b656c6f (diff) | |
| download | arm-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 'services')
| -rw-r--r-- | services/std_svc/rmmd/trp/linker.ld.S (renamed from services/std_svc/rmmd/trp/linker.lds) | 5 | ||||
| -rw-r--r-- | services/std_svc/rmmd/trp/trp.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/std_svc/rmmd/trp/linker.lds b/services/std_svc/rmmd/trp/linker.ld.S index 2b7f38333..9895cf9f8 100644 --- a/services/std_svc/rmmd/trp/linker.lds +++ b/services/std_svc/rmmd/trp/linker.ld.S @@ -1,6 +1,7 @@ /* - * (C) COPYRIGHT 2021 Arm Limited or its affiliates. - * ALL RIGHTS RESERVED + * Copyright (c) 2021-2023, Arm Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause */ #include <common/bl_common.ld.h> diff --git a/services/std_svc/rmmd/trp/trp.mk b/services/std_svc/rmmd/trp/trp.mk index 44bbf226f..e511bf5d1 100644 --- a/services/std_svc/rmmd/trp/trp.mk +++ b/services/std_svc/rmmd/trp/trp.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2021-2022 Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2021-2023 Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -8,7 +8,7 @@ RMM_SOURCES += services/std_svc/rmmd/trp/trp_entry.S \ services/std_svc/rmmd/trp/trp_main.c \ services/std_svc/rmmd/trp/trp_helpers.c -RMM_LINKERFILE := services/std_svc/rmmd/trp/linker.lds +RMM_DEFAULT_LINKER_SCRIPT_SOURCE := services/std_svc/rmmd/trp/linker.ld.S # Include the platform-specific TRP Makefile # If no platform-specific TRP Makefile exists, it means TRP is not supported |