Skip to content
Snippets Groups Projects
Commit 2d9925bc authored by Michal Simek's avatar Michal Simek
Browse files

ARM64: zynqmp: Fix bootmode SD_MODE1


When only sdhci1 IP is enabled and SD_MODE1 bootmode is selected
U-Boot using sdboot1 variable which refers to mmc dev 1.
But this device doesn't exist because only one controller is available.

This patch fix logic around sdboot mode with using sdbootdev internal
variable.

Reported-by: default avatarChris Kohn <ckohn@xilinx.com>
Acked-by: default avatarSiva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent 78678fee
Branches
No related tags found
No related merge requests found
...@@ -103,7 +103,10 @@ int board_late_init(void) ...@@ -103,7 +103,10 @@ int board_late_init(void)
break; break;
case SD_MODE1: case SD_MODE1:
puts("SD_MODE1\n"); puts("SD_MODE1\n");
setenv("modeboot", "sdboot1"); #if defined(CONFIG_ZYNQ_SDHCI0) && defined(CONFIG_ZYNQ_SDHCI1)
setenv("sdbootdev", "1");
#endif
setenv("modeboot", "sdboot");
break; break;
case NAND_MODE: case NAND_MODE:
puts("NAND_MODE\n"); puts("NAND_MODE\n");
......
...@@ -156,8 +156,10 @@ ...@@ -156,8 +156,10 @@
"kernel_addr=0x80000\0" \ "kernel_addr=0x80000\0" \
"fdt_addr=0x7000000\0" \ "fdt_addr=0x7000000\0" \
"fdt_high=0x10000000\0" \ "fdt_high=0x10000000\0" \
"sdboot=mmcinfo && load mmc 0:0 $fdt_addr system.dtb && " \ "sdbootdev=0\0"\
"load mmc 0:0 $kernel_addr Image && booti $kernel_addr - $fdt_addr\0" \ "sdboot=mmc dev $sdbootdev && mmcinfo && load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \
"load mmc $sdbootdev:$partid $kernel_addr Image && " \
"booti $kernel_addr - $fdt_addr\0" \
DFU_ALT_INFO DFU_ALT_INFO
#define CONFIG_BOOTARGS "setenv bootargs console=ttyPS0,${baudrate} " \ #define CONFIG_BOOTARGS "setenv bootargs console=ttyPS0,${baudrate} " \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment