rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM

idbloader.img content - currently created by way of Makefile - can be
created by binman directly.

So let's do that for Rockchip ARM platforms.

Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/Makefile b/Makefile
index 5750a9e4b88ca5d4dc0d59a8cc5bd9d9796995e3..dbe1aa254a7533c23ef7698f2291c21635faaace 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1011,7 +1011,7 @@ endif
 else
 ifeq ($(CONFIG_SPL),y)
 # Generate these inputs for binman which will create the output files
-INPUTS-y += idbloader.img u-boot.img
+INPUTS-y += u-boot.img
 endif
 endif
 endif

diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
index eae3ee715da68d758953867959483683a8336ee5..ad72ca970071f39554ad93dae33813771e77a877 100644 (file)
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -17,8 +17,17 @@
                filename = "u-boot-rockchip.bin";
                pad-byte = <0xff>;
 
-               blob {
+               mkimage {
                        filename = "idbloader.img";
+                       args = "-n", CONFIG_SYS_SOC, "-T", "rksd";
+#ifdef CONFIG_TPL
+                       multiple-data-files;
+
+                       u-boot-tpl {
+                       };
+#endif
+                       u-boot-spl {
+                       };
                };
 
                u-boot-img {