Skip to content

Commit a58f559

Browse files
Sahil-Malpekarchetan-rathore
authored andcommitted
fix(baremetal): single linker script for ACS firmware
- replace per-suite BM linker scripts with shared acs_bm_image.ld.S Signed-off-by: Sahil Shakil Malpekar <Sahil.ShakilMalpekar@arm.com> Change-Id: I19d6ea1164bee5b8ad3eaa14c0783a3e6a15d887
1 parent 5608dd3 commit a58f559

4 files changed

Lines changed: 5 additions & 164 deletions

File tree

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @file
22
* Copyright (c) 2026, Arm Limited or its affiliates. All rights reserved.
33
* SPDX-License-Identifier : Apache-2.0
4-
4+
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
@@ -17,6 +17,9 @@
1717

1818
#include "acs.h"
1919

20+
/*
21+
* Shared bare-metal ACS image layout used by all firmware payloads.
22+
*/
2023
IMAGE_BASE = PLATFORM_HOST_IMAGE_BASE;
2124
OUTPUT_FORMAT(elf64-littleaarch64)
2225
OUTPUT_ARCH(aarch64)

tools/cmake/infra/bsa_image.ld.S

Lines changed: 0 additions & 81 deletions
This file was deleted.

tools/cmake/infra/sbsa_image.ld.S

Lines changed: 0 additions & 81 deletions
This file was deleted.

tools/cmake/toolchain/linker.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set(GNUARM_OBJDUMP_FLAGS "-dSx")
3636
set(GNUARM_OBJCOPY_FLAGS "-Obinary")
3737

3838
function (create_executable EXE_NAME OUTPUT_DIR TEST)
39-
set(SCATTER_INPUT_FILE "${ROOT_DIR}/tools/cmake/infra/${EXE_NAME}_image.ld.S")
39+
set(SCATTER_INPUT_FILE "${ROOT_DIR}/tools/cmake/infra/acs_bm_image.ld.S")
4040
set(SCATTER_OUTPUT_FILE "${OUTPUT_DIR}/${EXE_NAME}_image.ld")
4141

4242
add_custom_command(OUTPUT CPP-LD--${EXE_NAME}${TEST}

0 commit comments

Comments
 (0)