net: bootp: as CONFIG_BOOTP_SERVERIP is defined, keep bootfile not changed

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 23590d91da8af8e2199a56847fcdfd4b8cdb03f5..b4ed77595f0f59b4749df30850a90453a08d6629 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2015
 PATCHLEVEL = 01
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME =
 
 # *DOCUMENTATION*
@@ -610,9 +610,6 @@ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makef
 libs-y += lib/
 libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
 libs-y += $(CPUDIR)/
-ifdef SOC
-libs-y += $(CPUDIR)/$(SOC)/
-endif
 libs-$(CONFIG_OF_EMBED) += dts/
 libs-y += arch/$(ARCH)/lib/
 libs-y += fs/
@@ -983,6 +980,9 @@ u-boot.rom: u-boot-x86-16bit.bin u-boot-dtb.bin \
        $(objtree)/tools/ifdtool -w \
                $(CONFIG_SYS_X86_START16):$(objtree)/u-boot-x86-16bit.bin \
                u-boot.tmp
+       $(objtree)/tools/ifdtool -w \
+               $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILENAME) \
+               u-boot.tmp
        mv u-boot.tmp $@
 
 OBJCOPYFLAGS_u-boot-x86-16bit.bin := -O binary -j .start16 -j .resetvec