[U-Boot] Pull request (with merge conflict resolution): u-boot-arm/master
Hello Tom, The following changes since commit 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb: Prepare v2014.04-rc1 (2014-02-19 16:01:28 -0500) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 3e11350255d9c5d4bd03c2a65769da84c05d3294: Merge branch 'u-boot/master' into 'u-boot-arm/master' (2014-02-20 13:16:05 +0100) There was a merge conflict between u-boot/master and u-boot-arm/master initialy; I resolved and documented it on u-boot-arm/master, commit 3e113502. A 'git show' gives: commit 3e11350255d9c5d4bd03c2a65769da84c05d3294 Merge: e7538fe 0a8e823 Author: Albert ARIBAUD albert.u.b...@aribaud.net Date: Thu Feb 20 13:16:05 2014 +0100 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. diff --cc Makefile index 0e07aa5,d9b2b7f..9a530b3 --- 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/ \ Albert ARIBAUD (4): Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master' Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' into 'u-boot-arm/master' Andy Ng (1): imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK Anson Huang (2): imx6: ensure AHB clock is 132MHz in low freq boot mode imx6: make sure MMDC_CHx_MASK is clear to avoid warm reset failure Eric Nelson (1): i.MX6: nitrogen6x: pedantic: BOOT_FROM==spi, not sd Fabio Estevam (8): nitrogen6x: README: Only calling 'make' is enough nitrogen6x: README: Do not refer to MAINTAINERS file mx6sl: Adjust fdt_addr to avoid address overlapping hummingboard: Return from cpu_eth_init() directly imx: Introduce a header for the imx cpu versions mx6: Distinguish mx6dual from mx6quad mx6qsabreauto: Update imximage.cfg mx6: Enable L2 cache support Marek Vasut (17): ARM: armv7: Make indirect vector addresses globl ARM: mx6: Add PCI express clock configuration ARM: mx6: Add PCI express driver ARM: mx6: Enable PCIe on Sabrelite ARM: m53evk: Rename mxc-nand to mxc_nand ARM: m53evk: Enable CONFIG_REGEX ARM: IXP: Remove actux1 board ARM: IXP: Remove actux2 board ARM: IXP: Remove actux3 board ARM: IXP: Remove actux4 board ARM: IXP: Remove dvl_host board ARM: IXP: Remove the IXP architecture support ARM: USB: Remove the IXP EHCI driver ARM: PCI: Remove the IXP PCI driver ARM: NET: Remove the IXP NPE ethernet driver ARM: serial: Remove the IXP UART driver pci: mx6: Implement reset callback Markus Niebel (2): ARM: imx6: fix wrong fec clk NET:
Re: [U-Boot] Pull request (with merge conflict resolution): u-boot-arm/master
On Thu, Feb 20, 2014 at 02:57:42PM +0100, Albert ARIBAUD wrote: Hello Tom, The following changes since commit 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb: Prepare v2014.04-rc1 (2014-02-19 16:01:28 -0500) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 3e11350255d9c5d4bd03c2a65769da84c05d3294: Merge branch 'u-boot/master' into 'u-boot-arm/master' (2014-02-20 13:16:05 +0100) There was a merge conflict between u-boot/master and u-boot-arm/master initialy; I resolved and documented it on u-boot-arm/master, commit 3e113502. A 'git show' gives: commit 3e11350255d9c5d4bd03c2a65769da84c05d3294 Merge: e7538fe 0a8e823 Author: Albert ARIBAUD albert.u.b...@aribaud.net Date: Thu Feb 20 13:16:05 2014 +0100 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. diff --cc Makefile index 0e07aa5,d9b2b7f..9a530b3 --- 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/ \ Albert ARIBAUD (4): Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master' Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot/master' into 'u-boot-arm/master' Andy Ng (1): imx6 SION bit has to be on for the pins that are used as ENET_REF_CLK Anson Huang (2): imx6: ensure AHB clock is 132MHz in low freq boot mode imx6: make sure MMDC_CHx_MASK is clear to avoid warm reset failure Eric Nelson (1): i.MX6: nitrogen6x: pedantic: BOOT_FROM==spi, not sd Fabio Estevam (8): nitrogen6x: README: Only calling 'make' is enough nitrogen6x: README: Do not refer to MAINTAINERS file mx6sl: Adjust fdt_addr to avoid address overlapping hummingboard: Return from cpu_eth_init() directly imx: Introduce a header for the imx cpu versions mx6: Distinguish mx6dual from mx6quad mx6qsabreauto: Update imximage.cfg mx6: Enable L2 cache support Marek Vasut (17): ARM: armv7: Make indirect vector addresses globl ARM: mx6: Add PCI express clock configuration ARM: mx6: Add PCI express driver ARM: mx6: Enable PCIe on Sabrelite ARM: m53evk: Rename mxc-nand to mxc_nand ARM: m53evk: Enable CONFIG_REGEX ARM: IXP: Remove actux1 board ARM: IXP: Remove actux2 board ARM: IXP: Remove actux3 board ARM: IXP: Remove actux4 board ARM: IXP: Remove dvl_host board ARM: IXP: Remove the IXP architecture support ARM: USB: Remove the IXP EHCI driver ARM: PCI: Remove the IXP PCI
