Fix boot from SPI flash on Synology DS414
v2 cover Fix boot from SPI flash on Synology DS414
Booting from SPI flash on Synology DS414 (or DS214+) devices has been broken for quite some time now. As far as I can tell this is due to following commits:
3c265bbe4d rm: sync armada-xp dts files from Linux 5.0
7ddf8cfb0d kwbimage: Rename CONFIG_SYS_SPI_U_BOOT_OFFS to CONFIG_SYS_U_BOOT_OFFS
Changes for v2:
- Moved U-Boot-specific properties to *-u-boot.dtsi file
- Tweaked commit message
Ezra Buehler (2):
arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0
arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi | 9 +++++++++ include/configs/ds414.h | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
--
2.26.2
PATCH v2 1/2 arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0
Without this U-Boot-specific property, booting on the Synology DS414 (or DS214+) fails in SPL. The spi0 DT node is not scanned, as a result the SPI flash cannot be found.
---
Changes for v2:
- Moved U-Boot-specific properties to *-u-boot.dtsi file
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash at 0 { + u-boot,dm-pre-reloc; + }; +};
--
2.26.2
PATCH v2 1/2 arm: mvebu: ds414: add u-boot, dm-pre-reloc to spi0
Quoted 5 lines · Ezra Buehler
Without this U-Boot-specific property, booting on the Synology DS414 (or DS214+) fails in SPL. The spi0 DT node is not scanned, as a result the SPI flash cannot be found.
Signed-off-by Ezra Buehler <[email protected]>
Thanks,
Stefan
PATCH v2 2/2 arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS
In reply to Ezra BuehlerWithout 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.
---
Changes for v2:
- Tweaked commit message
include/configs/ds414.h | 3 +++ 1 file changed, 3 insertions(+)
include/configs/ds414.h +3 -0
@@ -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
--
2.26.2
PATCH v2 2/2 arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS
Quoted 5 lines · Ezra Buehler
Without
CONFIG_SYS_U_BOOT_OFFSset toCONFIG_SYS_SPI_U_BOOT_OFFS, U-Boot will be located at address0x16000. But, SPL will try to load the payload from0x24000causing the boot to hang.Signed-off-by Ezra Buehler <[email protected]>
Thanks,
Stefan
v2 cover Fix boot from SPI flash on Synology DS414
In reply to Ezra BuehlerQuoted 8 lines · Ezra Buehler,
Booting from SPI flash on Synology DS414 (or DS214+) devices has been broken for quite some time now. As far as I can tell this is due to following commits:
3c265bbe4drm: sync armada-xp dts files from Linux 5.07ddf8cfb0dkwbimage: RenameCONFIG_SYS_SPI_U_BOOT_OFFStoCONFIG_SYS_U_BOOT_OFFS
Quoted 8 lines
Changes for v2:
- Moved U-Boot-specific properties to *-u-boot.dtsi file
- Tweaked commit messageEzra Buehler (2):
arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0
arm: mvebu: ds414: defineCONFIG_SYS_U_BOOT_OFFS
Both look good to me.
Quoted 8 lines
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi | 9 +++++++++ include/configs/ds414.h | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi--
2.26.2
v2 cover Fix boot from SPI flash on Synology DS414
In reply to Ezra BuehlerQuoted 11 lines · Ezra Buehler
Booting from SPI flash on Synology DS414 (or DS214+) devices has been broken for quite some time now. As far as I can tell this is due to following commits:
3c265bbe4drm: sync armada-xp dts files from Linux 5.0
7ddf8cfb0dkwbimage: RenameCONFIG_SYS_SPI_U_BOOT_OFFStoCONFIG_SYS_U_BOOT_OFFSChanges for v2:
- Moved U-Boot-specific properties to *-u-boot.dtsi file
- Tweaked commit message
Quoted 8 lines
Ezra Buehler (2):
arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0
arm: mvebu: ds414: defineCONFIG_SYS_U_BOOT_OFFSarch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi | 9 +++++++++ include/configs/ds414.h | 3 +++ 2 files changed, 12 insertions(+)create mode 100644
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
Applied to u-boot-marvell/master
Thanks,
Stefan