X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=100de92eab59fc7e6a96e96005ac2fca9f67be0d;hb=e677da9723ede30b3072f8b8e290e9d8daea8642;hp=028f0be9caf75cd8746ff576b060b1852e98d888;hpb=8356431bf8df6d47255d6a74ca9dce53d75265c7;p=u-boot diff --git a/Makefile b/Makefile index 028f0be9ca..100de92eab 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ VERSION = 2016 PATCHLEVEL = 01 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = NAME = # *DOCUMENTATION* @@ -1136,7 +1136,7 @@ spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) ifeq ($(ARCH),arm) -ifdef CONFIG_DM +ifdef CONFIG_OF_CONTROL UBOOT_BINLOAD := u-boot-dtb.img else UBOOT_BINLOAD := u-boot.img