diff options
| author | Martin Fäcknitz <faecknitz@hotsplots.de> | 2023-10-20 01:06:55 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-28 09:17:55 -0400 |
| commit | e9bf0ce6c1e987e7af859e94e5e6ce44dfb4ede0 (patch) | |
| tree | 7bdd026ad523e31f5eca1c9be53a025f547915f6 /arch | |
| parent | 9727e3ab7aff88cb0c8115eb3231af7e25317d01 (diff) | |
| download | u-boot-e9bf0ce6c1e987e7af859e94e5e6ce44dfb4ede0.zip u-boot-e9bf0ce6c1e987e7af859e94e5e6ce44dfb4ede0.tar.gz u-boot-e9bf0ce6c1e987e7af859e94e5e6ce44dfb4ede0.tar.bz2 | |
mpc85xx: relocate code in non-SPL build
When building a non-SPL image, relocation is needed. This patch restores
the old behaviour before commit b35316fb67cb ("Convert
CONFIG_SPL_INIT_MINIMAL et al to Kconfig") was only defined if
CONFIG_SPL_BUILD was defined.
Fixes: b35316fb67cb ("Convert CONFIG_SPL_INIT_MINIMAL et al to Kconfig")
Signed-off-by: Martin Fäcknitz <faecknitz@hotsplots.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index e9c3042..b737d5d 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1617,7 +1617,7 @@ relocate_code: mr r10,r5 /* Save copy of Destination Address */ GET_GOT -#ifndef CONFIG_SPL_SKIP_RELOCATE +#if !defined(CONFIG_SPL_SKIP_RELOCATE) || !defined(CONFIG_SPL_BUILD) mr r3,r5 /* Destination Address */ lis r4,CONFIG_VAL(SYS_MONITOR_BASE)@h /* Source Address */ ori r4,r4,CONFIG_VAL(SYS_MONITOR_BASE)@l |