From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 5 Oct 2015 08:51:12 +0000 (+0200)
Subject: ARM64: zynqmp: Add support for SD1 boot mode
X-Git-Tag: v2016.03-rc1~46^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af813acd481bf3490a982e279567e49b59f28117;p=platform%2Fkernel%2Fu-boot.git

ARM64: 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 5eec999..5879382 100644
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -66,7 +66,8 @@ struct iou_scntr_secure {
 #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 cf8d6a4..6bdec20 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -94,6 +94,12 @@ 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;
 	default:
 		printf("Invalid Boot Mode:0x%x\n", bootmode);
 		break;