Revert "rockchip: Only call binman when TPL available"

[platform/kernel/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 297281e..a75cce7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -456,11 +456,12 @@ config BUILD_TARGET
        string "Build target special images"
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
-       default "u-boot-with-spl.kwb" if ARCH_MVEBU && SPL
+       default "u-boot-with-spl.kwb" if ARMADA_32BIT && SPL
        default "u-boot-elf.srec" if RCAR_GEN3
        default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
                                ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
-       default "u-boot.kwb" if ARCH_KIRKWOOD
+       default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
+       default "u-boot-with-spl.bin" if MPC85xx && !E500MC && !E5500 && !E6500 && SPL
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
        help
@@ -586,6 +587,7 @@ config SYS_SRAM_SIZE
 config SYS_MONITOR_LEN
        int "Maximum size in bytes reserved for U-Boot in memory"
        default 1048576 if X86
+       default 786432 if ARCH_SUNXI
        default 0
        help
          Size of memory reserved for monitor code, used to determine