[v4,3/7] Makefile: rockchip: Support SPL-alone mkimage
diff mbox series

Message ID 20191023195652.7158-4-jagan@amarulasolutions.com
State New
Headers show
Series
  • rockchip: Add Binman support
Related show

Commit Message

Jagan Teki Oct. 23, 2019, 7:56 p.m. UTC
Add SPL-alone mkimage tooling support via Makefile for
few platforms or boards used in rockchip family.

With this users would get rid of explicitly creating
mkimage tool for rockchip rksd or rkspi boot modes.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Kever Yang Nov. 10, 2019, 2:18 p.m. UTC | #1
On 2019/10/24 上午3:56, Jagan Teki wrote:
> Add SPL-alone mkimage tooling support via Makefile for
> few platforms or boards used in rockchip family.
>
> With this users would get rid of explicitly creating
> mkimage tool for rockchip rksd or rkspi boot modes.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

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

Thanks,
- Kever
> ---
>   Makefile | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 40cbf68fef..b58107d6ef 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -886,7 +886,7 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
>   ALL-y += u-boot-with-dtb.bin
>   endif
>   
> -ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy)
> +ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
>   ALL-y += idbloader.img
>   endif
>   
> @@ -1342,11 +1342,19 @@ 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)
>   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)
> +idbloader.img: spl/u-boot-spl.bin FORCE
> +	$(call if_changed,mkimage)
> +endif
> +
>   endif
>   
>   ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index 40cbf68fef..b58107d6ef 100644
--- a/Makefile
+++ b/Makefile
@@ -886,7 +886,7 @@  ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
 ALL-y += u-boot-with-dtb.bin
 endif
 
-ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy)
+ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
 ALL-y += idbloader.img
 endif
 
@@ -1342,11 +1342,19 @@  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)
 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)
+idbloader.img: spl/u-boot-spl.bin FORCE
+	$(call if_changed,mkimage)
+endif
+
 endif
 
 ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)