Message ID | 20220826153634.3086393-6-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> > > This allows to build u-boot-rockchip.bin binary with binman for Rockchip > ARM64 boards instead of the legacy Makefile way. > > Cc: Quentin Schulz <foss+uboot@0leil.net> > Reviewed-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> The Reviewed-by Tag usually should be after the Signed-off-by. Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > v4: > - added Reviewed-by, > > Makefile | 26 +------------------------- > arch/arm/Kconfig | 2 +- > arch/arm/dts/rockchip-u-boot.dtsi | 5 +++++ > 3 files changed, 7 insertions(+), 26 deletions(-) > > diff --git a/Makefile b/Makefile > index dbe1aa254a..1dee09eb36 100644 > --- a/Makefile > +++ b/Makefile > @@ -1005,8 +1005,7 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP),y) > # On ARM64 this target is produced by binman so we don't need this dep > ifeq ($(CONFIG_ARM64),y) > ifeq ($(CONFIG_SPL),y) > -# TODO: Get binman to generate this too > -INPUTS-y += u-boot-rockchip.bin > +INPUTS-y += u-boot.itb > endif > else > ifeq ($(CONFIG_SPL),y) > @@ -1498,29 +1497,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_ROCKCHIP),y) > - > -# TPL + SPL > -ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) > -MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd > -tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE > - $(call if_changed,mkimage) > -idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE > - $(call if_changed,cat) > -else > -MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd > -idbloader.img: spl/u-boot-spl.bin FORCE > - $(call if_changed,mkimage) > -endif > - > -ifeq ($(CONFIG_ARM64),y) > -OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \ > - --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff > -u-boot-rockchip.bin: idbloader.img u-boot.itb FORCE > - $(call if_changed,pad_cat) > -endif # CONFIG_ARM64 > - > -endif # CONFIG_ARCH_ROCKCHIP > > ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) > MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 0b72e4f650..82cd456f51 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1974,7 +1974,7 @@ config ARCH_STM32MP > config ARCH_ROCKCHIP > bool "Support Rockchip SoCs" > select BLK > - select BINMAN if SPL_OPTEE || (SPL && !ARM64) > + select BINMAN if SPL_OPTEE || SPL > select DM > select DM_GPIO > select DM_I2C > diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi > index ad72ca9700..f90a8bf085 100644 > --- a/arch/arm/dts/rockchip-u-boot.dtsi > +++ b/arch/arm/dts/rockchip-u-boot.dtsi > @@ -30,7 +30,12 @@ > }; > }; > > +#ifdef CONFIG_ARM64 > + blob { > + filename = "u-boot.itb"; > +#else > u-boot-img { > +#endif > offset = <CONFIG_SPL_PAD_TO>; > }; > };
diff --git a/Makefile b/Makefile index dbe1aa254a..1dee09eb36 100644 --- a/Makefile +++ b/Makefile @@ -1005,8 +1005,7 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP),y) # On ARM64 this target is produced by binman so we don't need this dep ifeq ($(CONFIG_ARM64),y) ifeq ($(CONFIG_SPL),y) -# TODO: Get binman to generate this too -INPUTS-y += u-boot-rockchip.bin +INPUTS-y += u-boot.itb endif else ifeq ($(CONFIG_SPL),y) @@ -1498,29 +1497,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_ROCKCHIP),y) - -# TPL + SPL -ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) -MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd -tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE - $(call if_changed,mkimage) -idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE - $(call if_changed,cat) -else -MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd -idbloader.img: spl/u-boot-spl.bin FORCE - $(call if_changed,mkimage) -endif - -ifeq ($(CONFIG_ARM64),y) -OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \ - --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff -u-boot-rockchip.bin: idbloader.img u-boot.itb FORCE - $(call if_changed,pad_cat) -endif # CONFIG_ARM64 - -endif # CONFIG_ARCH_ROCKCHIP ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0b72e4f650..82cd456f51 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1974,7 +1974,7 @@ config ARCH_STM32MP config ARCH_ROCKCHIP bool "Support Rockchip SoCs" select BLK - select BINMAN if SPL_OPTEE || (SPL && !ARM64) + select BINMAN if SPL_OPTEE || SPL select DM select DM_GPIO select DM_I2C diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi index ad72ca9700..f90a8bf085 100644 --- a/arch/arm/dts/rockchip-u-boot.dtsi +++ b/arch/arm/dts/rockchip-u-boot.dtsi @@ -30,7 +30,12 @@ }; }; +#ifdef CONFIG_ARM64 + blob { + filename = "u-boot.itb"; +#else u-boot-img { +#endif offset = <CONFIG_SPL_PAD_TO>; }; };