From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kever Yang <kever.yang@rock-chips.com>
Date: Tue, 3 Sep 2019 11:02:50 +0800
Subject: [U-Boot]
 =?utf-8?q?=5BPATCH_1/5=5D_rockchip=2C_Makefile=3A_add_id?=
 =?utf-8?b?YmxvYWRlci5pbWcgdGFyZ2V044CQ6K+35rOo5oSP77yM6YKu5Lu255SxdS1i?=
 =?utf-8?b?b290LWJvdW5jZXNAbGlzdHMuZGVueC5kZeS7o+WPkeOAkQ==?=
In-Reply-To: <20190823172930.4883-2-matwey.kornilov@gmail.com>
References: <20190823172930.4883-1-matwey.kornilov@gmail.com>
 <20190823172930.4883-2-matwey.kornilov@gmail.com>
Message-ID: <2473c407-fb81-dfb6-59f6-512758f495e8@rock-chips.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
To: u-boot@lists.denx.de

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)
>