rockchip: Fix spl mmc boot device ofpath
Subsystems (3)
PATCH v2 1/1 rockchip: Fix spl mmc boot device ofpath
Linux v5.7-rc1 dts(i) sync has changed the sdmmc node from dwmmc@fe320000 to mmc@fe320000 and this ofpath is being used in rockchip spl bootdevice code.
So, update the ofpath with a new node name and prefix "same-as-spl" to missing u-boot,spl-boot-order.
Bug log:
U-Boot SPL 2020.07-rc2-00256-g9c5fef5774 (May 24 2020 - 20:20:43 +0530) Trying to boot from MMC2mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC1mmc_load_image_raw_sector: mmc block read error
SPL: failed to boot from all boot devices
---
Changes for v2:
- prefix "same-as-spl" to missing u-boot,spl-boot-order
arch/arm/dts/rk3399-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/dts/rk3399-evb-u-boot.dtsi +1 -1
@@ -8,7 +8,7 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; };
arch/arm/dts/rk3399-ficus-u-boot.dtsi +1 -1
@@ -8,6 +8,6 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; };
arch/arm/dts/rk3399-rock960-u-boot.dtsi +1 -1
@@ -8,7 +8,7 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; vdd_log: vdd-log {
arch/arm/mach-rockchip/rk3399/rk3399.c +2 -2
@@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;const char *const boot_devices[BROM_LAST_BOOTSOURCE +1 ] = { [BROM_BOOTSOURCE_EMMC ] ="/sdhci@fe330000" , [BROM_BOOTSOURCE_SPINOR ] ="/spi@ff1d0000" , - [BROM_BOOTSOURCE_SD ] ="/dwmmc@fe320000" , + [BROM_BOOTSOURCE_SD ] ="/mmc@fe320000" , };static struct mm_region rk3399_mem_map[] = {
@@ -176,7 +176,7 @@ const char *spl_decode_boot_device(u32 boot_device)u32 boot_device;const char *ofpath; } spl_boot_devices_tbl[] = { - { BOOT_DEVICE_MMC1, "/dwmmc@fe320000" }, + { BOOT_DEVICE_MMC1, "/mmc@fe320000" }, { BOOT_DEVICE_MMC2, "/sdhci@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, };
board/theobroma-systems/puma_rk3399/puma-rk3399.c +2 -2
@@ -77,7 +77,7 @@ static int setup_boottargets(void) }/* -* Only run, if booting from mmc1 (i.e. /dwmmc@fe320000) and +* Only run, if booting from mmc1 (i.e. /mmc@fe320000) and * only consider cases where the default boot-order first * tries to boot from mmc0 (eMMC) and then from mmc1 * (i.e. external SD).
@@ -85,7 +85,7 @@ static int setup_boottargets(void)* In other words: the SD card will be moved to earlier in the * order, if U-Boot was also loaded from the SD-card. */ -if (!strcmp (boot_device,"/dwmmc@fe320000" )) { +if (!strcmp (boot_device,"/mmc@fe320000" )) {char *mmc0, *mmc1;debug ("%s: booted from SD-Card\n" , __func__);
Signature · 1 line
2.25.1
Quoted 15 lines · Jagan Teki
Linux v5.7-rc1 dts(i) sync has changed the sdmmc node from dwmmc@fe320000 to mmc@fe320000 and this ofpath is being used in rockchip spl bootdevice code.
So, update the ofpath with a new node name and prefix "same-as-spl" to missing u-boot,spl-boot-order.
Bug log:
U-Boot SPL 2020.07-rc2-00256-g9c5fef5774 (May 24 2020 - 20:20:43 +0530) Trying to boot from MMC2mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC1mmc_load_image_raw_sector: mmc block read error
SPL: failed to boot from all boot devices
Quoted 3 lines
Fixes 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux"Signed-off-by Suniel Mahesh <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Thanks,
- Kever
Quoted 93 lines
---
Changes for v2:
- prefix "same-as-spl" to missing u-boot,spl-boot-orderarch/arm/dts/rk3399-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)arch/arm/dts/rk3399-evb-u-boot.dtsi +1
-1@@ -8,7 +8,7 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; };arch/arm/dts/rk3399-ficus-u-boot.dtsi +1
-1@@ -8,6 +8,6 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; };arch/arm/dts/rk3399-rock960-u-boot.dtsi +1
-1@@ -8,7 +8,7 @@ / { chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; }; vdd_log: vdd-log {arch/arm/mach-rockchip/rk3399/rk3399.c +2
-2@@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;const char *const boot_devices[BROM_LAST_BOOTSOURCE +1 ] = { [BROM_BOOTSOURCE_EMMC ] ="/sdhci@fe330000" , [BROM_BOOTSOURCE_SPINOR ] ="/spi@ff1d0000" , - [BROM_BOOTSOURCE_SD ] ="/dwmmc@fe320000" , + [BROM_BOOTSOURCE_SD ] ="/mmc@fe320000" , };static struct mm_region rk3399_mem_map[] = {@@ -176,7 +176,7 @@ const char *spl_decode_boot_device(u32 boot_device)u32 boot_device;const char *ofpath; } spl_boot_devices_tbl[] = { - { BOOT_DEVICE_MMC1, "/dwmmc@fe320000" }, + { BOOT_DEVICE_MMC1, "/mmc@fe320000" }, { BOOT_DEVICE_MMC2, "/sdhci@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, };board/theobroma-systems/puma_rk3399/puma-rk3399.c +2
-2@@ -77,7 +77,7 @@ static int setup_boottargets(void) }/* -* Only run, if booting from mmc1 (i.e. /dwmmc@fe320000) and +* Only run, if booting from mmc1 (i.e. /mmc@fe320000) and * only consider cases where the default boot-order first * tries to boot from mmc0 (eMMC) and then from mmc1 * (i.e. external SD). @@ -85,7 +85,7 @@ static int setup_boottargets(void)* In other words: the SD card will be moved to earlier in the * order, if U-Boot was also loaded from the SD-card. */ -if (!strcmp (boot_device,"/dwmmc@fe320000" )) { +if (!strcmp (boot_device,"/mmc@fe320000" )) {char *mmc0, *mmc1;debug ("%s: booted from SD-Card\n" , __func__);