[PATCHv2 8/8] configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPT

Masahiro Yamada
2020-03-15T11:56:14Z

On Thu, Mar 12, 2020 at 7:12 AM Tom Rini <trini@konsulko.com> wrote:
>
> 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
> ---
> configs/axm_defconfig | 2 +-
> configs/brppt2_defconfig | 2 +-
> configs/taurus_defconfig | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configs/axm_defconfig b/configs/axm_defconfig
> index 57683b183fc2..1ae78463d457 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"

This is the same as the default,
so I think this can be simply removed.
(and squashed into "Kconfig: Remove redundant variable sets)").

> 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 f94ea2837650..4fde3b963c3c 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 0399132230a0..19d85f9b5a81 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
> --
> 2.17.1
>

--
Best Regards
Masahiro Yamada