From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Fri, 13 Mar 2015 05:40:26 +0000 (+0530)
Subject: ARM64: zynqmp: Modify the SD and QSPI bootmode values
X-Git-Tag: v2016.03-rc1~46^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a5bcc8c0d04d4dd277cfeb1edf1e7b298b0f484;p=oweals%2Fu-boot.git

ARM64: zynqmp: Modify the SD and QSPI bootmode values

Modify the SD bootmode value to 0x3 as per latest
spec. Also add new boot mode QSPI 32 bit boot mode

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
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 5f4cfe3b6b..5eec999d5f 100644
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -64,7 +64,10 @@ struct iou_scntr_secure {
 
 /* Bootmode setting values */
 #define BOOT_MODES_MASK	0x0000000F
+#define QSPI_MODE_24BIT	0x00000001
+#define QSPI_MODE_32BIT	0x00000002
 #define SD_MODE		0x00000003
+#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 63c332f03d..cf8d6a4a51 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -83,6 +83,13 @@ int board_late_init(void)
 	bootmode = reg & BOOT_MODES_MASK;
 
 	switch (bootmode) {
+	case JTAG_MODE:
+		setenv("modeboot", "netboot");
+		break;
+	case QSPI_MODE_24BIT:
+	case QSPI_MODE_32BIT:
+		setenv("modeboot", "qspiboot");
+		break;
 	case SD_MODE:
 	case EMMC_MODE:
 		setenv("modeboot", "sdboot");