summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-02-26 10:23:40 -0500
committerTom Rini <trini@konsulko.com>2020-03-11 11:00:51 -0400
commit81a7caa4eb9b771d7ac68f4a97e2cc2bf88e776b (patch)
tree797e7b9b37b5e07379d03167040063509d96a401
parentd2912dab31101558560f81dec8e84915ecbe2b62 (diff)
downloadu-boot-WIP/kbuild-resync-v2-v4.18.tar.gz
configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPTWIP/kbuild-resync-v2-v4.18
In a few boards we had overridden, intentionally, the value used for CONFIG_SPL_LDSCRIPT. However, rather than using the ARCH value (arm) they used the $(ARCH) variable in make. This doesn't help really, so switch to a hard-coded value. Signed-off-by: Tom Rini <trini@konsulko.com> --- Changes in v2: - New patch
-rw-r--r--configs/axm_defconfig2
-rw-r--r--configs/brppt2_defconfig2
-rw-r--r--configs/taurus_defconfig2
3 files changed, 3 insertions, 3 deletions
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 57683b183f..1ae78463d4 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -5,7 +5,7 @@ CONFIG_SYS_THUMB_BUILD=y
# CONFIG_SPL_USE_ARCH_MEMCPY is not set
# CONFIG_SPL_USE_ARCH_MEMSET is not set
CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x21000000
CONFIG_TARGET_TAURUS=y
CONFIG_SPL_GPIO_SUPPORT=y
diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig
index f94ea28376..4fde3b963c 100644
--- a/configs/brppt2_defconfig
+++ b/configs/brppt2_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
# CONFIG_SPL_SYS_THUMB_BUILD is not set
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_ARCH_MX6=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 0399132230..19d85f9b5a 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -6,7 +6,7 @@ CONFIG_SYS_THUMB_BUILD=y
# CONFIG_SPL_USE_ARCH_MEMCPY is not set
# CONFIG_SPL_USE_ARCH_MEMSET is not set
CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x21000000
CONFIG_TARGET_TAURUS=y
CONFIG_BOARD_TAURUS=y