[U-Boot,1/5] rockchip, Makefile: add idbloader.img target
diff mbox series

Message ID 20190823172930.4883-2-matwey.kornilov@gmail.com
State Superseded
Delegated to: Philipp Tomsich
Headers show
Series
  • Introduce idbloader.img target for Makefile
Related show

Commit Message

Matwey V. Kornilov Aug. 23, 2019, 5:29 p.m. UTC
Many Rockchip platforms require the same u-boot deploy procedure
when TPL and SPL both enabled.

The following examples are taken from doc/README.rockchip
and board/theobroma-systems/lion_rk3368/README:

RK3288:

  ./tools/mkimage -n rk3288 -T rksd -d ./tpl/u-boot-tpl.bin out
  cat ./spl/u-boot-spl-dtb.bin >> out
  sudo dd if=out of=/dev/mmcblk0 seek=64

RK3328:

  ./tools/mkimage -n rk3328 -T rksd -d ./tpl/u-boot-tpl.bin idbloader.img
  cat ./spl/u-boot-spl.bin >> idbloader.img
  sudo dd if=idbloader.img of=/dev/mmcblk0 seek=64

RK3368:

  ./tools/mkimage -n rk3368 -T rksd -d tpl/u-boot-tpl.bin spl-3368.img
  cat spl/u-boot-spl-dtb.bin >> spl-3368.img
  dd if=spl-3368.img of=/dev/sdb seek=64

RK3399:

  ./tools/mkimage -n rk3399 -T rksd -d ./tpl/u-boot-tpl-dtb.bin out
  cat ./spl/u-boot-spl-dtb.bin >> out
  sudo dd if=out of=/dev/sdc seek=64

Here, we introduce generic idbloader.img target
which is the TPL image followed by the SPL binary.

Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
---
 Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Kever Yang Sept. 3, 2019, 3:02 a.m. UTC | #1
Hi Matwey,


On 2019/8/24 上午1:29, Matwey V. Kornilov wrote:
> Many Rockchip platforms require the same u-boot deploy procedure
> when TPL and SPL both enabled.
>
> The following examples are taken from doc/README.rockchip
> and board/theobroma-systems/lion_rk3368/README:
>
> RK3288:
>
>    ./tools/mkimage -n rk3288 -T rksd -d ./tpl/u-boot-tpl.bin out
>    cat ./spl/u-boot-spl-dtb.bin >> out
>    sudo dd if=out of=/dev/mmcblk0 seek=64
>
> RK3328:
>
>    ./tools/mkimage -n rk3328 -T rksd -d ./tpl/u-boot-tpl.bin idbloader.img
>    cat ./spl/u-boot-spl.bin >> idbloader.img
>    sudo dd if=idbloader.img of=/dev/mmcblk0 seek=64
>
> RK3368:
>
>    ./tools/mkimage -n rk3368 -T rksd -d tpl/u-boot-tpl.bin spl-3368.img
>    cat spl/u-boot-spl-dtb.bin >> spl-3368.img
>    dd if=spl-3368.img of=/dev/sdb seek=64
>
> RK3399:
>
>    ./tools/mkimage -n rk3399 -T rksd -d ./tpl/u-boot-tpl-dtb.bin out
>    cat ./spl/u-boot-spl-dtb.bin >> out
>    sudo dd if=out of=/dev/sdc seek=64
>
> Here, we introduce generic idbloader.img target
> which is the TPL image followed by the SPL binary.
>
> Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>


Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   Makefile | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 3b0864ae8e..eb12af9364 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -882,6 +882,10 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
>   ALL-y += u-boot-with-dtb.bin
>   endif
>   
> +ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy)
> +ALL-y += idbloader.img
> +endif
> +
>   LDFLAGS_u-boot += $(LDFLAGS_FINAL)
>   
>   # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
> @@ -1293,6 +1297,14 @@ 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)
> +MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T rksd
> +tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE
> +	$(call if_changed,mkimage)
> +idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE
> +	$(call if_changed,cat)
> +endif
> +
>   ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
>   MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE)
>

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index 3b0864ae8e..eb12af9364 100644
--- a/Makefile
+++ b/Makefile
@@ -882,6 +882,10 @@  ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
 ALL-y += u-boot-with-dtb.bin
 endif
 
+ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy)
+ALL-y += idbloader.img
+endif
+
 LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 
 # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
@@ -1293,6 +1297,14 @@  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)
+MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T rksd
+tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE
+	$(call if_changed,mkimage)
+idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE
+	$(call if_changed,cat)
+endif
+
 ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
 MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE)