| Message ID | 20200509200539.18377-3-ezra@easyb.ch |
|---|---|
| State | Accepted |
| Commit | 0700093b852ac62bc68a80e96dea9ba255d7efbc |
| Headers | show |
| Series | Fix boot from SPI flash on Synology DS414 | expand |
On 09.05.20 22:05, Ezra Buehler wrote: > Without CONFIG_SYS_U_BOOT_OFFS set to CONFIG_SYS_SPI_U_BOOT_OFFS, U-Boot > will be located at address 0x16000. But, SPL will try to load the > payload from 0x24000 causing the boot to hang. > > Signed-off-by: Ezra Buehler <ezra at easyb.ch> Reviewed-by: Stefan Roese <sr at denx.de> Thanks, Stefan
diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e3693767b6..b179b99468 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -87,7 +87,10 @@ #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10)) #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) +#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI) /* SPL related SPI defines */ +#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS +#endif /* DS414 bus width is 32bits */ #define CONFIG_DDR_32BIT
Without CONFIG_SYS_U_BOOT_OFFS set to CONFIG_SYS_SPI_U_BOOT_OFFS, U-Boot will be located at address 0x16000. But, SPL will try to load the payload from 0x24000 causing the boot to hang. Signed-off-by: Ezra Buehler <ezra at easyb.ch> --- Changes for v2: - Tweaked commit message include/configs/ds414.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.26.2