X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=eea69b1664ac454836ba310f1c183ac2949274b0;hb=b829f12afa768633502a546f678441391c1d76e4;hp=9b406c844700f9674f4a787cb95019e6d7d4c115;hpb=358b8bc204f365be28fed94f23e53e04183a8c7f;p=u-boot diff --git a/Makefile b/Makefile index 9b406c8447..eea69b1664 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2015 -PATCHLEVEL = 01 +PATCHLEVEL = 04 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = # *DOCUMENTATION* @@ -729,8 +729,9 @@ ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) endif ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf -# We can't do this yet due to the need for binary blobs -# ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +ifneq ($(BUILD_ROM),) +ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +endif # enable combined SPL/u-boot/dtb rules for tegra ifneq ($(CONFIG_TEGRA),)