From 46514c2b877c29c2d7c2061a9785736e270c0c62 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 11 Jun 2020 11:59:07 -0700 Subject: treewide: Add Kconfig variable MEMLAYOUT_LD_FILE This change defines a Kconfig variable MEMLAYOUT_LD_FILE which allows SoC/mainboard to provide a linker file for the platform. x86 already provides a default memlayout.ld under src/arch/x86. With this new Kconfig variable, it is possible for the SoC/mainboard code for x86 to provide a custom linker file as well. Makefile.inc is updated for all architectures to use this new Kconfig variable instead of assuming memlayout.ld files under a certain path. All non-x86 boards used memlayout.ld under mainboard directory. However, a lot of these boards were simply including the memlayout from SoC. So, this change also updates these mainboards and SoCs to define the Kconfig as required. BUG=b:155322763 TEST=Verified that abuild with --timeless option results in the same coreboot.rom image for all boards. Change-Id: I6a7f96643ed0519c93967ea2c3bcd881a5d6a4d6 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/42292 Reviewed-by: Paul Menzel Reviewed-by: Raul Rangel Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) --- src/mainboard/emulation/qemu-riscv/Kconfig | 4 ++++ src/mainboard/emulation/qemu-riscv/Makefile.inc | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard/emulation/qemu-riscv') diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig index 66aa599864..5b556fc190 100644 --- a/src/mainboard/emulation/qemu-riscv/Kconfig +++ b/src/mainboard/emulation/qemu-riscv/Kconfig @@ -30,6 +30,10 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_UART_8250MEM select RISCV_HAS_OPENSBI +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/emulation/qemu-riscv/memlayout.ld" + config MAINBOARD_DIR string default "emulation/qemu-riscv" diff --git a/src/mainboard/emulation/qemu-riscv/Makefile.inc b/src/mainboard/emulation/qemu-riscv/Makefile.inc index 7ca7e5930c..1a8342d2ca 100644 --- a/src/mainboard/emulation/qemu-riscv/Makefile.inc +++ b/src/mainboard/emulation/qemu-riscv/Makefile.inc @@ -13,8 +13,4 @@ ramstage-y += uart.c ramstage-y += rom_media.c ramstage-y += clint.c -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld - CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include -- cgit v1.2.3