Add SPI flash boot support to rockchip64/rk3399

This commit is contained in:
Piotr Szczepanik 2020-07-26 22:02:31 +02:00
parent 20e6618464
commit c43c4e9cbd
3 changed files with 26 additions and 13 deletions

View file

@ -1,8 +1,8 @@
diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
index c17e769f..aa34201e 100644
index c17e769f..30f977db 100644
--- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
@@ -7,11 +7,31 @@
@@ -7,8 +7,32 @@
#include "rk3399-sdram-lpddr4-100.dtsi"
/ {
@ -11,10 +11,15 @@ index c17e769f..aa34201e 100644
+ };
+
chosen {
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
};
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+ u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci;
+ };
+
+ config {
+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
+ };
+};
+
+&spi1 {
+ status = "okay";
+
@ -28,12 +33,9 @@ index c17e769f..aa34201e 100644
+&spi1 {
+ spi_flash: flash@0 {
+ u-boot,dm-pre-reloc;
+ };
+};
+
&vdd_log {
regulator-init-microvolt = <950000>;
};
};
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
index 8b34198a..1a5cd77d 100644
--- a/configs/rock-pi-4-rk3399_defconfig