Commit eb77f5c9 authored by Andre Przywara's avatar Andre Przywara Committed by Jagan Teki

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: 's avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: 's avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: 's avatarSimon Glass <sjg@chromium.org>
Reviewed-by: 's avatarJagan Teki <jagan@openedev.com>
parent 3a217569
......@@ -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)
{
......
......@@ -125,6 +125,7 @@ config MACH_SUN50I
bool "sun50i (Allwinner A64)"
select ARM64
select SUNXI_GEN_SUN6I
select SUPPORT_SPL
endchoice
......@@ -196,6 +197,7 @@ config DRAM_ODT_EN
bool "sunxi dram odt enable"
default n if !MACH_SUN8I_A23
default y if MACH_SUN8I_A23
default y if MACH_SUN50I
---help---
Select this to enable dram odt (on die termination).
......
......@@ -5,6 +5,7 @@ CONFIG_MACH_SUN50I=y
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_CONSOLE_MUX=y
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
......
......@@ -183,7 +183,9 @@
#define CONFIG_SPL_FRAMEWORK
#ifndef CONFIG_ARM64 /* AArch64 FEL support is not ready yet */
#define CONFIG_SPL_BOARD_LOAD_IMAGE
#endif
#if defined(CONFIG_MACH_SUN9I)
#define CONFIG_SPL_TEXT_BASE 0x10040 /* sram start+header */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment