[v6,10/12] rockchip: Convert all boards to use binman

Message ID	20221217161117.61699-11-sjg@chromium.org
State	Superseded
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Peter Geis <pgwipeout@gmail.com>, Jerome Forissier <jerome.forissier@linaro.org>, Tom Rini <trini@konsulko.com>, Philippe Reynes <philippe.reynes@softathome.com>, Alper Nebi Yasak <alpernebiyasak@gmail.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>, Quentin Schulz <quentin.schulz@theobroma-systems.com>, Ivan Mikhaylov <ivan.mikhaylov@siemens.com>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v6 10/12] rockchip: Convert all boards to use binman Date: Sat, 17 Dec 2022 09:11:15 -0700 Message-Id: <20221217161117.61699-11-sjg@chromium.org> In-Reply-To: <20221217161117.61699-1-sjg@chromium.org> References: <20221217161117.61699-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script \| expand [v6,00/12] binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script [v6,01/12] binman: Allow writing section contents to a file [v6,02/12] binman: Tidy up comment in fit _gen_node [v6,03/12] binman: Update entry docs [v6,04/12] binman: Support optional entries [v6,05/12] binman: Add a way to check for a valid ELF file [v6,06/12] binman: Support new op-tee binary format [v6,07/12] rockchip: evb-rk3288: Drop raw-image support [v6,08/12] rockchip: Use multiple-images for rk3399 [v6,09/12] rockchip: Support building the all output files in binman [v6,10/12] rockchip: Convert all boards to use binman [v6,11/12] rockchip: Drop the FIT generator script [v6,12/12] treewide: Disable USE_SPL_FIT_GENERATOR by default

Message ID

20221217161117.61699-11-sjg@chromium.org

State

Superseded

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Peter Geis <pgwipeout@gmail.com>,
 Jerome Forissier <jerome.forissier@linaro.org>,
 Tom Rini <trini@konsulko.com>,
 Philippe Reynes <philippe.reynes@softathome.com>,
 Alper Nebi Yasak <alpernebiyasak@gmail.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>,
 Quentin Schulz <quentin.schulz@theobroma-systems.com>,
 Ivan Mikhaylov <ivan.mikhaylov@siemens.com>, Roger Quadros <rogerq@ti.com>
Subject: [PATCH v6 10/12] rockchip: Convert all boards to use binman
Date: Sat, 17 Dec 2022 09:11:15 -0700
Message-Id: <20221217161117.61699-11-sjg@chromium.org>
In-Reply-To: <20221217161117.61699-1-sjg@chromium.org>
References: <20221217161117.61699-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script | expand

Commit Message

Simon Glass Dec. 17, 2022, 4:11 p.m. UTC

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 9d84f964817..566eeb5a248 100644
--- 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) \
@@ -1485,7 +1480,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 668270cc660..2fec861acd3 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"

[v6,10/12] rockchip: Convert all boards to use binman

Commit Message

Patch