|
@@ -926,7 +926,10 @@ ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy)
|
|
|
INPUTS-y += u-boot-sunxi-with-spl.bin
|
|
|
endif
|
|
|
|
|
|
+# Generate this input file for binman
|
|
|
+ifeq ($(CONFIG_SPL),)
|
|
|
INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin
|
|
|
+endif
|
|
|
|
|
|
# Add optional build target if defined in board/cpu/soc headers
|
|
|
ifneq ($(CONFIG_BUILD_TARGET),)
|
|
@@ -941,9 +944,20 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
|
|
|
INPUTS-y += u-boot-with-dtb.bin
|
|
|
endif
|
|
|
|
|
|
-ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
|
|
|
+ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
|
|
|
+# On ARM64 this target is produced by binman so we don't need this dep
|
|
|
+ifeq ($(CONFIG_ARM64),y)
|
|
|
+ifeq ($(CONFIG_SPL),y)
|
|
|
+# TODO: Get binman to generate this too
|
|
|
INPUTS-y += u-boot-rockchip.bin
|
|
|
endif
|
|
|
+else
|
|
|
+ifeq ($(CONFIG_SPL),y)
|
|
|
+# Generate these inputs for binman which will create the output files
|
|
|
+INPUTS-y += idbloader.img u-boot.img
|
|
|
+endif
|
|
|
+endif
|
|
|
+endif
|
|
|
|
|
|
INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \
|
|
|
$(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
|
|
@@ -1459,10 +1473,7 @@ idbloader.img: spl/u-boot-spl.bin FORCE
|
|
|
$(call if_changed,mkimage)
|
|
|
endif
|
|
|
|
|
|
-ifeq ($(CONFIG_ARM64),)
|
|
|
-u-boot-rockchip.bin: idbloader.img u-boot.img FORCE
|
|
|
- $(call if_changed,binman)
|
|
|
-else
|
|
|
+ifeq ($(CONFIG_ARM64),y)
|
|
|
OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \
|
|
|
--pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
|
|
|
u-boot-rockchip.bin: idbloader.img u-boot.itb FORCE
|
|
@@ -1689,9 +1700,6 @@ u-boot-elf.lds: arch/u-boot-elf.lds prepare FORCE
|
|
|
|
|
|
ifeq ($(CONFIG_SPL),y)
|
|
|
spl/u-boot-spl-mtk.bin: spl/u-boot-spl
|
|
|
-
|
|
|
-u-boot-mtk.bin: u-boot.dtb u-boot.img spl/u-boot-spl-mtk.bin FORCE
|
|
|
- $(call if_changed,binman)
|
|
|
else
|
|
|
MKIMAGEFLAGS_u-boot-mtk.bin = -T mtk_image \
|
|
|
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \
|