From d29adf8eef4e9557326fd0bc09a08c7dfa688eab Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 26 Apr 2017 01:32:48 +0100 Subject: [PATCH] sunxi: enable automatic FIT build for 64-bit SoCs The Allwinner SoCs with 64-bit cores use an ARM Trusted Firmware binary, which needs to be loaded alongside U-Boot proper. Set the respective Kconfig options to let them select this feature and also automatically build the FIT image. Signed-off-by: Andre Przywara Acked-by: Maxime Ripard [Rename Kconfig path to arch/arm/mach-sunxi/Kconfig] Signed-off-by: Jagan Teki Reviewed-by: Jagan Teki --- Kconfig | 1 + arch/arm/mach-sunxi/Kconfig | 4 ++++ include/configs/sunxi-common.h | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/Kconfig b/Kconfig index 335392f..8e773b8 100644 --- a/Kconfig +++ b/Kconfig @@ -252,6 +252,7 @@ config SPL_FIT_SOURCE config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on SPL_FIT + default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI help Specifies a (platform specific) script file to generate the FIT source file used to build the U-Boot FIT image file. This gets diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 8d9900e..7ced838 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -143,12 +143,16 @@ config MACH_SUN50I select SUNXI_GEN_SUN6I select SUNXI_HIGH_SRAM select SUPPORT_SPL + select FIT + select SPL_LOAD_FIT config MACH_SUN50I_H5 bool "sun50i (Allwinner H5)" select ARM64 select MACH_SUNXI_H3_H5 select SUNXI_HIGH_SRAM + select FIT + select SPL_LOAD_FIT endchoice diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 0511397..3f86cef 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -32,6 +32,10 @@ # define CONFIG_MACH_TYPE_COMPAT_REV 1 #endif +#ifdef CONFIG_ARM64 +#define CONFIG_BUILD_TARGET "u-boot.itb" +#endif + /* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */