From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 5 Oct 2015 08:51:12 +0000 (+0200)
Subject: zynqmp: Add support for SD1 boot mode
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b960f2a9843bac4c5d3e4b65b8061cc4dcb9a72d;p=thirdparty%2Fu-boot.git

zynqmp: Add support for SD1 boot mode

SD1 boot mode is using different bootmode values.
Add support for this mode used on DC1.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index 3220a786ec4..7e22e09cf09 100644
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -71,7 +71,8 @@ struct iou_scntr {
 #define BOOT_MODES_MASK	0x0000000F
 #define QSPI_MODE_24BIT	0x00000001
 #define QSPI_MODE_32BIT	0x00000002
-#define SD_MODE		0x00000003
+#define SD_MODE		0x00000003 /* sd 0 */
+#define SD_MODE1	0x00000005 /* sd 1 */
 #define NAND_MODE	0x00000004
 #define EMMC_MODE	0x00000006
 #define JTAG_MODE	0x00000000
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 3d571bb1faf..65dfba7d82b 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -144,6 +144,9 @@ int board_late_init(void)
 	case EMMC_MODE:
 		setenv("modeboot", "sdboot");
 		break;
+	case SD_MODE1:
+		setenv("modeboot", "sdboot1");
+		break;
 	case NAND_MODE:
 		setenv("modeboot", "nandboot");
 		break;
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 4e44846bb43..f9b13228078 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -208,6 +208,9 @@
 	"sdboot=mmcinfo && load mmc 0:$partid $fdt_addr system.dtb && " \
 		"load mmc 0:$partid $kernel_addr Image && " \
 		"booti $kernel_addr - $fdt_addr\0" \
+	"sdboot1=mmc dev 1 && mmcinfo && load mmc 1:$partid $fdt_addr system.dtb && " \
+		"load mmc 1:$partid $kernel_addr Image && " \
+		"booti $kernel_addr - $fdt_addr\0" \
 	"nandboot=nand info && nand read $fdt_addr $fdt_offset $fdt_size && " \
 		  "nand read $kernel_addr $kernel_offset $kernel_size && " \
 		  "booti $kernel_addr - $fdt_addr\0" \