rockchip: Convert all boards to use binman

Instead of the bash script, use binman to generate the FIT for arm64.

For 32-bit boards, use binman for all images, dropping the intermediate
files.

With this change, only Zynq is now using SPL_FIT_GENERATOR so update the
Kconfig rule accordingly.

Clean up the Makefile to the extent possible. Unfortunately, two boards
do not use SPL_FRAMEWORK so don't enable the u-boot.img rule:

   evb-rk3036
   kylin-rk3036

So a small remnant remains.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index a4a14d5d35a83cce3e7cef8696d900a319fc4fb1..a841ebe008b08f190c825c49df2be4dbbe2fe23f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1006,14 +1006,9 @@ ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy)
 INPUTS-y += init_sp_bss_offset_check
 endif
 
-ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
-# Binman image dependencies
-ifeq ($(CONFIG_ARM64),y)
-INPUTS-y += u-boot.itb
-else
+ifeq ($(CONFIG_ARCH_ROCKCHIP)_$(CONFIG_SPL_FRAMEWORK),y_)
 INPUTS-y += u-boot.img
 endif
-endif
 
 INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \
        $(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
@@ -1477,7 +1472,6 @@ OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \
 u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE
        $(call if_changed,pad_cat)
 
-
 ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
 MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE)
 

diff --git a/boot/Kconfig b/boot/Kconfig
index 36ccbf6b5428b1d74bad3ddbb824d87d591654d2..219125ebbb46a482c7754ad8245963dd52378db1 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -282,7 +282,7 @@ config SPL_FIT_SOURCE
 config USE_SPL_FIT_GENERATOR
        bool "Use a script to generate the .its script"
        depends on SPL_FIT
-       default y if !ARCH_SUNXI && !RISCV
+       default y if SPL_FIT && ARCH_ZYNQMP
 
 config SPL_FIT_GENERATOR
        string ".its file generator script for U-Boot FIT image"