X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=5ab6be8889cab0a6eb5e3d86912684c3315bf2b0;hb=84b40b40ad9b95b4680766597c866b604147144c;hp=2d825b9c41a6c4c595e2015b46c34e2fc79a918a;hpb=155b116907edb92ff798e781c841b65838079db3;p=u-boot diff --git a/Makefile b/Makefile index 2d825b9c41..5ab6be8889 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ # VERSION = 2018 -PATCHLEVEL = 03 +PATCHLEVEL = 05 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = # *DOCUMENTATION* @@ -1191,8 +1191,13 @@ u-boot-x86-16bit.bin: u-boot FORCE endif ifneq ($(CONFIG_ARCH_SUNXI),) +ifeq ($(CONFIG_ARM64),) u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE $(call if_changed,binman) +else +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE + $(call if_changed,cat) +endif endif ifneq ($(CONFIG_TEGRA),)