sunxi: simplify U-Boot proper only builds

At the moment every Allwinner board builds and requires an SPL, even
though we select this individually in each _defconfig file.
For experiments and for early bringup of new SoCs it would be beneficial
to only build U-Boot proper, for instance to postpone a tedious SPL port
(including DRAM support) in the initial phase.

Protect some SPL related symbols that we unconditionally select at the
moment with "if SPL", to avoid Kconfig conflicts when CONFIG_SPL is
disabled.

This alone does not cleanly build U-Boot proper only yet, but gets it
far enough so that the binary can be harvested.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index abd7c6c79a83480a96592e6445f6108c8ee4bb90..59e4d4d949a701aec73b1969ba0d883cef762ba3 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1160,14 +1160,14 @@ config ARCH_SUNXI
        select SPL_SEPARATE_BSS if SPL
        select SPL_STACK_R if SPL
        select SPL_SYS_MALLOC_SIMPLE if SPL
-       select SPL_SYS_THUMB_BUILD if !ARM64
+       select SPL_SYS_THUMB_BUILD if SPL && !ARM64
        select SUNXI_GPIO
        select SYS_NS16550
        select SYS_THUMB_BUILD if !ARM64
        select USB if DISTRO_DEFAULTS
        select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
        select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST
-       select SPL_USE_TINY_PRINTF
+       select SPL_USE_TINY_PRINTF if SPL
        select USE_PREBOOT
        select SYS_RELOC_GD_ENV_ADDR
        imply BOARD_LATE_INIT

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index a4a8d8e94451e52516d0a77a42019701a106cb5f..421a48bc357f248a00e51a44b2592a249fbe7e56 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -182,7 +182,7 @@ config SUNXI_GEN_SUN6I
 config SUN50I_GEN_H6
        bool
        select FIT
-       select SPL_LOAD_FIT
+       select SPL_LOAD_FIT if SPL
        select MMC_SUNXI_HAS_NEW_MODE
        select SUPPORT_SPL
        ---help---
@@ -272,7 +272,7 @@ config MACH_SUN6I
        select ARCH_SUPPORT_PSCI
        select SPL_ARMV7_SET_CORTEX_SMPEN
        select DRAM_SUN6I
-       select SPL_I2C
+       select SPL_I2C if SPL
        select SUN6I_PRCM
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
@@ -300,7 +300,7 @@ config MACH_SUN8I_A23
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
        select DRAM_SUN8I_A23
-       select SPL_I2C
+       select SPL_I2C if SPL
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select SYS_I2C_SUN8I_RSB
@@ -313,7 +313,7 @@ config MACH_SUN8I_A33
        select CPU_V7_HAS_VIRT
        select ARCH_SUPPORT_PSCI
        select DRAM_SUN8I_A33
-       select SPL_I2C
+       select SPL_I2C if SPL
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select SYS_I2C_SUN8I_RSB
@@ -323,7 +323,7 @@ config MACH_SUN8I_A83T
        bool "sun8i (Allwinner A83T)"
        select CPU_V7A
        select DRAM_SUN8I_A83T
-       select SPL_I2C
+       select SPL_I2C if SPL
        select SUNXI_GEN_SUN6I
        select MMC_SUNXI_HAS_NEW_MODE
        select MMC_SUNXI_HAS_MODE_SWITCH
@@ -382,7 +382,7 @@ config MACH_SUN9I
        select CPU_V7A
        select SPL_ARMV7_SET_CORTEX_SMPEN
        select DRAM_SUN9I
-       select SPL_I2C
+       select SPL_I2C if SPL
        select SUN6I_PRCM
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
@@ -398,7 +398,7 @@ config MACH_SUN50I
        select SUNXI_DRAM_DW
        select SUNXI_DRAM_DW_32BIT
        select FIT
-       select SPL_LOAD_FIT
+       select SPL_LOAD_FIT if SPL
        select SUNXI_A64_TIMER_ERRATUM
 
 config MACH_SUN50I_H5
@@ -407,7 +407,7 @@ config MACH_SUN50I_H5
        select MACH_SUNXI_H3_H5
        select MMC_SUNXI_HAS_NEW_MODE
        select FIT
-       select SPL_LOAD_FIT
+       select SPL_LOAD_FIT if SPL
 
 config MACH_SUN50I_H6
        bool "sun50i (Allwinner H6)"