| Message ID | 20210822182354.10659-1-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | a3010bcfede0b0f84da069e3dd67ffd1142ee286 |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | sunxi: Select SPL_SEPARATE_BSS | expand |
On Sun, 22 Aug 2021 13:23:53 -0500 Samuel Holland <samuel@sholland.org> wrote: > sunxi-common.h defines CONFIG_SPL_BSS_START_ADDR to put SPL's BSS in > DRAM. Due to this, we must select SPL_SEPARATE_BSS, or else SPL will > attempt to load its DTB from the wrong address (after BSS in DRAM). > > This change fixes booting with SPL_OF_CONTROL=y. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Makes sense, although I think we don't use that atm? Anyway: Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > > arch/arm/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index d692139199c..67011208a00 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1008,6 +1008,7 @@ config ARCH_SUNXI > select OF_CONTROL > select OF_SEPARATE > select SPECIFY_CONSOLE_INDEX > + select SPL_SEPARATE_BSS if SPL > select SPL_STACK_R if SPL > select SPL_SYS_MALLOC_SIMPLE if SPL > select SPL_SYS_THUMB_BUILD if !ARM64
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d692139199c..67011208a00 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1008,6 +1008,7 @@ config ARCH_SUNXI select OF_CONTROL select OF_SEPARATE select SPECIFY_CONSOLE_INDEX + select SPL_SEPARATE_BSS if SPL select SPL_STACK_R if SPL select SPL_SYS_MALLOC_SIMPLE if SPL select SPL_SYS_THUMB_BUILD if !ARM64
sunxi-common.h defines CONFIG_SPL_BSS_START_ADDR to put SPL's BSS in DRAM. Due to this, we must select SPL_SEPARATE_BSS, or else SPL will attempt to load its DTB from the wrong address (after BSS in DRAM). This change fixes booting with SPL_OF_CONTROL=y. Signed-off-by: Samuel Holland <samuel@sholland.org> --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)