[U-Boot] arm, at91: fix taurus board

since commit: b529993e0222 "spl: add hierarchical defaults for SPL_LDSCRIPT"

taurus board stopped working. Use the ldscript from
arch/arm/cpu/u-boot-spl.lds (as before this patch) fixed it.

Signed-off-by: Heiko Schocher <hs@denx.de>
---
git bisect log:
pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $ git bisect log
git bisect start
git bisect bad 883eb53ee54843ebeae967288bb537578296a441
git bisect good eaa90e5df2a4a1cb12fb73571978a9379242d0b5
git bisect good ee14d29db0f49785867f26902540f65d3a1d62eb
git bisect good b1a16002f269051bfc82c4b6948e6c069928f704
git bisect good 7b07a20c5e668b67348dc7a3abbeb437ab0afa52
git bisect bad a2a1bfe175038e15bcdc89975b8bc6befa90812d
git bisect good c72c161bc0af0dc8fdabdebf3812cfeef3915e4c
git bisect bad e8f9ad94bf1e03ee9df6dec112a2009d3a442206
git bisect bad b529993e0222ce8c97d3e8fe41e4a2e7878e281e
git bisect good 96b9082c6413c9ec354f9ea5c61014e2b203ff5b
pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $ git bisect visualize
commit b529993e0222ce8c97d3e8fe41e4a2e7878e281e (refs/bisect/bad)
Author: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date:   Thu Aug 3 23:23:55 2017 +0200

    spl: add hierarchical defaults for SPL_LDSCRIPT

    With SPL_LDSCRIPT moved to Kconfig (and this being a 'string' config
    node), all the lingering definitions in header files will cause
    warnings/errors due to the redefinition of the configuration item.

    As we don't want to pollute the defconfig files (and values should
    usually be identical for entire architectures), the defaults are moved
    into Kconfig.  Kconfig will always pick the first default that
    matches, so please keep these values at the end of each file (to allow
    any board-specific Kconfig, which will be included earlier) to
    override with an unconditional default setting.

    Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
    Reviewed-by: Simon Glass <sjg@chromium.org>
pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $


 configs/taurus_defconfig | 1 +
 1 file changed, 1 insertion(+)

> On 16 Aug 2017, at 09:47, Heiko Schocher <hs@denx.de> wrote:
> 
> since commit: b529993e0222 "spl: add hierarchical defaults for SPL_LDSCRIPT"
> 
> taurus board stopped working. Use the ldscript from
> arch/arm/cpu/u-boot-spl.lds (as before this patch) fixed it.
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Note that (in theory; i.e. if the Kconfig framework works as expected) you should
be able to put this as a default override into
	board/siemens/taurus/Kconfig
if you prefer

> ---
> git bisect log:
> pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $ git bisect log
> git bisect start
> git bisect bad 883eb53ee54843ebeae967288bb537578296a441
> git bisect good eaa90e5df2a4a1cb12fb73571978a9379242d0b5
> git bisect good ee14d29db0f49785867f26902540f65d3a1d62eb
> git bisect good b1a16002f269051bfc82c4b6948e6c069928f704
> git bisect good 7b07a20c5e668b67348dc7a3abbeb437ab0afa52
> git bisect bad a2a1bfe175038e15bcdc89975b8bc6befa90812d
> git bisect good c72c161bc0af0dc8fdabdebf3812cfeef3915e4c
> git bisect bad e8f9ad94bf1e03ee9df6dec112a2009d3a442206
> git bisect bad b529993e0222ce8c97d3e8fe41e4a2e7878e281e
> git bisect good 96b9082c6413c9ec354f9ea5c61014e2b203ff5b
> pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $ git bisect visualize
> commit b529993e0222ce8c97d3e8fe41e4a2e7878e281e (refs/bisect/bad)
> Author: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Date:   Thu Aug 3 23:23:55 2017 +0200
> 
>    spl: add hierarchical defaults for SPL_LDSCRIPT
> 
>    With SPL_LDSCRIPT moved to Kconfig (and this being a 'string' config
>    node), all the lingering definitions in header files will cause
>    warnings/errors due to the redefinition of the configuration item.
> 
>    As we don't want to pollute the defconfig files (and values should
>    usually be identical for entire architectures), the defaults are moved
>    into Kconfig.  Kconfig will always pick the first default that
>    matches, so please keep these values at the end of each file (to allow
>    any board-specific Kconfig, which will be included earlier) to
>    override with an unconditional default setting.
> 
>    Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>    Reviewed-by: Simon Glass <sjg@chromium.org>
> pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $
> 
> 
> configs/taurus_defconfig | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index 6fecaf89e8..4e5fad7ad4 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -3,6 +3,7 @@ CONFIG_SPL_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_TARGET_TAURUS=y
> CONFIG_SPL_GPIO_SUPPORT=y
> CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -- 
> 2.13.3
>

On Wed, Aug 16, 2017 at 09:47:45AM +0200, Heiko Schocher wrote:

> since commit: b529993e0222 "spl: add hierarchical defaults for SPL_LDSCRIPT"
> 
> taurus board stopped working. Use the ldscript from
> arch/arm/cpu/u-boot-spl.lds (as before this patch) fixed it.
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Applied to u-boot/master, thanks!