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/soc | |
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/soc')
-rw-r--r-- | src/soc/cavium/cn81xx/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/cavium/cn81xx/memlayout.ld (renamed from src/soc/cavium/cn81xx/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/mediatek/mt8173/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/mediatek/mt8173/memlayout.ld (renamed from src/soc/mediatek/mt8173/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/mediatek/mt8183/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/mediatek/mt8183/memlayout.ld (renamed from src/soc/mediatek/mt8183/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/nvidia/tegra124/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/nvidia/tegra124/memlayout.ld (renamed from src/soc/nvidia/tegra124/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/nvidia/tegra210/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/nvidia/tegra210/memlayout.ld (renamed from src/soc/nvidia/tegra210/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/qualcomm/ipq40xx/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/qualcomm/ipq40xx/memlayout.ld (renamed from src/soc/qualcomm/ipq40xx/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/qualcomm/ipq806x/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/qualcomm/ipq806x/memlayout.ld (renamed from src/soc/qualcomm/ipq806x/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/qualcomm/qcs405/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/qualcomm/qcs405/memlayout.ld (renamed from src/soc/qualcomm/qcs405/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/qualcomm/sc7180/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/qualcomm/sc7180/memlayout.ld (renamed from src/soc/qualcomm/sc7180/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/qualcomm/sdm845/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/qualcomm/sdm845/memlayout.ld (renamed from src/soc/qualcomm/sdm845/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/rockchip/rk3288/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/rockchip/rk3288/memlayout.ld (renamed from src/soc/rockchip/rk3288/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/rockchip/rk3399/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/rockchip/rk3399/memlayout.ld (renamed from src/soc/rockchip/rk3399/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/samsung/exynos5250/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/samsung/exynos5250/memlayout.ld (renamed from src/soc/samsung/exynos5250/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/samsung/exynos5420/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/samsung/exynos5420/memlayout.ld (renamed from src/soc/samsung/exynos5420/include/soc/memlayout.ld) | 0 | ||||
-rw-r--r-- | src/soc/sifive/fu540/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/sifive/fu540/memlayout.ld (renamed from src/soc/sifive/fu540/include/soc/memlayout.ld) | 0 |
30 files changed, 60 insertions, 0 deletions
diff --git a/src/soc/cavium/cn81xx/Kconfig b/src/soc/cavium/cn81xx/Kconfig index f64350eb9e..87edf45cde 100644 --- a/src/soc/cavium/cn81xx/Kconfig +++ b/src/soc/cavium/cn81xx/Kconfig @@ -14,6 +14,10 @@ config SOC_CAVIUM_CN81XX if SOC_CAVIUM_CN81XX +config MEMLAYOUT_LD_FILE + string + default "src/soc/cavium/cn81xx/memlayout.ld" + config VBOOT select VBOOT_SEPARATE_VERSTAGE select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/soc/cavium/cn81xx/include/soc/memlayout.ld b/src/soc/cavium/cn81xx/memlayout.ld index 79673c9974..79673c9974 100644 --- a/src/soc/cavium/cn81xx/include/soc/memlayout.ld +++ b/src/soc/cavium/cn81xx/memlayout.ld diff --git a/src/soc/mediatek/mt8173/Kconfig b/src/soc/mediatek/mt8173/Kconfig index 6476d42b0a..15b833f56f 100644 --- a/src/soc/mediatek/mt8173/Kconfig +++ b/src/soc/mediatek/mt8173/Kconfig @@ -13,6 +13,10 @@ config SOC_MEDIATEK_MT8173 if SOC_MEDIATEK_MT8173 +config MEMLAYOUT_LD_FILE + string + default "src/soc/mediatek/mt8173/memlayout.ld" + config VBOOT select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/soc/mediatek/mt8173/include/soc/memlayout.ld b/src/soc/mediatek/mt8173/memlayout.ld index 4aece51cef..4aece51cef 100644 --- a/src/soc/mediatek/mt8173/include/soc/memlayout.ld +++ b/src/soc/mediatek/mt8173/memlayout.ld diff --git a/src/soc/mediatek/mt8183/Kconfig b/src/soc/mediatek/mt8183/Kconfig index 46249be038..82827d1755 100644 --- a/src/soc/mediatek/mt8183/Kconfig +++ b/src/soc/mediatek/mt8183/Kconfig @@ -11,6 +11,10 @@ config SOC_MEDIATEK_MT8183 if SOC_MEDIATEK_MT8183 +config MEMLAYOUT_LD_FILE + string + default "src/soc/mediatek/mt8183/memlayout.ld" + config VBOOT select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/soc/mediatek/mt8183/include/soc/memlayout.ld b/src/soc/mediatek/mt8183/memlayout.ld index a26637766b..a26637766b 100644 --- a/src/soc/mediatek/mt8183/include/soc/memlayout.ld +++ b/src/soc/mediatek/mt8183/memlayout.ld diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig index c962aead71..deca2cda96 100644 --- a/src/soc/nvidia/tegra124/Kconfig +++ b/src/soc/nvidia/tegra124/Kconfig @@ -15,6 +15,10 @@ config SOC_NVIDIA_TEGRA124 if SOC_NVIDIA_TEGRA124 +config MEMLAYOUT_LD_FILE + string + default "src/soc/nvidia/tegra124/memlayout.ld" + config VBOOT select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/soc/nvidia/tegra124/include/soc/memlayout.ld b/src/soc/nvidia/tegra124/memlayout.ld index 94b6fd8d91..94b6fd8d91 100644 --- a/src/soc/nvidia/tegra124/include/soc/memlayout.ld +++ b/src/soc/nvidia/tegra124/memlayout.ld diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig index 780fa18744..32748f3b6b 100644 --- a/src/soc/nvidia/tegra210/Kconfig +++ b/src/soc/nvidia/tegra210/Kconfig @@ -13,6 +13,10 @@ config SOC_NVIDIA_TEGRA210 if SOC_NVIDIA_TEGRA210 +config MEMLAYOUT_LD_FILE + string + default "src/soc/nvidia/tegra210/memlayout.ld" + config VBOOT select VBOOT_STARTS_IN_BOOTBLOCK select VBOOT_SEPARATE_VERSTAGE diff --git a/src/soc/nvidia/tegra210/include/soc/memlayout.ld b/src/soc/nvidia/tegra210/memlayout.ld index e5620bcf6a..e5620bcf6a 100644 --- a/src/soc/nvidia/tegra210/include/soc/memlayout.ld +++ b/src/soc/nvidia/tegra210/memlayout.ld diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig index ef80772b2f..0eabb00752 100644 --- a/src/soc/qualcomm/ipq40xx/Kconfig +++ b/src/soc/qualcomm/ipq40xx/Kconfig @@ -10,6 +10,10 @@ config SOC_QC_IPQ40XX if SOC_QC_IPQ40XX +config MEMLAYOUT_LD_FILE + string + default "src/soc/qualcomm/ipq40xx/memlayout.ld" + config GENERIC_UDELAY def_bool n diff --git a/src/soc/qualcomm/ipq40xx/include/soc/memlayout.ld b/src/soc/qualcomm/ipq40xx/memlayout.ld index 1a2dd31cc4..1a2dd31cc4 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/memlayout.ld +++ b/src/soc/qualcomm/ipq40xx/memlayout.ld diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index fa0fefef67..7de2a99f1e 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -11,6 +11,10 @@ config SOC_QC_IPQ806X if SOC_QC_IPQ806X +config MEMLAYOUT_LD_FILE + string + default "src/soc/qualcomm/ipq806x/memlayout.ld" + config VBOOT select VBOOT_STARTS_IN_BOOTBLOCK select VBOOT_VBNV_FLASH diff --git a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld b/src/soc/qualcomm/ipq806x/memlayout.ld index 6e7e56cada..6e7e56cada 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld +++ b/src/soc/qualcomm/ipq806x/memlayout.ld diff --git a/src/soc/qualcomm/qcs405/Kconfig b/src/soc/qualcomm/qcs405/Kconfig index 60d8e3af60..0dc96ba06a 100644 --- a/src/soc/qualcomm/qcs405/Kconfig +++ b/src/soc/qualcomm/qcs405/Kconfig @@ -13,6 +13,10 @@ config SOC_QUALCOMM_QCS405 if SOC_QUALCOMM_QCS405 +config MEMLAYOUT_LD_FILE + string + default "src/soc/qualcomm/qcs405/memlayout.ld" + config VBOOT select VBOOT_SEPARATE_VERSTAGE select VBOOT_RETURN_FROM_VERSTAGE diff --git a/src/soc/qualcomm/qcs405/include/soc/memlayout.ld b/src/soc/qualcomm/qcs405/memlayout.ld index ff2ad2f99c..ff2ad2f99c 100644 --- a/src/soc/qualcomm/qcs405/include/soc/memlayout.ld +++ b/src/soc/qualcomm/qcs405/memlayout.ld diff --git a/src/soc/qualcomm/sc7180/Kconfig b/src/soc/qualcomm/sc7180/Kconfig index faf036e62b..d3dab7acd9 100644 --- a/src/soc/qualcomm/sc7180/Kconfig +++ b/src/soc/qualcomm/sc7180/Kconfig @@ -16,6 +16,10 @@ config SOC_QUALCOMM_SC7180 if SOC_QUALCOMM_SC7180 +config MEMLAYOUT_LD_FILE + string + default "src/soc/qualcomm/sc7180/memlayout.ld" + config VBOOT select VBOOT_SEPARATE_VERSTAGE select VBOOT_RETURN_FROM_VERSTAGE diff --git a/src/soc/qualcomm/sc7180/include/soc/memlayout.ld b/src/soc/qualcomm/sc7180/memlayout.ld index 2a0cd8a417..2a0cd8a417 100644 --- a/src/soc/qualcomm/sc7180/include/soc/memlayout.ld +++ b/src/soc/qualcomm/sc7180/memlayout.ld diff --git a/src/soc/qualcomm/sdm845/Kconfig b/src/soc/qualcomm/sdm845/Kconfig index dbe025e93a..c93ec6c1bb 100644 --- a/src/soc/qualcomm/sdm845/Kconfig +++ b/src/soc/qualcomm/sdm845/Kconfig @@ -12,6 +12,10 @@ config SOC_QUALCOMM_SDM845 if SOC_QUALCOMM_SDM845 +config MEMLAYOUT_LD_FILE + string + default "src/soc/qualcomm/sdm845/memlayout.ld" + config VBOOT select VBOOT_SEPARATE_VERSTAGE select VBOOT_RETURN_FROM_VERSTAGE diff --git a/src/soc/qualcomm/sdm845/include/soc/memlayout.ld b/src/soc/qualcomm/sdm845/memlayout.ld index 30b4920288..30b4920288 100644 --- a/src/soc/qualcomm/sdm845/include/soc/memlayout.ld +++ b/src/soc/qualcomm/sdm845/memlayout.ld diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 3198aa4324..3dc9a9b554 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -20,6 +20,10 @@ config SOC_ROCKCHIP_RK3288 if SOC_ROCKCHIP_RK3288 +config MEMLAYOUT_LD_FILE + string + default "src/soc/rockchip/rk3288/memlayout.ld" + config VBOOT select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_STARTS_IN_BOOTBLOCK diff --git a/src/soc/rockchip/rk3288/include/soc/memlayout.ld b/src/soc/rockchip/rk3288/memlayout.ld index 4ef0163def..4ef0163def 100644 --- a/src/soc/rockchip/rk3288/include/soc/memlayout.ld +++ b/src/soc/rockchip/rk3288/memlayout.ld diff --git a/src/soc/rockchip/rk3399/Kconfig b/src/soc/rockchip/rk3399/Kconfig index 7e3c44b674..4f7af9e0c2 100644 --- a/src/soc/rockchip/rk3399/Kconfig +++ b/src/soc/rockchip/rk3399/Kconfig @@ -14,6 +14,10 @@ config SOC_ROCKCHIP_RK3399 if SOC_ROCKCHIP_RK3399 +config MEMLAYOUT_LD_FILE + string + default "src/soc/rockchip/rk3399/memlayout.ld" + config VBOOT select VBOOT_SEPARATE_VERSTAGE select VBOOT_RETURN_FROM_VERSTAGE diff --git a/src/soc/rockchip/rk3399/include/soc/memlayout.ld b/src/soc/rockchip/rk3399/memlayout.ld index 72836b5130..72836b5130 100644 --- a/src/soc/rockchip/rk3399/include/soc/memlayout.ld +++ b/src/soc/rockchip/rk3399/memlayout.ld diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig index 680bd66cb7..28a89fa9c8 100644 --- a/src/soc/samsung/exynos5250/Kconfig +++ b/src/soc/samsung/exynos5250/Kconfig @@ -9,6 +9,10 @@ config CPU_SAMSUNG_EXYNOS5250 if CPU_SAMSUNG_EXYNOS5250 +config MEMLAYOUT_LD_FILE + string + default "src/soc/samsung/exynos5250/memlayout.ld" + config VBOOT select VBOOT_STARTS_IN_ROMSTAGE diff --git a/src/soc/samsung/exynos5250/include/soc/memlayout.ld b/src/soc/samsung/exynos5250/memlayout.ld index be4bb6edd7..be4bb6edd7 100644 --- a/src/soc/samsung/exynos5250/include/soc/memlayout.ld +++ b/src/soc/samsung/exynos5250/memlayout.ld diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig index 3af8e64ac3..1b80ffca32 100644 --- a/src/soc/samsung/exynos5420/Kconfig +++ b/src/soc/samsung/exynos5420/Kconfig @@ -11,6 +11,10 @@ config CPU_SAMSUNG_EXYNOS5420 if CPU_SAMSUNG_EXYNOS5420 +config MEMLAYOUT_LD_FILE + string + default "src/soc/samsung/exynos5420/memlayout.ld" + config VBOOT select VBOOT_STARTS_IN_ROMSTAGE diff --git a/src/soc/samsung/exynos5420/include/soc/memlayout.ld b/src/soc/samsung/exynos5420/memlayout.ld index e29900110e..e29900110e 100644 --- a/src/soc/samsung/exynos5420/include/soc/memlayout.ld +++ b/src/soc/samsung/exynos5420/memlayout.ld diff --git a/src/soc/sifive/fu540/Kconfig b/src/soc/sifive/fu540/Kconfig index 64985bd0f0..4aa496131c 100644 --- a/src/soc/sifive/fu540/Kconfig +++ b/src/soc/sifive/fu540/Kconfig @@ -17,6 +17,10 @@ config SOC_SIFIVE_FU540 if SOC_SIFIVE_FU540 +config MEMLAYOUT_LD_FILE + string + default "src/soc/sifive/fu540/memlayout.ld" + config RISCV_ARCH string default "rv64imac" diff --git a/src/soc/sifive/fu540/include/soc/memlayout.ld b/src/soc/sifive/fu540/memlayout.ld index fd63dc0b45..fd63dc0b45 100644 --- a/src/soc/sifive/fu540/include/soc/memlayout.ld +++ b/src/soc/sifive/fu540/memlayout.ld |