diff options
author | Tom Rini <trini@ti.com> | 2015-01-26 06:42:15 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-01-26 06:42:15 -0500 |
commit | 306df2c8241bd363c71a99841630fb5e85d81fae (patch) | |
tree | d2fda7cc2345460a5a852f2bdbd0f0a51095e7eb /arch/arm/cpu/armv7/zynq/spl.c | |
parent | 03cae7261e00e0b36511625ed88f883187c17c77 (diff) | |
parent | a2425e6207d7c75906a15410f4c8c0a5d0519349 (diff) | |
download | u-boot-imx-306df2c8241bd363c71a99841630fb5e85d81fae.zip u-boot-imx-306df2c8241bd363c71a99841630fb5e85d81fae.tar.gz u-boot-imx-306df2c8241bd363c71a99841630fb5e85d81fae.tar.bz2 |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/cpu/armv7/zynq/spl.c')
-rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index 0936bdd..b80c357 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -43,12 +43,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(); |