Message ID | 20220826153634.3086393-5-foss+uboot@0leil.net |
---|---|
State | Superseded |
Delegated to: | Kever Yang |
Headers | show |
Series | migrate u-boot-rockchip.bin to binman and generate an image for SPI | expand |
On 2022/8/26 23:36, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > 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> > Reviewed-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v4: > - added Reviewed-by, > > v3: > - moved spl back into mkimage section, > - added filename property so that the idbloader.img binary is still > generated, > Makefile | 2 +- > arch/arm/dts/rockchip-u-boot.dtsi | 11 ++++++++++- > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 5750a9e4b8..dbe1aa254a 100644 > --- 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 eae3ee715d..ad72ca9700 100644 > --- 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 {
diff --git a/Makefile b/Makefile index 5750a9e4b8..dbe1aa254a 100644 --- 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 eae3ee715d..ad72ca9700 100644 --- 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 {