From 66ffe317871e01db6ee8ba6cb69ec8a025d00c3d Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Fri, 10 Jan 2020 00:16:18 +0530 Subject: [PATCH] Makefile: rockchip: Support SPL-alone mkimage 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 Reviewed-by: Kever Yang --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4eeba6f1360..be7292d485e 100644 --- a/Makefile +++ b/Makefile @@ -911,7 +911,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 @@ -1386,11 +1386,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) -- 2.39.2