Binman is now being used to build the final flashable images for
Rockchip devices, thus enabling it for all Rockchip targets here. But
it is not yet being used to generate the FIT image (u-boot.itb),
thus we need to force it to be built.

Signed-off-by: Andrew Abbott <and...@mirx.dev>
---

Question: Will this causes issues with eg. Chromebook gru/bob, which build
u-boot.itb with binman already?

---
 Kconfig          | 4 ++--
 arch/arm/Kconfig | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kconfig b/Kconfig
index bdae59e06f..99e5491f08 100644
--- a/Kconfig
+++ b/Kconfig
@@ -406,8 +406,8 @@ config BUILD_TARGET
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && 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.itb" if ARCH_ROCKCHIP || (!BINMAN && SPL_LOAD_FIT && \
+                               (ARCH_SUNXI || RISCV || ARCH_ZYNQMP))
        default "u-boot.kwb" if ARCH_KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 57946f61fa..7697c74edf 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1961,7 +1961,7 @@ config ARCH_STM32MP
 config ARCH_ROCKCHIP
        bool "Support Rockchip SoCs"
        select BLK
-       select BINMAN if SPL_OPTEE || (SPL && !ARM64)
+       select BINMAN if SPL
        select DM
        select DM_GPIO
        select DM_I2C
-- 
2.35.3

Reply via email to