diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-05-19 21:44:44 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-05-29 13:46:36 +0200 |
| commit | 93fc39a7c3ec5d4ed9f1b75cdbac641c3fe12369 (patch) | |
| tree | eeb7c2c10840f09a9cf5581441f9d90666b23571 | |
| parent | 813598e3b46601d6dd8d373e689f60f7c60fbb48 (diff) | |
| download | talos-obmc-uboot-93fc39a7c3ec5d4ed9f1b75cdbac641c3fe12369.tar.gz talos-obmc-uboot-93fc39a7c3ec5d4ed9f1b75cdbac641c3fe12369.zip | |
sunxi: Remove support for building "old-fashioned" fel binaries
The latest versions of the fel tool support loading normal u-boot builds
directly, and this is now the preferred way to use the fel boot method.
This commit removes support for the old deprecated standalone fel builds.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/board.c | 8 | ||||
| -rw-r--r-- | board/sunxi/Kconfig | 16 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 9 |
3 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index e6730c0dfa..75ce7b5765 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -120,13 +120,6 @@ void s_init(void) */ u32 spl_boot_device(void) { -#ifdef CONFIG_SPL_FEL - /* - * This is the legacy compile time configuration for a special FEL - * enabled build. It has many restrictions and can only boot over USB. - */ - return BOOT_DEVICE_BOARD; -#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" @@ -147,7 +140,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 */ diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index a6bbf6e786..ca805e4553 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -194,24 +194,8 @@ config SYS_BOARD config SYS_SOC default "sunxi" -config SPL_FEL - bool "SPL/FEL mode support" - depends on SPL - default n - help - This enables support for Fast Early Loader (FEL) mode. This - allows U-Boot to be loaded to the board over USB by the on-chip - boot rom. U-Boot should be sent in two parts: SPL first, with - 'fel write 0x2000 u-boot-spl.bin; fel exe 0x2000' then U-Boot with - 'fel write 0x4a000000 u-boot.bin; fel exe 0x4a000000'. This option - shrinks the amount of SRAM available to SPL, so only enable it if - you need FEL. Note that enabling this option only allows FEL to be - used; it is still possible to boot U-Boot from boot media. U-Boot - SPL detects when it is being loaded using FEL. - config UART0_PORT_F bool "UART0 on MicroSD breakout board" - depends on SPL_FEL default n ---help--- Repurpose the SD card slot for getting access to the UART0 serial diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d829899c07..5dd24800b4 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -162,13 +162,6 @@ #define CONFIG_SPL_BOARD_LOAD_IMAGE -#ifdef CONFIG_SPL_FEL - -#define CONFIG_SPL_TEXT_BASE 0x2000 -#define CONFIG_SPL_MAX_SIZE 0x4000 /* 16 KiB */ - -#else /* CONFIG_SPL */ - #define CONFIG_SPL_BSS_START_ADDR 0x4ff80000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KiB */ @@ -186,8 +179,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 80 /* 40KiB */ #define CONFIG_SPL_PAD_TO 32768 /* decimal for 'dd' */ -#endif /* CONFIG_SPL */ - /* end of 32 KiB in sram */ #define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK |
