| Message ID | 20200603151513.3528522-2-marcin@juszkiewicz.com.pl |
|---|---|
| State | Accepted |
| Commit | b587acc6b1fbcbf6edcebef7613cbf7ea84a999e |
| Headers | show |
| Series | [1/2] rockchip: rockpro64: Store default env into SPI | expand |
On 2020/6/3 ??11:15, Marcin Juszkiewicz wrote: > U-Boot TPL 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42) > Channel 0: LPDDR4, 50MHz > BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB > Channel 1: LPDDR4, 50MHz > BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB > 256B stride > 256B stride > lpddr4_set_rate: change freq to 400000000 mhz 0, 1 > lpddr4_set_rate: change freq to 800000000 mhz 1, 0 > Trying to boot from BOOTROM > Returning to boot ROM... > > U-Boot SPL 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42 +0200) > Trying to boot from SPI > > U-Boot 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42 +0200) > > SoC: Rockchip rk3399 > Reset cause: RST > Model: Pine64 RockPro64 v2.1 > DRAM: 3.9 GiB > PMIC: RK808 > MMC: mmc at fe310000: 2, mmc at fe320000: 1, sdhci at fe330000: 0 > Loading Environment from SPI Flash... SF: Detected gd25q128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB > *** Warning - bad CRC, using default environment > > In: serial > Out: vidconsole > Err: vidconsole > Model: Pine64 RockPro64 v2.1 > Net: eth0: ethernet at fe300000 > Hit any key to stop autoboot: 0 > => > > Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 12 +++++++++++- > configs/rockpro64-rk3399_defconfig | 3 +++ > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git arch/arm/dts/rk3399-rockpro64-u-boot.dtsi arch/arm/dts/rk3399-rockpro64-u-boot.dtsi > index deaa3efd39..bac09df4a3 100644 > --- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi > +++ arch/arm/dts/rk3399-rockpro64-u-boot.dtsi > @@ -11,7 +11,17 @@ > }; > > chosen { > - u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci; > + u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci; > + }; > + > + config { > + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ > + }; > +}; > + > +&spi1 { > + spi_flash: flash at 0 { > + u-boot,dm-pre-reloc; > }; > }; > > diff --git configs/rockpro64-rk3399_defconfig configs/rockpro64-rk3399_defconfig > index 72389d0e60..9fdda2ba4f 100644 > --- configs/rockpro64-rk3399_defconfig > +++ configs/rockpro64-rk3399_defconfig > @@ -8,6 +8,8 @@ CONFIG_TARGET_ROCKPRO64_RK3399=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_DEBUG_UART_BASE=0xFF1A0000 > CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI_SUPPORT=y > CONFIG_DEBUG_UART=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" > CONFIG_MISC_INIT_R=y > @@ -15,6 +17,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > +CONFIG_SPL_SPI_LOAD=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y
diff --git arch/arm/dts/rk3399-rockpro64-u-boot.dtsi arch/arm/dts/rk3399-rockpro64-u-boot.dtsi index deaa3efd39..bac09df4a3 100644 --- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +++ arch/arm/dts/rk3399-rockpro64-u-boot.dtsi @@ -11,7 +11,17 @@ }; chosen { - u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci; + u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci; + }; + + config { + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ + }; +}; + +&spi1 { + spi_flash: flash at 0 { + u-boot,dm-pre-reloc; }; }; diff --git configs/rockpro64-rk3399_defconfig configs/rockpro64-rk3399_defconfig index 72389d0e60..9fdda2ba4f 100644 --- configs/rockpro64-rk3399_defconfig +++ configs/rockpro64-rk3399_defconfig @@ -8,6 +8,8 @@ CONFIG_TARGET_ROCKPRO64_RK3399=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb" CONFIG_MISC_INIT_R=y @@ -15,6 +17,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_SPL_SPI_LOAD=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y
U-Boot TPL 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42) Channel 0: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB Channel 1: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB 256B stride 256B stride lpddr4_set_rate: change freq to 400000000 mhz 0, 1 lpddr4_set_rate: change freq to 800000000 mhz 1, 0 Trying to boot from BOOTROM Returning to boot ROM... U-Boot SPL 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42 +0200) Trying to boot from SPI U-Boot 2020.07-rc3-00121-gab88251130 (Jun 03 2020 - 16:43:42 +0200) SoC: Rockchip rk3399 Reset cause: RST Model: Pine64 RockPro64 v2.1 DRAM: 3.9 GiB PMIC: RK808 MMC: mmc at fe310000: 2, mmc at fe320000: 1, sdhci at fe330000: 0 Loading Environment from SPI Flash... SF: Detected gd25q128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB *** Warning - bad CRC, using default environment In: serial Out: vidconsole Err: vidconsole Model: Pine64 RockPro64 v2.1 Net: eth0: ethernet at fe300000 Hit any key to stop autoboot: 0 => Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl> --- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 12 +++++++++++- configs/rockpro64-rk3399_defconfig | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-)