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/opencellular/elgon/Makefile.inc | 4 ---- src/mainboard/opencellular/elgon/memlayout.ld | 1 - 2 files changed, 5 deletions(-) delete mode 100644 src/mainboard/opencellular/elgon/memlayout.ld (limited to 'src/mainboard/opencellular/elgon') diff --git a/src/mainboard/opencellular/elgon/Makefile.inc b/src/mainboard/opencellular/elgon/Makefile.inc index 6b019825ab..c938289db8 100644 --- a/src/mainboard/opencellular/elgon/Makefile.inc +++ b/src/mainboard/opencellular/elgon/Makefile.inc @@ -1,18 +1,14 @@ ## SPDX-License-Identifier: GPL-2.0-only bootblock-y += bootblock.c -bootblock-y += memlayout.ld bootblock-y += death.c -romstage-y += memlayout.ld romstage-y += romstage.c romstage-y += bdk_devicetree.c romstage-y += death.c ramstage-y += mainboard.c -ramstage-y += memlayout.ld ramstage-y += bdk_devicetree.c ramstage-y += death.c -verstage-y += memlayout.ld verstage-y += death.c diff --git a/src/mainboard/opencellular/elgon/memlayout.ld b/src/mainboard/opencellular/elgon/memlayout.ld deleted file mode 100644 index 9349362cfa..0000000000 --- a/src/mainboard/opencellular/elgon/memlayout.ld +++ /dev/null @@ -1 +0,0 @@ - #include -- cgit v1.2.3