diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2015-06-26 19:42:24 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-28 11:46:31 -0400 |
| commit | da9971d1b3bdb554d4a4ac948119f8b2616bbcce (patch) | |
| tree | 891484a36f14b56879c7091a8e907a8f57f8c3f5 /arch/arm/cpu/armv7/sunxi | |
| parent | ef0f2f57524ec85fb9058a23298f2c4995e0d950 (diff) | |
| download | u-boot-da9971d1b3bdb554d4a4ac948119f8b2616bbcce.tar.gz u-boot-da9971d1b3bdb554d4a4ac948119f8b2616bbcce.tar.xz u-boot-da9971d1b3bdb554d4a4ac948119f8b2616bbcce.zip | |
Revert "sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memory"
This reverts commit f76eba38b3eda905ff3bdc18dd1240d3dcbc6e5a.
This patch did not have a full and proper copyright/S-o-b chain.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Conflicts:
include/configs/sun6i.h
include/configs/sun8i.h
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/board.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 8a4770b438..03443629bc 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -119,20 +119,11 @@ void s_init(void) #ifdef CONFIG_SPL_BUILD /* The sunxi internal brom will try to loader external bootloader * from mmc0, nand flash, mmc2. - * - * Unfortunately we can't check how SPL was loaded so assume it's - * always the first SD/MMC controller, unless it was explicitly - * stated that SPL is on nand flash. + * Unfortunately we can't check how SPL was loaded so assume + * it's always the first SD/MMC controller */ u32 spl_boot_device(void) { -#if defined(CONFIG_SPL_NAND_SUPPORT) - /* - * This is compile time configuration informing SPL, that it - * was loaded from nand flash. - */ - return BOOT_DEVICE_NAND; -#else /* * When booting from the SD card, the "eGON.BT0" signature is expected * to be found in memory at the address 0x0004 (see the "mksunxiboot" @@ -153,7 +144,6 @@ u32 spl_boot_device(void) return BOOT_DEVICE_MMC1; else return BOOT_DEVICE_BOARD; -#endif } /* No confirmation data available in SPL yet. Hardcode bootmode */ |