mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
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 MMC2
mmc_load_image_raw_sector: mmc block read error
Trying to boot from MMC1
mmc_load_image_raw_sector: mmc block read error
SPL: failed to boot from all boot devices
Fixes: 167efc2c7a
("arm64: dts: rk3399: Sync v5.7-rc1 from Linux"
Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
parent
ab80137cc4
commit
97de3935aa
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
chosen {
|
chosen {
|
||||||
u-boot,spl-boot-order = &sdhci, &sdmmc;
|
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,6 +8,6 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
chosen {
|
chosen {
|
||||||
u-boot,spl-boot-order = &sdhci, &sdmmc;
|
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
/ {
|
/ {
|
||||||
chosen {
|
chosen {
|
||||||
u-boot,spl-boot-order = &sdhci, &sdmmc;
|
u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
||||||
};
|
};
|
||||||
|
|
||||||
vdd_log: vdd-log {
|
vdd_log: vdd-log {
|
||||||
|
@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||||||
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
|
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
|
||||||
[BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
|
[BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
|
||||||
[BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000",
|
[BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000",
|
||||||
[BROM_BOOTSOURCE_SD] = "/dwmmc@fe320000",
|
[BROM_BOOTSOURCE_SD] = "/mmc@fe320000",
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct mm_region rk3399_mem_map[] = {
|
static struct mm_region rk3399_mem_map[] = {
|
||||||
@ -176,7 +176,7 @@ const char *spl_decode_boot_device(u32 boot_device)
|
|||||||
u32 boot_device;
|
u32 boot_device;
|
||||||
const char *ofpath;
|
const char *ofpath;
|
||||||
} spl_boot_devices_tbl[] = {
|
} spl_boot_devices_tbl[] = {
|
||||||
{ BOOT_DEVICE_MMC1, "/dwmmc@fe320000" },
|
{ BOOT_DEVICE_MMC1, "/mmc@fe320000" },
|
||||||
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
|
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
|
||||||
{ BOOT_DEVICE_SPI, "/spi@ff1d0000" },
|
{ BOOT_DEVICE_SPI, "/spi@ff1d0000" },
|
||||||
};
|
};
|
||||||
|
@ -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
|
* only consider cases where the default boot-order first
|
||||||
* tries to boot from mmc0 (eMMC) and then from mmc1
|
* tries to boot from mmc0 (eMMC) and then from mmc1
|
||||||
* (i.e. external SD).
|
* (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
|
* In other words: the SD card will be moved to earlier in the
|
||||||
* order, if U-Boot was also loaded from the SD-card.
|
* 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;
|
char *mmc0, *mmc1;
|
||||||
|
|
||||||
debug("%s: booted from SD-Card\n", __func__);
|
debug("%s: booted from SD-Card\n", __func__);
|
||||||
|
Loading…
Reference in New Issue
Block a user