ARM: zynq: List nand, qspi and jtag boot modes
authorMichal Simek <michal.simek@xilinx.com>
Tue, 13 Jan 2015 15:04:10 +0000 (16:04 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 26 Jan 2015 07:55:57 +0000 (08:55 +0100)
Use full boot mode list in SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/cpu/armv7/zynq/spl.c
arch/arm/include/asm/arch-zynq/hardware.h

index 31627f970efbec334262c0dcfc54e10a9794a668..3fb876d07ab8bc6e3265b34ea20f8c37da7071e8 100644 (file)
@@ -46,12 +46,21 @@ u32 spl_boot_device(void)
                mode = BOOT_DEVICE_SPI;
                break;
 #endif
+       case ZYNQ_BM_NAND:
+               mode = BOOT_DEVICE_NAND;
+               break;
+       case ZYNQ_BM_NOR:
+               mode = BOOT_DEVICE_NOR;
+               break;
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case ZYNQ_BM_SD:
                puts("mmc boot\n");
                mode = BOOT_DEVICE_MMC1;
                break;
 #endif
+       case ZYNQ_BM_JTAG:
+               mode = BOOT_DEVICE_RAM;
+               break;
        default:
                puts("Unsupported boot mode selected\n");
                hang();
index 2aede0c552c62a4956028afd36a03ce411d5d55b..8dfedd7a94ceb64549399c3b9e02e9b23e4985a3 100644 (file)
@@ -28,7 +28,9 @@
 
 /* Bootmode setting values */
 #define ZYNQ_BM_MASK           0x7
+#define ZYNQ_BM_QSPI           0x1
 #define ZYNQ_BM_NOR            0x2
+#define ZYNQ_BM_NAND           0x4
 #define ZYNQ_BM_SD             0x5
 #define ZYNQ_BM_JTAG           0x0