| Message ID | 20240217002304.2141064-14-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | c60b835be28a9d6d7a03a64b42a922c08e62530d |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI | expand |
Hi Jonas, On 2/17/24 01:22, Jonas Karlman wrote: > Similar to RK35xx the BootRom in RK3328 can read all data and look for > idbloader at 0x8000, same as it does for SD and eMMC. > > Use the rksd format and modify the mkimage offset to generate a bootable > u-boot-rockchip-spi.bin that can be written to 0x0 of SPI NOR flash. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > v2: > - No change > --- > arch/arm/dts/rk3328-u-boot.dtsi | 11 +++++++++++ > arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + > 2 files changed, 12 insertions(+) > > diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi > index a030f1a5e51d..4d43fe2fb51a 100644 > --- a/arch/arm/dts/rk3328-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-u-boot.dtsi > @@ -133,3 +133,14 @@ > &usb20_otg { > hnp-srp-disable; > }; > + > +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE > +&binman { > + simple-bin-spi { > + mkimage { > + args = "-n", CONFIG_SYS_SOC, "-T", "rksd"; > + offset = <0x8000>; > + }; > + }; > +}; > +#endif Do we have a list of SoCs that need to use rkspi type for booting from SPI flashes? I would much rather have rksd the default in rockchip-u-boot.dtsi instead of having to add it for each and every SoC which is not impacted by this change (which I assume should be now all new SoCs?). I could also imagine a Kconfig symbol just for that, one that would NOT appear in menuconfig because it makes no sense to make it selectable (I think this can be achieved without a prompt?), e.g. (not tested): """ config ROCKCHIP_SPI_IMAGE_TYPE string depends on ROCKCHIP_SPI_IMAGE default "rksd" default "rkspi" if ROCKCHIP_RK3399 help The type passed to mkimage to generate a TPL+SPL image bootable from SPI flash on Rockchip SoCs. """ and then have """ args = "-n", CONFIG_SYS_SOC, "-T", CONFIG_ROCKCHIP_SPI_IMAGE_TYPE; """ in rockchip-u-boot.dtsi instead? I've missed those changes for other SoCs but did you explain why the SPI image is expected to start at offset 0x8000? We don't have that in rockchip-u-boot.dtsi by default, so offset 0 I assume. Cheers, Quentin
Hi Quentin, On 2024-02-22 11:18, Quentin Schulz wrote: > Hi Jonas, > > On 2/17/24 01:22, Jonas Karlman wrote: >> Similar to RK35xx the BootRom in RK3328 can read all data and look for >> idbloader at 0x8000, same as it does for SD and eMMC. >> >> Use the rksd format and modify the mkimage offset to generate a bootable >> u-boot-rockchip-spi.bin that can be written to 0x0 of SPI NOR flash. >> >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >> --- >> v2: >> - No change >> --- >> arch/arm/dts/rk3328-u-boot.dtsi | 11 +++++++++++ >> arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + >> 2 files changed, 12 insertions(+) >> >> diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi >> index a030f1a5e51d..4d43fe2fb51a 100644 >> --- a/arch/arm/dts/rk3328-u-boot.dtsi >> +++ b/arch/arm/dts/rk3328-u-boot.dtsi >> @@ -133,3 +133,14 @@ >> &usb20_otg { >> hnp-srp-disable; >> }; >> + >> +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE >> +&binman { >> + simple-bin-spi { >> + mkimage { >> + args = "-n", CONFIG_SYS_SOC, "-T", "rksd"; >> + offset = <0x8000>; >> + }; >> + }; >> +}; >> +#endif > > Do we have a list of SoCs that need to use rkspi type for booting from > SPI flashes? I would much rather have rksd the default in > rockchip-u-boot.dtsi instead of having to add it for each and every SoC > which is not impacted by this change (which I assume should be now all > new SoCs?). My best guess is that any BROM prior to and including RK3399 use the 2K per page read code for SPI flash. Any newer SoC seem to have SPI more in common with MMC, i.e. read full page data and look for boot header at similar offsets, @ 32KiB. I have been able to read out the BROM version (last 16 bytes of BROM) from my RK ARM64 SoCs: Read 2K per page: RK3399: 330C 20160118 V100 Read full SPI flash data: RK3328: 320C 20161117 V100 RK356x: 350A 20210322 V300 RK3588: 350B 20210512 V100 Unsure, guessing it read full SPI flash data: RK3308B: 330E 20180806 V200 There is also a longer list of BROM versions of older SoCs at [1]. [1] https://github.com/rockchip-linux/u-boot/blob/next-dev/arch/arm/mach-rockchip/chip_info.c > > I could also imagine a Kconfig symbol just for that, one that would NOT > appear in menuconfig because it makes no sense to make it selectable (I > think this can be achieved without a prompt?), e.g. (not tested): > """ > config ROCKCHIP_SPI_IMAGE_TYPE > string > depends on ROCKCHIP_SPI_IMAGE > default "rksd" > default "rkspi" if ROCKCHIP_RK3399 > help > The type passed to mkimage to generate a TPL+SPL image bootable > from SPI flash on Rockchip SoCs. > """ > > and then have > """ > args = "-n", CONFIG_SYS_SOC, "-T", CONFIG_ROCKCHIP_SPI_IMAGE_TYPE; > """ > > in rockchip-u-boot.dtsi instead? Agree that we should try to fix this in a different way, still not sure what the best approach will be. Another approach I played around with was to modify the mkimage rkspi format to only apply the 2K padding on affected SoCs [2]. At that time I used the RK_HEADER_V1/V2 flag, but as seen for RK3328 that cannot be used to reliably know if the padding is needed or not. From what I can see in mainline U-Boot only boards with the following SoCs have ROCKCHIP_SPI_IMAGE enabled: - RK3288 and RK3399 (2K per page) - RK356x and RK3588 (full page) With RK3328 also using full page read the scale have now tipped over so that we could prefer rksd format over rkspi. Unless anyone would like to enable it for a board with an older SoC. I am open for any suggestion on how we should proceed :-) [2] https://github.com/Kwiboo/u-boot-rockchip/commit/7b42660412493496c379015dc5019c89caf85ddf > > I've missed those changes for other SoCs but did you explain why the SPI > image is expected to start at offset 0x8000? We don't have that in > rockchip-u-boot.dtsi by default, so offset 0 I assume. Based on my testing of boot from SPI flash on RK356x booting worked when I wrote ID block @ 32 KiB offset from start of SPI flash. This was different to the @ 0 offset used on RK3288 and RK3399. Most documentation already mentioned that u-boot-rockchip-spi.bin should be written to start of SPI flash. Adding an offset of 32 KiB so that the same instruction can be used across SoCs seemed like the best approach. Regards, Jonas > > Cheers, > Quentin
On 2024/2/17 08:22, Jonas Karlman wrote: > Similar to RK35xx the BootRom in RK3328 can read all data and look for > idbloader at 0x8000, same as it does for SD and eMMC. > > Use the rksd format and modify the mkimage offset to generate a bootable > u-boot-rockchip-spi.bin that can be written to 0x0 of SPI NOR flash. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: > - No change > --- > arch/arm/dts/rk3328-u-boot.dtsi | 11 +++++++++++ > arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + > 2 files changed, 12 insertions(+) > > diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi > index a030f1a5e51d..4d43fe2fb51a 100644 > --- a/arch/arm/dts/rk3328-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-u-boot.dtsi > @@ -133,3 +133,14 @@ > &usb20_otg { > hnp-srp-disable; > }; > + > +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE > +&binman { > + simple-bin-spi { > + mkimage { > + args = "-n", CONFIG_SYS_SOC, "-T", "rksd"; > + offset = <0x8000>; > + }; > + }; > +}; > +#endif > diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c > index b591d38fe412..b82b209de9e2 100644 > --- a/arch/arm/mach-rockchip/rk3328/rk3328.c > +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c > @@ -36,6 +36,7 @@ > > const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { > [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000", > + [BROM_BOOTSOURCE_SPINOR] = "/spi@ff190000/flash@0", > [BROM_BOOTSOURCE_SD] = "/mmc@ff500000", > }; >
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index a030f1a5e51d..4d43fe2fb51a 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -133,3 +133,14 @@ &usb20_otg { hnp-srp-disable; }; + +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE +&binman { + simple-bin-spi { + mkimage { + args = "-n", CONFIG_SYS_SOC, "-T", "rksd"; + offset = <0x8000>; + }; + }; +}; +#endif diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index b591d38fe412..b82b209de9e2 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -36,6 +36,7 @@ const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000", + [BROM_BOOTSOURCE_SPINOR] = "/spi@ff190000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@ff500000", };
Similar to RK35xx the BootRom in RK3328 can read all data and look for idbloader at 0x8000, same as it does for SD and eMMC. Use the rksd format and modify the mkimage offset to generate a bootable u-boot-rockchip-spi.bin that can be written to 0x0 of SPI NOR flash. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - No change --- arch/arm/dts/rk3328-u-boot.dtsi | 11 +++++++++++ arch/arm/mach-rockchip/rk3328/rk3328.c | 1 + 2 files changed, 12 insertions(+)