Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM64: zynqmp: Fix bootmode SD_MODE1

Browse source 
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: Chris Kohn <ckohn@xilinx.com>
Acked-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-11-06 10:22:37 +01:00
parent 78678feeac
commit 2d9925bce3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
board/xilinx/zynqmp/zynqmp.c
View file

@ -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");

6
include/configs/xilinx_zynqmp.h
View file

@ -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} " \