diff options
| author | Furquan Shaikh <furquan@google.com> | 2020-06-11 11:59:07 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2020-06-13 06:49:23 +0000 |
| commit | 46514c2b877c29c2d7c2061a9785736e270c0c62 (patch) | |
| tree | 2f78550192bce548139ef49fdac6623dad578703 /src/mainboard | |
| parent | 00148bba7146318e2e815d8c13e33278f63814c9 (diff) | |
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 <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42292
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
55 files changed, 20 insertions, 183 deletions
diff --git a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc index c73bc334c4..bd2ea797d7 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc +++ b/src/mainboard/cavium/cn8100_sff_evb/Makefile.inc @@ -1,18 +1,13 @@ ## SPDX-License-Identifier: GPL-2.0-only bootblock-y += bootblock.c -bootblock-y += memlayout.ld -romstage-y += memlayout.ld romstage-y += romstage.c romstage-y += bdk_devicetree.c ramstage-y += mainboard.c -ramstage-y += memlayout.ld ramstage-y += bdk_devicetree.c -verstage-y += memlayout.ld - MB_DIR = src/mainboard/$(MAINBOARDDIR) LINUX_DTB = sff8104-linux.dtb diff --git a/src/mainboard/cavium/cn8100_sff_evb/memlayout.ld b/src/mainboard/cavium/cn8100_sff_evb/memlayout.ld deleted file mode 100644 index 9349362cfa..0000000000 --- a/src/mainboard/cavium/cn8100_sff_evb/memlayout.ld +++ /dev/null @@ -1 +0,0 @@ - #include <soc/memlayout.ld> diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig index b8896d28d1..368f7f3a69 100644 --- a/src/mainboard/emulation/qemu-aarch64/Kconfig +++ b/src/mainboard/emulation/qemu-aarch64/Kconfig @@ -24,6 +24,10 @@ config BOARD_SPECIFIC_OPTIONS select MISSING_BOARD_RESET select ARM64_USE_ARM_TRUSTED_FIRMWARE +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/emulation/qemu-aarch64/memlayout.ld" + config MAINBOARD_DIR string default "emulation/qemu-aarch64" diff --git a/src/mainboard/emulation/qemu-aarch64/Makefile.inc b/src/mainboard/emulation/qemu-aarch64/Makefile.inc index 754656ffa2..15572ca9bc 100644 --- a/src/mainboard/emulation/qemu-aarch64/Makefile.inc +++ b/src/mainboard/emulation/qemu-aarch64/Makefile.inc @@ -12,10 +12,6 @@ bootblock-y += mmio.c romstage-y += mmio.c ramstage-y += mmio.c -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld - bootblock-y += bootblock_custom.S CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index 4af58434bc..64e5bb7168 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -25,6 +25,10 @@ config BOARD_SPECIFIC_OPTIONS select MISSING_BOARD_RESET select NO_MONOTONIC_TIMER +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/emulation/qemu-armv7/memlayout.ld" + config MAINBOARD_DIR string default "emulation/qemu-armv7" diff --git a/src/mainboard/emulation/qemu-armv7/Makefile.inc b/src/mainboard/emulation/qemu-armv7/Makefile.inc index 1b9e997ce1..65fdfe131e 100644 --- a/src/mainboard/emulation/qemu-armv7/Makefile.inc +++ b/src/mainboard/emulation/qemu-armv7/Makefile.inc @@ -15,7 +15,3 @@ ramstage-y += timer.c bootblock-y += mmio.c romstage-y += mmio.c ramstage-y += mmio.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig index aa3aceb367..5dbea721d1 100644 --- a/src/mainboard/emulation/qemu-power8/Kconfig +++ b/src/mainboard/emulation/qemu-power8/Kconfig @@ -17,6 +17,10 @@ config BOARD_SPECIFIC_OPTIONS select BOOT_DEVICE_NOT_SPI_FLASH select MISSING_BOARD_RESET +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/emulation/qemu-power8/memlayout.ld" + config MAINBOARD_DIR string default "emulation/qemu-power8" diff --git a/src/mainboard/emulation/qemu-power8/Makefile.inc b/src/mainboard/emulation/qemu-power8/Makefile.inc index b713df71c9..4011983923 100644 --- a/src/mainboard/emulation/qemu-power8/Makefile.inc +++ b/src/mainboard/emulation/qemu-power8/Makefile.inc @@ -7,7 +7,3 @@ romstage-y += romstage.c ramstage-y += timer.c romstage-y += uart.c ramstage-y += uart.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld 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 diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig index c46a04781c..3c1ae122e0 100644 --- a/src/mainboard/emulation/spike-riscv/Kconfig +++ b/src/mainboard/emulation/spike-riscv/Kconfig @@ -11,6 +11,10 @@ config BOARD_SPECIFIC_OPTIONS select BOOT_DEVICE_NOT_SPI_FLASH select MISSING_BOARD_RESET +config MEMLAYOUT_LD_FILE + string + default "src/mainboard/emulation/spike-riscv/memlayout.ld" + config MAINBOARD_DIR string default "emulation/spike-riscv" diff --git a/src/mainboard/emulation/spike-riscv/Makefile.inc b/src/mainboard/emulation/spike-riscv/Makefile.inc index 6d2911662d..fc5a7b32d0 100644 --- a/src/mainboard/emulation/spike-riscv/Makefile.inc +++ b/src/mainboard/emulation/spike-riscv/Makefile.inc @@ -10,7 +10,3 @@ romstage-y += clint.c 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 diff --git a/src/mainboard/google/cheza/Makefile.inc b/src/mainboard/google/cheza/Makefile.inc index e54aefb0e1..949d775624 100644 --- a/src/mainboard/google/cheza/Makefile.inc +++ b/src/mainboard/google/cheza/Makefile.inc @@ -1,24 +1,20 @@ ## SPDX-License-Identifier: GPL-2.0-only bootblock-y += boardid.c -bootblock-y += memlayout.ld bootblock-y += chromeos.c bootblock-y += bootblock.c bootblock-y += reset.c verstage-y += boardid.c -verstage-y += memlayout.ld verstage-y += chromeos.c verstage-y += reset.c romstage-y += boardid.c -romstage-y += memlayout.ld romstage-y += chromeos.c romstage-y += romstage.c romstage-y += reset.c ramstage-y += boardid.c -ramstage-y += memlayout.ld ramstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += reset.c diff --git a/src/mainboard/google/cheza/memlayout.ld b/src/mainboard/google/cheza/memlayout.ld deleted file mode 100644 index 936c1a3e0a..0000000000 --- a/src/mainboard/google/cheza/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - - #include <soc/memlayout.ld> diff --git a/src/mainboard/google/daisy/Makefile.inc b/src/mainboard/google/daisy/Makefile.inc index 9faa2e09ef..4f5f87be89 100644 --- a/src/mainboard/google/daisy/Makefile.inc +++ b/src/mainboard/google/daisy/Makefile.inc @@ -9,7 +9,3 @@ romstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += chromeos.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/daisy/memlayout.ld b/src/mainboard/google/daisy/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/daisy/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/foster/Makefile.inc b/src/mainboard/google/foster/Makefile.inc index 1b576a9512..7deae3e009 100644 --- a/src/mainboard/google/foster/Makefile.inc +++ b/src/mainboard/google/foster/Makefile.inc @@ -27,8 +27,3 @@ ramstage-y += mainboard.c ramstage-y += reset.c ramstage-y += chromeos.c ramstage-y += sdram_configs.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld -verstage-y += memlayout.ld diff --git a/src/mainboard/google/foster/memlayout.ld b/src/mainboard/google/foster/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/foster/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/gale/Makefile.inc b/src/mainboard/google/gale/Makefile.inc index 84b41e6ebf..f23f804de5 100644 --- a/src/mainboard/google/gale/Makefile.inc +++ b/src/mainboard/google/gale/Makefile.inc @@ -9,7 +9,6 @@ verstage-y += boardid.c verstage-y += cdp.c verstage-y += chromeos.c verstage-y += blsp.c -verstage-y += memlayout.ld verstage-y += reset.c verstage-y += verstage.c @@ -28,7 +27,3 @@ ramstage-y += mainboard.c ramstage-y += mmu.c ramstage-y += reset.c ramstage-y += blsp.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/gale/memlayout.ld b/src/mainboard/google/gale/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/gale/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.inc index 8849162ce0..b800945466 100644 --- a/src/mainboard/google/gru/Makefile.inc +++ b/src/mainboard/google/gru/Makefile.inc @@ -2,22 +2,17 @@ subdirs-y += sdram_params/ -decompressor-y += memlayout.ld - bootblock-y += bootblock.c bootblock-y += chromeos.c -bootblock-y += memlayout.ld bootblock-y += pwm_regulator.c bootblock-y += boardid.c bootblock-y += reset.c verstage-y += chromeos.c -verstage-y += memlayout.ld verstage-y += reset.c romstage-y += boardid.c romstage-y += chromeos.c -romstage-y += memlayout.ld romstage-y += pwm_regulator.c romstage-y += romstage.c romstage-y += reset.c @@ -26,6 +21,5 @@ romstage-y += sdram_configs.c ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c -ramstage-y += memlayout.ld ramstage-y += reset.c ramstage-y += sdram_configs.c # Needed for ram_code() diff --git a/src/mainboard/google/gru/memlayout.ld b/src/mainboard/google/gru/memlayout.ld deleted file mode 100644 index 936c1a3e0a..0000000000 --- a/src/mainboard/google/gru/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - - #include <soc/memlayout.ld> diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.inc index a2a147c399..532712a6c1 100644 --- a/src/mainboard/google/kukui/Makefile.inc +++ b/src/mainboard/google/kukui/Makefile.inc @@ -3,20 +3,16 @@ subdirs-y += panel_params/ bootblock-y += boardid.c bootblock-y += bootblock.c -bootblock-y += memlayout.ld bootblock-y += reset.c -decompressor-y += memlayout.ld verstage-y += chromeos.c verstage-y += early_init.c verstage-y += reset.c verstage-y += verstage.c -verstage-y += memlayout.ld romstage-y += boardid.c romstage-y += chromeos.c romstage-y += early_init.c -romstage-y += memlayout.ld romstage-y += reset.c romstage-y += romstage.c romstage-y += sdram_configs.c @@ -24,7 +20,6 @@ romstage-y += sdram_configs.c ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c -ramstage-y += memlayout.ld ramstage-$(CONFIG_BOARD_GOOGLE_FLAPJACK) += panel_flapjack.c ramstage-$(CONFIG_BOARD_GOOGLE_KAKADU) += panel_kakadu.c ramstage-$(CONFIG_BOARD_GOOGLE_KODAMA) += panel_kodama.c diff --git a/src/mainboard/google/kukui/memlayout.ld b/src/mainboard/google/kukui/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/kukui/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.inc index ca191d147e..48faadf2e8 100644 --- a/src/mainboard/google/mistral/Makefile.inc +++ b/src/mainboard/google/mistral/Makefile.inc @@ -1,20 +1,16 @@ -bootblock-y += memlayout.ld bootblock-y += chromeos.c bootblock-y += reset.c bootblock-y += bootblock.c -verstage-y += memlayout.ld verstage-y += chromeos.c verstage-y += reset.c verstage-y += verstage.c -romstage-y += memlayout.ld romstage-y += chromeos.c romstage-y += reset.c romstage-y += romstage.c -ramstage-y += memlayout.ld ramstage-y += chromeos.c ramstage-y += reset.c ramstage-y += mainboard.c diff --git a/src/mainboard/google/mistral/memlayout.ld b/src/mainboard/google/mistral/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/mistral/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc index 124d4121d7..190cfc5127 100644 --- a/src/mainboard/google/nyan/Makefile.inc +++ b/src/mainboard/google/nyan/Makefile.inc @@ -29,8 +29,3 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-y += reset.c verstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-y += early_configs.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/nyan/memlayout.ld b/src/mainboard/google/nyan/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/nyan/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc index 5cf7356ec1..b734b5ba19 100644 --- a/src/mainboard/google/nyan_big/Makefile.inc +++ b/src/mainboard/google/nyan_big/Makefile.inc @@ -28,8 +28,3 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-y += reset.c verstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-y += early_configs.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/nyan_big/memlayout.ld b/src/mainboard/google/nyan_big/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/nyan_big/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc index de582badda..54410f0812 100644 --- a/src/mainboard/google/nyan_blaze/Makefile.inc +++ b/src/mainboard/google/nyan_blaze/Makefile.inc @@ -28,8 +28,3 @@ ramstage-y += reset.c ramstage-y += boardid.c ramstage-y += mainboard.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/nyan_blaze/memlayout.ld b/src/mainboard/google/nyan_blaze/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/nyan_blaze/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/oak/Makefile.inc b/src/mainboard/google/oak/Makefile.inc index 63ccc1e335..79a80ee6c1 100644 --- a/src/mainboard/google/oak/Makefile.inc +++ b/src/mainboard/google/oak/Makefile.inc @@ -1,23 +1,19 @@ ## SPDX-License-Identifier: GPL-2.0-only bootblock-y += bootblock.c -bootblock-y += memlayout.ld bootblock-y += chromeos.c bootblock-y += boardid.c bootblock-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c verstage-y += chromeos.c -verstage-y += memlayout.ld verstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c romstage-y += chromeos.c romstage-y += romstage.c sdram_configs.c -romstage-y += memlayout.ld romstage-y += boardid.c romstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c ramstage-y += mainboard.c ramstage-y += chromeos.c -ramstage-y += memlayout.ld ramstage-y += boardid.c ramstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c diff --git a/src/mainboard/google/oak/memlayout.ld b/src/mainboard/google/oak/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/oak/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/peach_pit/Makefile.inc b/src/mainboard/google/peach_pit/Makefile.inc index 9faa2e09ef..4f5f87be89 100644 --- a/src/mainboard/google/peach_pit/Makefile.inc +++ b/src/mainboard/google/peach_pit/Makefile.inc @@ -9,7 +9,3 @@ romstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += chromeos.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/peach_pit/memlayout.ld b/src/mainboard/google/peach_pit/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/peach_pit/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/smaug/Makefile.inc b/src/mainboard/google/smaug/Makefile.inc index 342e0dd35f..32c66b9fca 100644 --- a/src/mainboard/google/smaug/Makefile.inc +++ b/src/mainboard/google/smaug/Makefile.inc @@ -29,8 +29,3 @@ ramstage-y += mainboard.c ramstage-y += reset.c ramstage-y += pmic.c ramstage-y += sdram_configs.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld -verstage-y += memlayout.ld diff --git a/src/mainboard/google/smaug/memlayout.ld b/src/mainboard/google/smaug/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/smaug/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc index 272c49b602..b1bcacd5b5 100644 --- a/src/mainboard/google/storm/Makefile.inc +++ b/src/mainboard/google/storm/Makefile.inc @@ -9,7 +9,6 @@ verstage-y += boardid.c verstage-y += cdp.c verstage-y += chromeos.c verstage-y += gsbi.c -verstage-y += memlayout.ld verstage-y += reset.c romstage-y += romstage.c @@ -26,7 +25,3 @@ ramstage-y += mainboard.c ramstage-y += mmu.c ramstage-y += reset.c ramstage-y += gsbi.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/storm/memlayout.ld b/src/mainboard/google/storm/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/storm/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/trogdor/Makefile.inc b/src/mainboard/google/trogdor/Makefile.inc index 4a2b5d47c6..9a71ea5197 100644 --- a/src/mainboard/google/trogdor/Makefile.inc +++ b/src/mainboard/google/trogdor/Makefile.inc @@ -1,23 +1,19 @@ ## SPDX-License-Identifier: GPL-2.0-only -bootblock-y += memlayout.ld bootblock-y += boardid.c bootblock-y += chromeos.c bootblock-y += bootblock.c -verstage-y += memlayout.ld ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y) verstage-y += reset.c endif verstage-y += boardid.c verstage-y += chromeos.c -romstage-y += memlayout.ld romstage-y += romstage.c romstage-y += boardid.c romstage-y += chromeos.c -ramstage-y += memlayout.ld ramstage-y += mainboard.c ifneq ($(CONFIG_BOARD_GOOGLE_BUBS),y) ramstage-y += reset.c diff --git a/src/mainboard/google/trogdor/memlayout.ld b/src/mainboard/google/trogdor/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/trogdor/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/veyron/Makefile.inc b/src/mainboard/google/veyron/Makefile.inc index 76d141fa27..6c3b7f4c51 100644 --- a/src/mainboard/google/veyron/Makefile.inc +++ b/src/mainboard/google/veyron/Makefile.inc @@ -19,8 +19,3 @@ ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += reset.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/veyron/memlayout.ld b/src/mainboard/google/veyron/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/veyron/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/veyron_mickey/Makefile.inc b/src/mainboard/google/veyron_mickey/Makefile.inc index 76d141fa27..6c3b7f4c51 100644 --- a/src/mainboard/google/veyron_mickey/Makefile.inc +++ b/src/mainboard/google/veyron_mickey/Makefile.inc @@ -19,8 +19,3 @@ ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += reset.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/veyron_mickey/memlayout.ld b/src/mainboard/google/veyron_mickey/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/veyron_mickey/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/veyron_rialto/Makefile.inc b/src/mainboard/google/veyron_rialto/Makefile.inc index 76d141fa27..6c3b7f4c51 100644 --- a/src/mainboard/google/veyron_rialto/Makefile.inc +++ b/src/mainboard/google/veyron_rialto/Makefile.inc @@ -19,8 +19,3 @@ ramstage-y += boardid.c ramstage-y += chromeos.c ramstage-y += mainboard.c ramstage-y += reset.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/veyron_rialto/memlayout.ld b/src/mainboard/google/veyron_rialto/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/google/veyron_rialto/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.inc index 07628c186b..ac828e2765 100644 --- a/src/mainboard/google/zork/Makefile.inc +++ b/src/mainboard/google/zork/Makefile.inc @@ -11,7 +11,6 @@ ramstage-y += ec.c ramstage-y += sku_id.c ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) -verstage-y += memlayout.ld verstage-y += verstage.c else verstage-y += chromeos.c 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 <soc/memlayout.ld> diff --git a/src/mainboard/sifive/hifive-unleashed/Makefile.inc b/src/mainboard/sifive/hifive-unleashed/Makefile.inc index 02b8046030..2a32df8756 100644 --- a/src/mainboard/sifive/hifive-unleashed/Makefile.inc +++ b/src/mainboard/sifive/hifive-unleashed/Makefile.inc @@ -1,17 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-only -bootblock-y += memlayout.ld bootblock-y += media.c -romstage-y += memlayout.ld romstage-y += romstage.c romstage-y += media.c -ramstage-y += memlayout.ld ramstage-y += fixup_fdt.c ramstage-y += media.c - DTB=$(obj)/hifive-unleashed.dtb DTS=src/mainboard/sifive/hifive-unleashed/hifive-unleashed-a00.dts $(DTB): $(DTS) diff --git a/src/mainboard/sifive/hifive-unleashed/memlayout.ld b/src/mainboard/sifive/hifive-unleashed/memlayout.ld deleted file mode 100644 index 0f1fcec9a0..0000000000 --- a/src/mainboard/sifive/hifive-unleashed/memlayout.ld +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <soc/memlayout.ld> diff --git a/src/mainboard/ti/beaglebone/Makefile.inc b/src/mainboard/ti/beaglebone/Makefile.inc index cf3fc5d79a..a703939f01 100644 --- a/src/mainboard/ti/beaglebone/Makefile.inc +++ b/src/mainboard/ti/beaglebone/Makefile.inc @@ -5,7 +5,3 @@ bootblock-y += leds.c romstage-y += romstage.c #ramstage-y += ramstage.c - -bootblock-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/ti/beaglebone/memlayout.ld b/src/mainboard/ti/beaglebone/memlayout.ld deleted file mode 100644 index ff79e70ed5..0000000000 --- a/src/mainboard/ti/beaglebone/memlayout.ld +++ /dev/null @@ -1 +0,0 @@ -#include <cpu/ti/am335x/memlayout.ld> |