[PATCH v2 1/4] Makefile: Drop to handle rkspi image type

Kever Yang kever.yang at rock-chips.com
Thu Jun 4 05:13:57 CEST 2020


On 2020/6/2 上午4:42, Jagan Teki wrote:
> On rockchip platforms, SPI boot image creation is not
> straightforward like MMC boot image creation where former
> requires to specify tpl, spl in multimage format in mkimage,
> and later simply do a concatenate mkimaged-tpl with spl.
>
> On this note, let drop rkspi image type creation via kbuild
> and let inform via rockchip.rst
>
> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>

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

Thanks,
- Kever
> ---
>   Makefile | 11 ++---------
>   1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 3851dd9fa0..db3b6b9991 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1438,22 +1438,15 @@ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE
>   
>   ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
>   
> -# rockchip image type
> -ifeq ($(CONFIG_SPL_SPI_LOAD),y)
> -ROCKCHIP_IMG_TYPE := rkspi
> -else
> -ROCKCHIP_IMG_TYPE := rksd
> -endif
> -
>   # TPL + SPL
>   ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy)
> -MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE)
> +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 $(ROCKCHIP_IMG_TYPE)
> +MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd
>   idbloader.img: spl/u-boot-spl.bin FORCE
>   	$(call if_changed,mkimage)
>   endif




More information about the U-Boot mailing list