diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-01-13 16:04:10 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-01-26 08:55:57 +0100 |
| commit | 63e3cea515da7415a54522b928e57456c3b4566d (patch) | |
| tree | adc7cbb27807242f33c271b7fe963c36f901184f | |
| parent | f60c6fbbc658201f968a22addff7dd1acbe5eaca (diff) | |
| download | talos-obmc-uboot-63e3cea515da7415a54522b928e57456c3b4566d.tar.gz talos-obmc-uboot-63e3cea515da7415a54522b928e57456c3b4566d.zip | |
ARM: zynq: List nand, qspi and jtag boot modes
Use full boot mode list in SPL.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 9 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynq/hardware.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index 31627f970e..3fb876d07a 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -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(); diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index 2aede0c552..8dfedd7a94 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -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 |
