diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-10-10 08:11:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-11 16:46:25 +0200 |
| commit | 97e721a5d6a94422115bcce6bf2d8e822284212f (patch) | |
| tree | bac95f25f5213906d63b3f18cdad52e0cdd8bd47 /arch/riscv | |
| parent | a857444f4326491297163ba7e53ca98fde2988d4 (diff) | |
| download | barebox-97e721a5d6a94422115bcce6bf2d8e822284212f.tar.gz barebox-97e721a5d6a94422115bcce6bf2d8e822284212f.tar.xz | |
lds: move OUTPUT_FORMAT/ARCH definition into header
In order to allow us having architecture-indepenent linker scripts, move
the definition for the format and the architecture into the new
<asm/barebox.lds.h> header file.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20221010061122.2084009-7-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/include/asm/barebox.lds.h | 7 | ||||
| -rw-r--r-- | arch/riscv/lib/barebox.lds.S | 8 | ||||
| -rw-r--r-- | arch/riscv/lib/pbl.lds.S | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/arch/riscv/include/asm/barebox.lds.h b/arch/riscv/include/asm/barebox.lds.h index 540d740959..0fa05df6ff 100644 --- a/arch/riscv/include/asm/barebox.lds.h +++ b/arch/riscv/include/asm/barebox.lds.h @@ -1,3 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#define BAREBOX_OUTPUT_ARCH "riscv" +#ifdef CONFIG_64BIT +#define BAREBOX_OUTPUT_FORMAT "elf64-littleriscv" +#else +#define BAREBOX_OUTPUT_FORMAT "elf32-littleriscv" +#endif + #include <asm-generic/barebox.lds.h> diff --git a/arch/riscv/lib/barebox.lds.S b/arch/riscv/lib/barebox.lds.S index 5de32a47e7..101615ab05 100644 --- a/arch/riscv/lib/barebox.lds.S +++ b/arch/riscv/lib/barebox.lds.S @@ -13,13 +13,9 @@ #include <asm/barebox.lds.h> -OUTPUT_ARCH(riscv) +OUTPUT_ARCH(BAREBOX_OUTPUT_ARCH) ENTRY(start) -#ifdef CONFIG_64BIT -OUTPUT_FORMAT("elf64-littleriscv") -#else -OUTPUT_FORMAT("elf32-littleriscv") -#endif +OUTPUT_FORMAT(BAREBOX_OUTPUT_FORMAT) SECTIONS { . = 0x0; diff --git a/arch/riscv/lib/pbl.lds.S b/arch/riscv/lib/pbl.lds.S index ba59024ae0..0fe7dfda8e 100644 --- a/arch/riscv/lib/pbl.lds.S +++ b/arch/riscv/lib/pbl.lds.S @@ -5,12 +5,8 @@ #include <asm/barebox.lds.h> #include <asm-generic/memory_layout.h> -OUTPUT_ARCH(riscv) -#ifdef CONFIG_64BIT -OUTPUT_FORMAT("elf64-littleriscv") -#else -OUTPUT_FORMAT("elf32-littleriscv") -#endif +OUTPUT_ARCH(BAREBOX_OUTPUT_ARCH) +OUTPUT_FORMAT(BAREBOX_OUTPUT_FORMAT) SECTIONS { . = 0x0; |