From: Siva Durga Prasad Paladugu Date: Wed, 25 Mar 2015 09:58:04 +0000 (+0530) Subject: zynqmp: Change the sd auto boot command X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3b5f205314b7ea0c31887ef837b4987e1cc10dd;p=thirdparty%2Fu-boot.git zynqmp: Change the sd auto boot command Change the sd auto boot command to use environment variable and decide the env variabale as per platform This patch will be reverted when qemu starts to use the right image. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 227bdcd2f6e..4f623f962b3 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -120,11 +120,13 @@ int board_late_init(void) case ZYNQMP_CSU_VERSION_EP108: setenv("serverip", "10.10.70.101"); setenv("ipaddr", "10.10.71.100"); + setenv("partid", "auto"); break; case ZYNQMP_CSU_VERSION_QEMU: default: setenv("serverip", "10.0.2.2"); setenv("ipaddr", "10.0.2.15"); + setenv("partid", "0"); } reg = readl(&crlapb_base->boot_mode); diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 5b97b2e28e9..007d924c99c 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -146,8 +146,8 @@ "qspiboot=sf probe 0 0 0 && sf read $fdt_addr 100000 40000 && " \ "sf read $kernel_addr 140000 1800000 && " \ "booti $kernel_addr - $fdt_addr\0" \ - "sdboot=mmcinfo && load mmc 0:auto $fdt_addr system.dtb && " \ - "load mmc 0:auto $kernel_addr Image && " \ + "sdboot=mmcinfo && load mmc 0:$partid $fdt_addr system.dtb && " \ + "load mmc 0:$partid $kernel_addr Image && " \ "booti $kernel_addr - $fdt_addr\0" \ "nandboot=nand info && nand read $fdt_addr 100000 40000 && " \ "nand read $kernel_addr 140000 1800000 && " \