From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 20 Feb 2014 12:16:05 +0000 (+0100)
Subject: Merge branch 'u-boot/master' into 'u-boot-arm/master'
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=3e11350255d9c5d4bd03c2a65769da84c05d3294;p=u-boot.git

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

Conflicts:
	Makefile
	drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
---

3e11350255d9c5d4bd03c2a65769da84c05d3294
diff --cc Makefile
index 0e07aa5970,d9b2b7fa60..9a530b3e80
--- a/Makefile
+++ b/Makefile
@@@ -217,36 -589,35 +589,34 @@@ head-y := $(CPUDIR)/start.
  head-$(CONFIG_4xx) += arch/powerpc/cpu/ppc4xx/resetvec.o
  head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o
  
- OBJS := $(addprefix $(obj),$(head-y))
- 
- HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
+ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makefile),y,n)
  
- LIBS-y += lib/
- LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
- LIBS-y += $(CPUDIR)/
+ 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/
- LIBS-y += net/
- LIBS-y += disk/
- LIBS-y += drivers/
- LIBS-y += drivers/dma/
- LIBS-y += drivers/gpio/
- LIBS-y += drivers/i2c/
- LIBS-y += drivers/input/
- LIBS-y += drivers/mmc/
- LIBS-y += drivers/mtd/
- LIBS-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
- LIBS-y += drivers/mtd/onenand/
- LIBS-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
- LIBS-y += drivers/mtd/spi/
- LIBS-y += drivers/net/
- LIBS-y += drivers/net/phy/
- LIBS-y += drivers/pci/
- LIBS-y += drivers/power/ \
+ 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/
+ libs-y += net/
+ libs-y += disk/
+ libs-y += drivers/
+ libs-y += drivers/dma/
+ libs-y += drivers/gpio/
+ libs-y += drivers/i2c/
+ libs-y += drivers/input/
+ libs-y += drivers/mmc/
+ libs-y += drivers/mtd/
+ libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
+ libs-y += drivers/mtd/onenand/
+ libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
+ libs-y += drivers/mtd/spi/
+ libs-y += drivers/net/
+ libs-y += drivers/net/phy/
+ libs-y += drivers/pci/
+ libs-y += drivers/power/ \
  	drivers/power/fuel_gauge/ \
  	drivers/power/mfd/ \
  	drivers/power/pmic/ \