Currently the FIT generator scripts are passed only a list of dtbs.
However some platforms may also require information about the board itself.
Signed-off-by: Jean-Jacques Hiblot <jjhib...@ti.com>
---
Changes in v3: None
Changes in v2: None
Makefile | 2 +-
arch/arm/mach-imx/mkimage_fit_atf.sh | 3 ++-
arch/arm/mach-rockchip/make_fit_atf.py | 5 +++--
board/sunxi/mksunxi_fit_atf.sh | 2 ++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index f0ee4a21e2..048d12340b 100644
--- a/Makefile
+++ b/Makefile
@@ -1218,7 +1218,7 @@ ifeq
($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py")
U_BOOT_ITS_DEPS += u-boot
endif
$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE
- $(srctree)/$(SPL_FIT_GENERATOR) \
+ $(srctree)/$(SPL_FIT_GENERATOR) $(BOARD) \
$(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@
endif
endif
diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh
b/arch/arm/mach-imx/mkimage_fit_atf.sh
index 38c9858e84..45b325665e 100755
--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
+++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
@@ -4,7 +4,7 @@
# script to generate FIT image source for i.MX8MQ boards with
# ARM Trusted Firmware and multiple device trees (given on the command line)
#
-# usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
+# usage: $0 <board> <dt_name> [<dt_name> [<dt_name] ...]
[ -z "$BL31" ] && BL31="bl31.bin"
[ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000"
@@ -39,6 +39,7 @@ else
ls -lct u-boot-nodtb.bin | awk '{print $5}' >&2
fi
+shift
for dtname in $*
do
echo "$dtname size: " >&2
diff --git a/arch/arm/mach-rockchip/make_fit_atf.py
b/arch/arm/mach-rockchip/make_fit_atf.py
index d1faff1957..4138b04a37 100755
--- a/arch/arm/mach-rockchip/make_fit_atf.py
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
@@ -4,7 +4,7 @@ A script to generate FIT image source for rockchip boards
with ARM Trusted Firmware
and multiple device trees (given on the command line)
-usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
+usage: $0 <board> <dt_name> [<dt_name> [<dt_name] ...]
"""
import os
@@ -209,7 +209,8 @@ def main():
print(__doc__)
sys.exit(2)
- dtbs = args
+ board = args[0]
+ dtbs = args[1:]
#get_bl31_segments_info("u-boot")
#get_bl31_segments_info("bl31.elf")
diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh
index 88ad719747..0dc7ab4348 100755
--- a/board/sunxi/mksunxi_fit_atf.sh
+++ b/board/sunxi/mksunxi_fit_atf.sh
@@ -46,6 +46,8 @@ cat << __HEADER_EOF
};
__HEADER_EOF
+shift
+
cnt=1
for dtname in $*
do
--
2.17.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
