summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-07 10:47:30 -0700
committerHans de Goede <hdegoede@redhat.com>2015-02-16 20:15:09 +0100
commit942cb0b6a29f74507adeb0bce7ff7f23f69faf84 (patch)
treedb87608a735d5920489af93a7d3c8afd60f8dfc2 /include
parentc01c71bc16d2836c3ff81af54529dab0686bca00 (diff)
downloadblackbird-obmc-uboot-942cb0b6a29f74507adeb0bce7ff7f23f69faf84.tar.gz
blackbird-obmc-uboot-942cb0b6a29f74507adeb0bce7ff7f23f69faf84.zip
sunxi: Normalise FEL support
Make sunxi's FEL code fit with the normal U-Boot boot sequence instead of creating its own. There are some #ifdefs required in start.S. Future work will hopefully remove these. This series is available at u-boot-dm, branch sunxi-working. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sunxi-common.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 33c06146c6..5ece0202a6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -18,10 +18,8 @@
*/
#define CONFIG_SUNXI /* sunxi family */
#ifdef CONFIG_SPL_BUILD
-#ifndef CONFIG_SPL_FEL
#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */
#endif
-#endif
#include <asm/arch/cpu.h> /* get chip and board defs */
@@ -149,10 +147,10 @@
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_BOARD_LOAD_IMAGE
+
#ifdef CONFIG_SPL_FEL
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds"
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/armv7/sunxi"
#define CONFIG_SPL_TEXT_BASE 0x2000
#define CONFIG_SPL_MAX_SIZE 0x4000 /* 16 KiB */
OpenPOWER on IntegriCloud