From 97e721a5d6a94422115bcce6bf2d8e822284212f Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 10 Oct 2022 08:11:18 +0200 Subject: 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 header file. Signed-off-by: Ahmad Fatoum Link: https://lore.barebox.org/20221010061122.2084009-7-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer --- arch/riscv/include/asm/barebox.lds.h | 7 +++++++ arch/riscv/lib/barebox.lds.S | 8 ++------ arch/riscv/lib/pbl.lds.S | 8 ++------ 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'arch/riscv') 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 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 -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 #include -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; -- cgit v1.2.1