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