X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=79150bb0178617b22fd98443c0698501cd5bc1b3;hb=15d0f3538a1a38577f155b58d170bd4ead1da978;hp=b7d5cbb3f9ad9ad84474e5b50b77a1bcf7d0022c;hpb=958046fc78f95a3d28b06980a7eb3ed80123c533;p=u-boot diff --git a/Makefile b/Makefile index b7d5cbb3f9..79150bb017 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ # VERSION = 2017 -PATCHLEVEL = 09 +PATCHLEVEL = 11 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc2 NAME = # *DOCUMENTATION* @@ -796,7 +796,7 @@ ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf ALL-$(CONFIG_EFI_APP) += u-boot-app.efi ALL-$(CONFIG_EFI_STUB) += u-boot-payload.efi -ifneq ($(BUILD_ROM),) +ifneq ($(BUILD_ROM)$(CONFIG_BUILD_ROM),) ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom endif @@ -878,7 +878,7 @@ dts/dt.dtb: u-boot quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ -ifeq ($(CONFIG_FIT_EMBED),y) +ifeq ($(CONFIG_MULTI_DTB_FIT),y) fit-dtb.blob: dts/dt.dtb FORCE $(call if_changed,mkimage)