From patchwork Sat May 9 20:05:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezra Buehler X-Patchwork-Id: 245388 List-Id: U-Boot discussion From: ezra at easyb.ch (Ezra Buehler) Date: Sat, 9 May 2020 22:05:38 +0200 Subject: [PATCH v2 1/2] arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0 In-Reply-To: <20200509200539.18377-1-ezra@easyb.ch> References: <20200509200539.18377-1-ezra@easyb.ch> Message-ID: <20200509200539.18377-2-ezra@easyb.ch> 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 Reviewed-by: Stefan Roese --- 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 -- 2.26.2 diff --git a/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi b/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi new file mode 100644 index 0000000000..22fae16c9d --- /dev/null +++ b/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi @@ -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; + }; +}; From patchwork Sat May 9 20:05:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezra Buehler X-Patchwork-Id: 245389 List-Id: U-Boot discussion From: ezra at easyb.ch (Ezra Buehler) Date: Sat, 9 May 2020 22:05:39 +0200 Subject: [PATCH v2 2/2] arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS In-Reply-To: <20200509200539.18377-1-ezra@easyb.ch> References: <20200509200539.18377-1-ezra@easyb.ch> Message-ID: <20200509200539.18377-3-ezra@easyb.ch> 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 Reviewed-by: Stefan Roese --- Changes for v2: - Tweaked commit message include/configs/ds414.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.26.2 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