| Message ID | 20220715151552.953654-2-foss+uboot@0leil.net |
|---|---|
| State | Accepted |
| Commit | 7a81a44caf9b2ca8ad80d0f6fca7950e5a224e93 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [1/2] rockchip: rk3399: fix incorrect boot-device in u-boot, spl-boot-device | expand |
El Fri, Jul 15, 2022 at 05:15:52PM +0200, Quentin Schulz deia: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > While technically not a bug, let's have some consistency in paths > returned by u-boot,spl-boot-order look-up and the one saved in > u-boot,spl-boot-device by syncing spl_boot_devices_tbl and boot_devices > node paths. > > Cc: Quentin Schulz <foss+uboot@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> > --- Tested on a Rock-Pi-4B and didn't see any regression. Tested-by: Xavier Drudis Ferran <xdrudis@tinet.cat> Reviewed-by: Xavier Drudis Ferran <xdrudis@tinet.cat> > arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c > index f280cb1dbf..7147dc09f5 100644 > --- a/arch/arm/mach-rockchip/rk3399/rk3399.c > +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c > @@ -182,7 +182,7 @@ const char *spl_decode_boot_device(u32 boot_device) > } spl_boot_devices_tbl[] = { > { BOOT_DEVICE_MMC2, "/mmc@fe320000" }, > { BOOT_DEVICE_MMC1, "/mmc@fe330000" }, > - { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, > + { BOOT_DEVICE_SPI, "/spi@ff1d0000/flash@0" }, > }; > > for (i = 0; i < ARRAY_SIZE(spl_boot_devices_tbl); ++i) > -- > 2.36.1 >
Hi all, Gentle ping on the series. Cheers, Quentin On 7/18/22 23:12, Xavier Drudis Ferran wrote: > El Fri, Jul 15, 2022 at 05:15:52PM +0200, Quentin Schulz deia: >> From: Quentin Schulz <quentin.schulz@theobroma-systems.com> >> >> While technically not a bug, let's have some consistency in paths >> returned by u-boot,spl-boot-order look-up and the one saved in >> u-boot,spl-boot-device by syncing spl_boot_devices_tbl and boot_devices >> node paths. >> >> Cc: Quentin Schulz <foss+uboot@0leil.net> >> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> >> --- > > > Tested on a Rock-Pi-4B and didn't see any regression. > Tested-by: Xavier Drudis Ferran <xdrudis@tinet.cat> > Reviewed-by: Xavier Drudis Ferran <xdrudis@tinet.cat> > > >> arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c >> index f280cb1dbf..7147dc09f5 100644 >> --- a/arch/arm/mach-rockchip/rk3399/rk3399.c >> +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c >> @@ -182,7 +182,7 @@ const char *spl_decode_boot_device(u32 boot_device) >> } spl_boot_devices_tbl[] = { >> { BOOT_DEVICE_MMC2, "/mmc@fe320000" }, >> { BOOT_DEVICE_MMC1, "/mmc@fe330000" }, >> - { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, >> + { BOOT_DEVICE_SPI, "/spi@ff1d0000/flash@0" }, >> }; >> >> for (i = 0; i < ARRAY_SIZE(spl_boot_devices_tbl); ++i) >> -- >> 2.36.1 >>
On 2022/7/15 23:15, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > While technically not a bug, let's have some consistency in paths > returned by u-boot,spl-boot-order look-up and the one saved in > u-boot,spl-boot-device by syncing spl_boot_devices_tbl and boot_devices > node paths. > > Cc: Quentin Schulz <foss+uboot@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c > index f280cb1dbf..7147dc09f5 100644 > --- a/arch/arm/mach-rockchip/rk3399/rk3399.c > +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c > @@ -182,7 +182,7 @@ const char *spl_decode_boot_device(u32 boot_device) > } spl_boot_devices_tbl[] = { > { BOOT_DEVICE_MMC2, "/mmc@fe320000" }, > { BOOT_DEVICE_MMC1, "/mmc@fe330000" }, > - { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, > + { BOOT_DEVICE_SPI, "/spi@ff1d0000/flash@0" }, > }; > > for (i = 0; i < ARRAY_SIZE(spl_boot_devices_tbl); ++i)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index f280cb1dbf..7147dc09f5 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -182,7 +182,7 @@ const char *spl_decode_boot_device(u32 boot_device) } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC2, "/mmc@fe320000" }, { BOOT_DEVICE_MMC1, "/mmc@fe330000" }, - { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, + { BOOT_DEVICE_SPI, "/spi@ff1d0000/flash@0" }, }; for (i = 0; i < ARRAY_SIZE(spl_boot_devices_tbl); ++i)