summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sunxi
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2017-01-02 11:48:45 +0000
committerJagan Teki <jagan@openedev.com>2017-01-04 16:37:43 +0100
commiteb77f5c9f69ef6c8cb39643b7b7107ef7bff5305 (patch)
tree90c4ef8ebac451acb6654910b79ec3afcb1bf320 /arch/arm/mach-sunxi
parent3a2175696d97eff0f6fae1edfab2bb19e28b9eae (diff)
downloadu-boot-imx-eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305.zip
u-boot-imx-eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305.tar.gz
u-boot-imx-eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305.tar.bz2
sunxi: A64: enable SPL
Now that the SPL is ready to be compiled in AArch64 and the DRAM init code is ready, enable SPL support for the A64 SoC and in the Pine64 defconfig. For now we keep the boot0 header in the U-Boot proper, as this allows to still use boot0 as an SPL replacement without hurting the SPL use case. We disable FEL support for now by making its compilation conditional and disabling it for ARM64, as the code isn't ready yet. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jagan Teki <jagan@openedev.com>
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r--arch/arm/mach-sunxi/board.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index aa11493..52be5b0 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -133,7 +133,7 @@ static int gpio_init(void)
return 0;
}
-#ifdef CONFIG_SPL_BUILD
+#if defined(CONFIG_SPL_BOARD_LOAD_IMAGE) && defined(CONFIG_SPL_BUILD)
static int spl_board_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{