[PATCH v4 5/7] rockchip: Convert all boards to use binman

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: "Roger Quadros" <rogerq@ti.com>,
	"Alper Nebi Yasak" <alpernebiyasak@gmail.com>,
	"Peter Geis" <pgwipeout@gmail.com>,
	"Philippe Reynes" <philippe.reynes@softathome.com>,
	"Ivan Mikhaylov" <ivan.mikhaylov@siemens.com>,
	"Tom Rini" <trini@konsulko.com>, "huang lin" <hl@rock-chips.com>,
	"Jeffy Chen" <jeffy.chen@rock-chips.com>,
	"Simon Glass" <sjg@chromium.org>,
	"Kever Yang" <kever.yang@rock-chips.com>,
	"Philipp Tomsich" <philipp.tomsich@theobroma-systems.com>,
	"Andre Przywara" <andre.przywara@arm.com>,
	"Heinrich Schuchardt" <xypron.glpk@gmx.de>,
	"Marek Behún" <kabel@kernel.org>, "Pali Rohár" <pali@kernel.org>,
	"Quentin Schulz" <quentin.schulz@theobroma-systems.com>
Subject: [PATCH v4 5/7] rockchip: Convert all boards to use binman
Date: Sun,  6 Nov 2022 15:40:08 -0700	[thread overview]
Message-ID: <20221106224011.606743-6-sjg@chromium.org> (raw)
In-Reply-To: <20221106224011.606743-1-sjg@chromium.org>

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>
---

(no changes since v1)

 Makefile     | 8 +-------
 boot/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d5c2c970092..fda9cd2c889 100644
--- a/Makefile
+++ b/Makefile
@@ -1004,14 +1004,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) \
@@ -1486,7 +1481,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 d5c582ebe8c..a01aedd8a57 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -277,7 +277,7 @@ config SPL_FIT_SOURCE
 
 config USE_SPL_FIT_GENERATOR
 	bool "Use a script to generate the .its script"
-	default y if SPL_FIT && (!ARCH_SUNXI && !RISCV)
+	default y if SPL_FIT && ARCH_ZYNQMP
 
 config SPL_FIT_GENERATOR
 	string ".its file generator script for U-Boot FIT image"
-- 
2.38.1.431.g37b22c650d-goog

