Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[karo-tx-uboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 8b1b364e4c5fe1b5867158f5922f9168aa1b2f81..0e07aa597000245f0e962158bb9ead95ca924408 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 VERSION = 2014
 PATCHLEVEL = 01
 SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -227,7 +227,6 @@ LIBS-y += $(CPUDIR)/
 ifdef SOC
 LIBS-y += $(CPUDIR)/$(SOC)/
 endif
-LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
 LIBS-$(CONFIG_OF_EMBED) += dts/
 LIBS-y += arch/$(ARCH)/lib/
 LIBS-y += fs/
@@ -419,8 +418,8 @@ $(obj)u-boot.kwb:       $(obj)u-boot.bin
                -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
 
 $(obj)u-boot.pbl:      $(obj)u-boot.bin
-               $(obj)tools/mkimage -n $(CONFIG_PBLRCW_CONFIG) \
-               -R $(CONFIG_PBLPBI_CONFIG) -T pblimage \
+               $(obj)tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \
+               -R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \
                -d $< $@
 
 $(obj)u-boot.sha1:     $(obj)u-boot.bin