Skip to contentSkip to conversation

arm, at91: fix taurus board

PATCH In review Heiko Schocher 3 participants 3 messages Aug 16, 2017 – Aug 20, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
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 <[email protected]>
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.

pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $

 configs/taurus_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/taurus_defconfig +1 -0
index 6fecaf89e8..4e5fad7ad4 100644
@@ -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
Signature · 1 line
2.13.3
#1 lore raw

PATCH 1/1 arm, at91: fix taurus board

Quoted 9 lines · Heiko Schocher

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.

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

Quoted 55 lines

---
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 <[email protected]>
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.

pollux:u-boot-at91_taurus hs [(kein Branch, binäre Suche begonnen bei master)] $

configs/taurus_defconfig | 1 +

1 file changed, 1 insertion(+)
configs/taurus_defconfig +0 -0
index 6fecaf89e8..4e5fad7ad4 100644
@@ -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

Signature · 1 line
2.13.3
#2 lore raw
In reply to Heiko Schocher
Quoted 7 lines · Heiko Schocher

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.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170820/1f660516/attachment.sig>