From ddbcec939789d1f7264134b3628ffb649ec88168 Mon Sep 17 00:00:00 2001 From: Peter Geis Date: Sun, 19 Dec 2021 08:20:33 -0500 Subject: [PATCH 03/11] Makefile: rockchip: HACK: build rk3568 images This is a hack to build rk3568 images. It seems makefile can't cope with the format mkimage expects for multiple file entries, so hack around the situation. Signed-off-by: Peter Geis --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/Makefile +++ b/Makefile @@ -1047,6 +1047,9 @@ quiet_cmd_mkimage = MKIMAGE $@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT)) +cmd_mkimage_combined = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $(COMBINED_FILE):$< $@ \ + >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT)) + quiet_cmd_mkfitimage = MKIMAGE $@ cmd_mkfitimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) \ -f $(U_BOOT_ITS) -p $(CONFIG_FIT_EXTERNAL_OFFSET) $@ \ @@ -1491,6 +1494,7 @@ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_ ifeq ($(CONFIG_ARCH_ROCKCHIP),y) # TPL + SPL +ifneq ($(CONFIG_SYS_SOC),$(filter $(CONFIG_SYS_SOC),"rk3568" "rk3566")) ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE @@ -1502,6 +1506,12 @@ MKIMAGEFLAGS_idbloader.img = -n $(CONFIG idbloader.img: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) endif +else +MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd +COMBINED_FILE = ram_init.bin +idbloader.img: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage_combined) +endif ifeq ($(CONFIG_ARM64),y) OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \