From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request (with merge conflict resolution): u-boot-arm/master
Date: Thu, 20 Feb 2014 14:57:42 +0100 [thread overview]
Message-ID: <20140220145742.52ef6261@lilith> (raw)
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.boot@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: fec_mxc: fix MDIO clock prescaler calculation
Michal Simek (11):
zynq: Do not explicitely enable icache
zynq: Enable dcache support
zynq: Fix incorrect header name
zynq: Extend kernel image size to 20MB
zynq: Enable tftp put command
zynq: Use board_eth_init if CMD_NET is not enabled
zynq: Move bootmode to headers
zynq: serial: Simplify serial driver initialization
zynq: timer: Fix hangs if network activity attempted after about
one hour zynq: Update CLK in bdinfo
zynq: Add support for U-BOOT SPL
Otavio Salvador (11):
cgtqmx6eval: Set default environment to use zImage
hummingboard: Set default environment to use zImage
mx23evk: Set default environment to use zImage
mx28evk: Set default environment to use zImage
mx51evk: Set default environment to use zImage
mx53loco: Set default environment to use zImage
mx6qarm2: Set default environment to use zImage
mx6sabre_common: Set default environment to use zImage
mx6slevk: Set default environment to use zImage
udoo: Set default environment to use zImage
vf610twr: Set default environment to use zImage
Rajeshwari S Shinde (1):
Exynos5250: Remove lowlevelinit
Siva Durga Prasad Paladugu (1):
arm: zynq: correct the argument to lldiv
Soren Brinkmann (7):
common: Provide DIV_ROUND_CLOSEST macro
zynq: Provide a framework to read clock frequencies
zynq: timer: Migrate to zynq clock framework
net: zynq_gem: Move RCLK details out of driver
net: zynq_gem: Calculate clock dividers dynamically
serial_zynq: Migrate to Zynq clock framework
zynq: Implement dump clock command
Stefano Babic (2):
Merge branch 'master' of git://git.denx.de/u-boot-arm
Merge branch 'master' of git://git.denx.de/u-boot-arm
MAKEALL | 2 -
Makefile | 1 -
README | 1 -
arch/arm/cpu/armv7/mx6/clock.c | 77 +++-
arch/arm/cpu/armv7/mx6/soc.c | 103 ++++-
arch/arm/cpu/armv7/start.S | 7 +
arch/arm/cpu/armv7/zynq/Makefile | 2 +
arch/arm/cpu/armv7/zynq/clk.c | 664
+++++++++++++++++++++++++++
arch/arm/cpu/armv7/zynq/cpu.c | 14 +-
arch/arm/cpu/armv7/zynq/slcr.c | 17 +-
arch/arm/cpu/armv7/zynq/spl.c | 69 +++
arch/arm/cpu/armv7/zynq/timer.c | 14 +-
arch/arm/cpu/armv7/zynq/u-boot-spl.lds | 61 +++
arch/arm/cpu/ixp/Makefile | 12 -
arch/arm/cpu/ixp/config.mk | 16 -
arch/arm/cpu/ixp/cpu.c | 100 -----
arch/arm/cpu/ixp/interrupts.c | 66 ---
arch/arm/cpu/ixp/start.S | 430
------------------
arch/arm/cpu/ixp/timer.c | 101 -----
arch/arm/cpu/ixp/u-boot.lds | 91 ----
arch/arm/imx-common/cpu.c | 2 +
arch/arm/include/asm/arch-imx/cpu.h | 13 +
arch/arm/include/asm/arch-ixp/ixp425.h | 548
----------------------
arch/arm/include/asm/arch-ixp/ixp425pci.h | 174
------- arch/arm/include/asm/arch-mx5/sys_proto.h |
7 +- arch/arm/include/asm/arch-mx6/clock.h | 1
+ arch/arm/include/asm/arch-mx6/imx-regs.h | 1 +
arch/arm/include/asm/arch-mx6/iomux.h | 27 ++
arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 6 +-
arch/arm/include/asm/arch-mx6/mx6q_pins.h | 6 +-
arch/arm/include/asm/arch-mx6/sys_proto.h | 8 +-
arch/arm/include/asm/arch-zynq/clk.h | 29 ++
arch/arm/include/asm/arch-zynq/hardware.h | 40 +-
arch/arm/include/asm/arch-zynq/spl.h | 18 +
arch/arm/include/asm/arch-zynq/sys_proto.h | 2 +-
arch/arm/include/asm/global_data.h | 3 -
arch/arm/include/asm/pl310.h | 21 +
board/actux1/Makefile | 8 -
board/actux1/actux1.c | 148
------ board/actux1/actux1_hw.h |
41 -- board/actux1/u-boot.lds | 99
---- board/actux2/Makefile | 8
- board/actux2/actux2.c | 122
----- board/actux2/actux2_hw.h | 43
-- board/actux2/u-boot.lds | 99
---- board/actux3/Makefile | 8
- board/actux3/actux3.c | 149
------ board/actux3/actux3_hw.h |
44 -- board/actux3/u-boot.lds | 99
---- board/actux4/Makefile | 8
- board/actux4/actux4.c | 129
------ board/actux4/actux4_hw.h |
33 -- board/boundary/nitrogen6x/README | 4
+- board/boundary/nitrogen6x/nitrogen6dl.cfg | 2 +-
board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 2 +-
board/boundary/nitrogen6x/nitrogen6q.cfg | 2 +-
board/boundary/nitrogen6x/nitrogen6q2g.cfg | 2 +-
board/boundary/nitrogen6x/nitrogen6s.cfg | 2 +-
board/boundary/nitrogen6x/nitrogen6s1g.cfg | 2 +-
board/dvlhost/Makefile | 8 -
board/dvlhost/dvlhost.c | 112 -----
board/dvlhost/dvlhost_hw.h | 31 --
board/dvlhost/u-boot.lds | 99 ----
board/dvlhost/watchdog.c | 27 --
board/freescale/mx6qsabreauto/imximage.cfg | 136
+++--- board/samsung/smdk5250/lowlevel_init.S |
82 ---- board/solidrun/hummingboard/hummingboard.c |
6 +- board/xilinx/zynq/Makefile | 1
+ board/xilinx/zynq/board.c | 10 -
board/xilinx/zynq/ps7_init.c | 12 +
boards.cfg | 8 -
doc/README.scrapyard | 5 +
doc/driver-model/UDM-pci.txt | 4 -
doc/driver-model/UDM-serial.txt | 4 -
drivers/i2c/soft_i2c.c | 3 -
drivers/net/fec_mxc.c | 8 +-
drivers/net/npe/IxEthAcc.c | 237
---------- drivers/net/npe/IxEthAccCommon.c |
1025 ------------------------------------------
drivers/net/npe/IxEthAccControlInterface.c | 509
---------------------
drivers/net/npe/IxEthAccDataPlane.c | 2459
---------------------------------------------------------------------------------------------------
drivers/net/npe/IxEthAccMac.c | 2617
----------------------------------------------------------------------------------------------------------
drivers/net/npe/IxEthAccMii.c | 386
----------------
drivers/net/npe/IxEthDBAPI.c | 424
------------------
drivers/net/npe/IxEthDBAPISupport.c | 651
---------------------------
drivers/net/npe/IxEthDBCore.c | 439
------------------
drivers/net/npe/IxEthDBEvents.c | 496
--------------------
drivers/net/npe/IxEthDBFeatures.c | 638
--------------------------
drivers/net/npe/IxEthDBFirewall.c | 242
---------- drivers/net/npe/IxEthDBHashtable.c
| 618 -------------------------
drivers/net/npe/IxEthDBLearning.c | 125
------ drivers/net/npe/IxEthDBMem.c |
625 --------------------------
drivers/net/npe/IxEthDBNPEAdaptor.c | 695
----------------------------
drivers/net/npe/IxEthDBPortUpdate.c | 716
-----------------------------
drivers/net/npe/IxEthDBReports.c | 628
--------------------------
drivers/net/npe/IxEthDBSearch.c | 303
-------------
drivers/net/npe/IxEthDBSpanningTree.c | 83 ----
drivers/net/npe/IxEthDBUtil.c | 96 ----
drivers/net/npe/IxEthDBVlan.c | 1155
-----------------------------------------------
drivers/net/npe/IxEthDBWiFi.c | 456
-------------------
drivers/net/npe/IxEthMii.c | 473
-------------------
drivers/net/npe/IxFeatureCtrl.c | 398
----------------
drivers/net/npe/IxNpeDl.c | 916
-------------------------------------
drivers/net/npe/IxNpeDlImageMgr.c | 663
---------------------------
drivers/net/npe/IxNpeDlNpeMgr.c | 907
-------------------------------------
drivers/net/npe/IxNpeDlNpeMgrUtils.c | 782
--------------------------------
drivers/net/npe/IxNpeMh.c | 558
-----------------------
drivers/net/npe/IxNpeMhConfig.c | 584
------------------------
drivers/net/npe/IxNpeMhReceive.c | 296
------------ drivers/net/npe/IxNpeMhSend.c
| 283 ------------
drivers/net/npe/IxNpeMhSolicitedCbMgr.c | 334
--------------
drivers/net/npe/IxNpeMhUnsolicitedCbMgr.c | 222
--------- drivers/net/npe/IxOsalBufferMgt.c |
776 --------------------------------
drivers/net/npe/IxOsalIoMem.c | 307
-------------
drivers/net/npe/IxOsalOsCacheMMU.c | 43 --
drivers/net/npe/IxOsalOsMsgQ.c | 55 ---
drivers/net/npe/IxOsalOsSemaphore.c | 209
--------- drivers/net/npe/IxOsalOsServices.c |
227 ----------
drivers/net/npe/IxOsalOsThread.c | 74 ---
drivers/net/npe/IxQMgrAqmIf.c | 939
--------------------------------------
drivers/net/npe/IxQMgrDispatcher.c | 1320
-----------------------------------------------------
drivers/net/npe/IxQMgrInit.c | 209
--------- drivers/net/npe/IxQMgrQAccess.c |
772 -------------------------------
drivers/net/npe/IxQMgrQCfg.c | 519
---------------------
drivers/net/npe/Makefile | 58 ---
drivers/net/npe/include/IxAssert.h | 47 --
drivers/net/npe/include/IxAtmSch.h | 480
--------------------
drivers/net/npe/include/IxAtmTypes.h | 385
----------------
drivers/net/npe/include/IxAtmdAcc.h | 1169
-----------------------------------------------
drivers/net/npe/include/IxAtmdAccCtrl.h | 1933
------------------------------------------------------------------------------
drivers/net/npe/include/IxAtmm.h | 771
-------------------------------
drivers/net/npe/include/IxDmaAcc.h | 236
---------- drivers/net/npe/include/IxEthAcc.h |
2488
----------------------------------------------------------------------------------------------------
drivers/net/npe/include/IxEthAccDataPlane_p.h | 221
--------- drivers/net/npe/include/IxEthAccMac_p.h |
224 ---------
drivers/net/npe/include/IxEthAccMii_p.h | 73 ---
drivers/net/npe/include/IxEthAccQueueAssign_p.h | 113 -----
drivers/net/npe/include/IxEthAcc_p.h | 301
-------------
drivers/net/npe/include/IxEthDB.h | 2349
-----------------------------------------------------------------------------------------------
drivers/net/npe/include/IxEthDBLocks_p.h | 98 ----
drivers/net/npe/include/IxEthDBLog_p.h | 203
--------- drivers/net/npe/include/IxEthDBMessages_p.h |
234 ----------
drivers/net/npe/include/IxEthDBPortDefs.h | 139
------ drivers/net/npe/include/IxEthDBQoS.h |
130 ------ drivers/net/npe/include/IxEthDB_p.h
| 686 ----------------------------
drivers/net/npe/include/IxEthMii.h | 246
---------- drivers/net/npe/include/IxEthMii_p.h
| 161 -------
drivers/net/npe/include/IxEthNpe.h | 671
---------------------------
drivers/net/npe/include/IxFeatureCtrl.h | 718
-----------------------------
drivers/net/npe/include/IxHssAcc.h | 1292
----------------------------------------------------
drivers/net/npe/include/IxI2cDrv.h | 843
----------------------------------
drivers/net/npe/include/IxNpeA.h | 758
-------------------------------
drivers/net/npe/include/IxNpeDl.h | 956
---------------------------------------
drivers/net/npe/include/IxNpeDlImageMgr_p.h | 339
--------------
drivers/net/npe/include/IxNpeDlMacros_p.h | 390
----------------
drivers/net/npe/include/IxNpeDlNpeMgrEcRegisters_p.h | 869
-----------------------------------
drivers/net/npe/include/IxNpeDlNpeMgrUtils_p.h | 381
----------------
drivers/net/npe/include/IxNpeDlNpeMgr_p.h | 236
---------- drivers/net/npe/include/IxNpeMh.h
| 473 -------------------
drivers/net/npe/include/IxNpeMhConfig_p.h | 531
----------------------
drivers/net/npe/include/IxNpeMhMacros_p.h | 272
----------- drivers/net/npe/include/IxNpeMhReceive_p.h
| 115 ----- drivers/net/npe/include/IxNpeMhSend_p.h
| 139 ------
drivers/net/npe/include/IxNpeMhSolicitedCbMgr_p.h | 147
------ drivers/net/npe/include/IxNpeMhUnsolicitedCbMgr_p.h |
145 ------ drivers/net/npe/include/IxNpeMicrocode.h
| 272 -----------
drivers/net/npe/include/IxOsBufLib.h | 31 --
drivers/net/npe/include/IxOsBuffMgt.h | 28 --
drivers/net/npe/include/IxOsBuffPoolMgt.h | 50 ---
drivers/net/npe/include/IxOsCacheMMU.h | 36 --
drivers/net/npe/include/IxOsPrintf.h | 78 ----
drivers/net/npe/include/IxOsServices.h | 31 --
drivers/net/npe/include/IxOsServicesComponents.h | 110 -----
drivers/net/npe/include/IxOsServicesEndianess.h | 28 --
drivers/net/npe/include/IxOsServicesMemAccess.h | 28 --
drivers/net/npe/include/IxOsServicesMemMap.h | 30 --
drivers/net/npe/include/IxOsal.h | 1493
------------------------------------------------------------
drivers/net/npe/include/IxOsalAssert.h | 57 ---
drivers/net/npe/include/IxOsalBackward.h | 41 --
drivers/net/npe/include/IxOsalBackwardAssert.h | 30 --
drivers/net/npe/include/IxOsalBackwardBufferMgt.h | 135
------ drivers/net/npe/include/IxOsalBackwardCacheMMU.h |
45 -- drivers/net/npe/include/IxOsalBackwardMemMap.h | 117
----- drivers/net/npe/include/IxOsalBackwardOsServices.h | 101
----- drivers/net/npe/include/IxOsalBackwardOssl.h | 248
---------- drivers/net/npe/include/IxOsalBufferMgt.h
| 570 -----------------------
drivers/net/npe/include/IxOsalBufferMgtDefault.h | 64 ---
drivers/net/npe/include/IxOsalConfig.h | 52 ---
drivers/net/npe/include/IxOsalEndianess.h | 110 -----
drivers/net/npe/include/IxOsalIoMem.h | 298
------------ drivers/net/npe/include/IxOsalMemAccess.h
| 470 -------------------
drivers/net/npe/include/IxOsalOem.h | 73 ---
drivers/net/npe/include/IxOsalOs.h | 30 --
drivers/net/npe/include/IxOsalOsAssert.h | 10 -
drivers/net/npe/include/IxOsalOsBufferMgt.h | 72 ---
drivers/net/npe/include/IxOsalOsIxp400.h | 292
------------ drivers/net/npe/include/IxOsalOsIxp400CustomizedMapping.h
| 380 ----------------
drivers/net/npe/include/IxOsalOsTypes.h | 60 ---
drivers/net/npe/include/IxOsalOsUtilitySymbols.h | 4 -
drivers/net/npe/include/IxOsalTypes.h | 355
---------------
drivers/net/npe/include/IxOsalUtilitySymbols.h | 27 --
drivers/net/npe/include/IxParityENAcc.h | 761
-------------------------------
drivers/net/npe/include/IxPerfProfAcc.h | 1334
------------------------------------------------------
drivers/net/npe/include/IxQMgr.h | 2186
----------------------------------------------------------------------------------------
drivers/net/npe/include/IxQMgrAqmIf_p.h | 903
-------------------------------------
drivers/net/npe/include/IxQMgrDefines_p.h | 31 --
drivers/net/npe/include/IxQMgrDispatcher_p.h | 82 ----
drivers/net/npe/include/IxQMgrLog_p.h | 100 -----
drivers/net/npe/include/IxQMgrQAccess_p.h | 72 ---
drivers/net/npe/include/IxQMgrQCfg_p.h | 98 ----
drivers/net/npe/include/IxQueueAssignments.h | 492
--------------------
drivers/net/npe/include/IxSspAcc.h | 1247
---------------------------------------------------
drivers/net/npe/include/IxTimeSyncAcc.h | 759
-------------------------------
drivers/net/npe/include/IxTimerCtrl.h | 239
---------- drivers/net/npe/include/IxTypes.h
| 62 --- drivers/net/npe/include/IxUART.h
| 434 ------------------
drivers/net/npe/include/IxVersionId.h | 131
------ drivers/net/npe/include/ix_error.h |
42 -- drivers/net/npe/include/ix_macros.h | 242
---------- drivers/net/npe/include/ix_os_type.h
| 41 -- drivers/net/npe/include/ix_ossl.h |
136 ------ drivers/net/npe/include/ix_symbols.h
| 82 ---- drivers/net/npe/include/ix_types.h
| 184 --------
drivers/net/npe/include/npe.h | 74 ---
drivers/net/npe/include/os_datatypes.h | 58 ---
drivers/net/npe/miiphy.c | 101 -----
drivers/net/npe/npe.c | 680
----------------------------
drivers/net/zynq_gem.c | 20 +-
drivers/pci/Makefile | 2 +-
drivers/pci/pci_ixp.c | 351
---------------
drivers/pci/pcie_imx.c | 606
+++++++++++++++++++++++++
drivers/serial/Makefile | 1 -
drivers/serial/serial.c | 2 -
drivers/serial/serial_ixp.c | 130
------ drivers/serial/serial_zynq.c |
33 +- drivers/usb/host/Makefile | 1
- drivers/usb/host/ehci-ixp4xx.c | 37 --
include/common.h | 16 +
include/configs/actux1.h | 226
---------- include/configs/actux2.h
| 206 ---------
include/configs/actux3.h | 205
--------- include/configs/actux4.h |
204 ---------
include/configs/cgtqmx6eval.h | 14 +-
include/configs/dvlhost.h | 222
--------- include/configs/hummingboard.h
| 20 +- include/configs/m53evk.h
| 6 +- include/configs/mx23evk.h
| 12 +- include/configs/mx28evk.h
| 26 +- include/configs/mx51evk.h
| 20 +- include/configs/mx53loco.h
| 20 +- include/configs/mx6_common.h
| 5 + include/configs/mx6qarm2.h |
10 +- include/configs/mx6sabre_common.h | 20
+- include/configs/mx6slevk.h | 22 +-
include/configs/nitrogen6x.h | 11 +
include/configs/udoo.h | 20 +-
include/configs/vf610twr.h | 20 +-
include/configs/zynq-common.h | 102 ++++-
include/configs/zynq_zc70x.h | 2 +-
include/configs/zynq_zed.h | 2 +-
259 files changed, 2109 insertions(+), 70785 deletions(-) create mode
100644 arch/arm/cpu/armv7/zynq/clk.c create mode 100644
arch/arm/cpu/armv7/zynq/spl.c create mode 100644
arch/arm/cpu/armv7/zynq/u-boot-spl.lds delete mode 100644
arch/arm/cpu/ixp/Makefile delete mode 100644
arch/arm/cpu/ixp/config.mk delete mode 100644 arch/arm/cpu/ixp/cpu.c
delete mode 100644 arch/arm/cpu/ixp/interrupts.c delete mode 100644
arch/arm/cpu/ixp/start.S delete mode 100644 arch/arm/cpu/ixp/timer.c
delete mode 100644 arch/arm/cpu/ixp/u-boot.lds create mode 100644
arch/arm/include/asm/arch-imx/cpu.h delete mode 100644
arch/arm/include/asm/arch-ixp/ixp425.h delete mode 100644
arch/arm/include/asm/arch-ixp/ixp425pci.h create mode 100644
arch/arm/include/asm/arch-zynq/clk.h create mode 100644
arch/arm/include/asm/arch-zynq/spl.h delete mode 100644
board/actux1/Makefile delete mode 100644 board/actux1/actux1.c delete
mode 100644 board/actux1/actux1_hw.h delete mode 100644
board/actux1/u-boot.lds delete mode 100644 board/actux2/Makefile
delete mode 100644 board/actux2/actux2.c delete mode 100644
board/actux2/actux2_hw.h delete mode 100644 board/actux2/u-boot.lds
delete mode 100644 board/actux3/Makefile delete mode 100644
board/actux3/actux3.c delete mode 100644 board/actux3/actux3_hw.h
delete mode 100644 board/actux3/u-boot.lds delete mode 100644
board/actux4/Makefile delete mode 100644 board/actux4/actux4.c delete
mode 100644 board/actux4/actux4_hw.h delete mode 100644
board/dvlhost/Makefile delete mode 100644 board/dvlhost/dvlhost.c
delete mode 100644 board/dvlhost/dvlhost_hw.h delete mode 100644
board/dvlhost/u-boot.lds delete mode 100644 board/dvlhost/watchdog.c
delete mode 100644 board/samsung/smdk5250/lowlevel_init.S create mode
100644 board/xilinx/zynq/ps7_init.c delete mode 100644
drivers/net/npe/IxEthAcc.c delete mode 100644
drivers/net/npe/IxEthAccCommon.c delete mode 100644
drivers/net/npe/IxEthAccControlInterface.c delete mode 100644
drivers/net/npe/IxEthAccDataPlane.c delete mode 100644
drivers/net/npe/IxEthAccMac.c delete mode 100644
drivers/net/npe/IxEthAccMii.c delete mode 100644
drivers/net/npe/IxEthDBAPI.c delete mode 100644
drivers/net/npe/IxEthDBAPISupport.c delete mode 100644
drivers/net/npe/IxEthDBCore.c delete mode 100644
drivers/net/npe/IxEthDBEvents.c delete mode 100644
drivers/net/npe/IxEthDBFeatures.c delete mode 100644
drivers/net/npe/IxEthDBFirewall.c delete mode 100644
drivers/net/npe/IxEthDBHashtable.c delete mode 100644
drivers/net/npe/IxEthDBLearning.c delete mode 100644
drivers/net/npe/IxEthDBMem.c delete mode 100644
drivers/net/npe/IxEthDBNPEAdaptor.c delete mode 100644
drivers/net/npe/IxEthDBPortUpdate.c delete mode 100644
drivers/net/npe/IxEthDBReports.c delete mode 100644
drivers/net/npe/IxEthDBSearch.c delete mode 100644
drivers/net/npe/IxEthDBSpanningTree.c delete mode 100644
drivers/net/npe/IxEthDBUtil.c delete mode 100644
drivers/net/npe/IxEthDBVlan.c delete mode 100644
drivers/net/npe/IxEthDBWiFi.c delete mode 100644
drivers/net/npe/IxEthMii.c delete mode 100644
drivers/net/npe/IxFeatureCtrl.c delete mode 100644
drivers/net/npe/IxNpeDl.c delete mode 100644
drivers/net/npe/IxNpeDlImageMgr.c delete mode 100644
drivers/net/npe/IxNpeDlNpeMgr.c delete mode 100644
drivers/net/npe/IxNpeDlNpeMgrUtils.c delete mode 100644
drivers/net/npe/IxNpeMh.c delete mode 100644
drivers/net/npe/IxNpeMhConfig.c delete mode 100644
drivers/net/npe/IxNpeMhReceive.c delete mode 100644
drivers/net/npe/IxNpeMhSend.c delete mode 100644
drivers/net/npe/IxNpeMhSolicitedCbMgr.c delete mode 100644
drivers/net/npe/IxNpeMhUnsolicitedCbMgr.c delete mode 100644
drivers/net/npe/IxOsalBufferMgt.c delete mode 100644
drivers/net/npe/IxOsalIoMem.c delete mode 100644
drivers/net/npe/IxOsalOsCacheMMU.c delete mode 100644
drivers/net/npe/IxOsalOsMsgQ.c delete mode 100644
drivers/net/npe/IxOsalOsSemaphore.c delete mode 100644
drivers/net/npe/IxOsalOsServices.c delete mode 100644
drivers/net/npe/IxOsalOsThread.c delete mode 100644
drivers/net/npe/IxQMgrAqmIf.c delete mode 100644
drivers/net/npe/IxQMgrDispatcher.c delete mode 100644
drivers/net/npe/IxQMgrInit.c delete mode 100644
drivers/net/npe/IxQMgrQAccess.c delete mode 100644
drivers/net/npe/IxQMgrQCfg.c delete mode 100644
drivers/net/npe/Makefile delete mode 100644
drivers/net/npe/include/IxAssert.h delete mode 100644
drivers/net/npe/include/IxAtmSch.h delete mode 100644
drivers/net/npe/include/IxAtmTypes.h delete mode 100644
drivers/net/npe/include/IxAtmdAcc.h delete mode 100644
drivers/net/npe/include/IxAtmdAccCtrl.h delete mode 100644
drivers/net/npe/include/IxAtmm.h delete mode 100644
drivers/net/npe/include/IxDmaAcc.h delete mode 100644
drivers/net/npe/include/IxEthAcc.h delete mode 100644
drivers/net/npe/include/IxEthAccDataPlane_p.h delete mode 100644
drivers/net/npe/include/IxEthAccMac_p.h delete mode 100644
drivers/net/npe/include/IxEthAccMii_p.h delete mode 100644
drivers/net/npe/include/IxEthAccQueueAssign_p.h delete mode 100644
drivers/net/npe/include/IxEthAcc_p.h delete mode 100644
drivers/net/npe/include/IxEthDB.h delete mode 100644
drivers/net/npe/include/IxEthDBLocks_p.h delete mode 100644
drivers/net/npe/include/IxEthDBLog_p.h delete mode 100644
drivers/net/npe/include/IxEthDBMessages_p.h delete mode 100644
drivers/net/npe/include/IxEthDBPortDefs.h delete mode 100644
drivers/net/npe/include/IxEthDBQoS.h delete mode 100644
drivers/net/npe/include/IxEthDB_p.h delete mode 100644
drivers/net/npe/include/IxEthMii.h delete mode 100644
drivers/net/npe/include/IxEthMii_p.h delete mode 100644
drivers/net/npe/include/IxEthNpe.h delete mode 100644
drivers/net/npe/include/IxFeatureCtrl.h delete mode 100644
drivers/net/npe/include/IxHssAcc.h delete mode 100644
drivers/net/npe/include/IxI2cDrv.h delete mode 100644
drivers/net/npe/include/IxNpeA.h delete mode 100644
drivers/net/npe/include/IxNpeDl.h delete mode 100644
drivers/net/npe/include/IxNpeDlImageMgr_p.h delete mode 100644
drivers/net/npe/include/IxNpeDlMacros_p.h delete mode 100644
drivers/net/npe/include/IxNpeDlNpeMgrEcRegisters_p.h delete mode
100644 drivers/net/npe/include/IxNpeDlNpeMgrUtils_p.h delete mode
100644 drivers/net/npe/include/IxNpeDlNpeMgr_p.h delete mode 100644
drivers/net/npe/include/IxNpeMh.h delete mode 100644
drivers/net/npe/include/IxNpeMhConfig_p.h delete mode 100644
drivers/net/npe/include/IxNpeMhMacros_p.h delete mode 100644
drivers/net/npe/include/IxNpeMhReceive_p.h delete mode 100644
drivers/net/npe/include/IxNpeMhSend_p.h delete mode 100644
drivers/net/npe/include/IxNpeMhSolicitedCbMgr_p.h delete mode 100644
drivers/net/npe/include/IxNpeMhUnsolicitedCbMgr_p.h delete mode 100644
drivers/net/npe/include/IxNpeMicrocode.h delete mode 100644
drivers/net/npe/include/IxOsBufLib.h delete mode 100644
drivers/net/npe/include/IxOsBuffMgt.h delete mode 100644
drivers/net/npe/include/IxOsBuffPoolMgt.h delete mode 100644
drivers/net/npe/include/IxOsCacheMMU.h delete mode 100644
drivers/net/npe/include/IxOsPrintf.h delete mode 100644
drivers/net/npe/include/IxOsServices.h delete mode 100644
drivers/net/npe/include/IxOsServicesComponents.h delete mode 100644
drivers/net/npe/include/IxOsServicesEndianess.h delete mode 100644
drivers/net/npe/include/IxOsServicesMemAccess.h delete mode 100644
drivers/net/npe/include/IxOsServicesMemMap.h delete mode 100644
drivers/net/npe/include/IxOsal.h delete mode 100644
drivers/net/npe/include/IxOsalAssert.h delete mode 100644
drivers/net/npe/include/IxOsalBackward.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardAssert.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardBufferMgt.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardCacheMMU.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardMemMap.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardOsServices.h delete mode 100644
drivers/net/npe/include/IxOsalBackwardOssl.h delete mode 100644
drivers/net/npe/include/IxOsalBufferMgt.h delete mode 100644
drivers/net/npe/include/IxOsalBufferMgtDefault.h delete mode 100644
drivers/net/npe/include/IxOsalConfig.h delete mode 100644
drivers/net/npe/include/IxOsalEndianess.h delete mode 100644
drivers/net/npe/include/IxOsalIoMem.h delete mode 100644
drivers/net/npe/include/IxOsalMemAccess.h delete mode 100644
drivers/net/npe/include/IxOsalOem.h delete mode 100644
drivers/net/npe/include/IxOsalOs.h delete mode 100644
drivers/net/npe/include/IxOsalOsAssert.h delete mode 100644
drivers/net/npe/include/IxOsalOsBufferMgt.h delete mode 100644
drivers/net/npe/include/IxOsalOsIxp400.h delete mode 100644
drivers/net/npe/include/IxOsalOsIxp400CustomizedMapping.h delete mode
100644 drivers/net/npe/include/IxOsalOsTypes.h delete mode 100644
drivers/net/npe/include/IxOsalOsUtilitySymbols.h delete mode 100644
drivers/net/npe/include/IxOsalTypes.h delete mode 100644
drivers/net/npe/include/IxOsalUtilitySymbols.h delete mode 100644
drivers/net/npe/include/IxParityENAcc.h delete mode 100644
drivers/net/npe/include/IxPerfProfAcc.h delete mode 100644
drivers/net/npe/include/IxQMgr.h delete mode 100644
drivers/net/npe/include/IxQMgrAqmIf_p.h delete mode 100644
drivers/net/npe/include/IxQMgrDefines_p.h delete mode 100644
drivers/net/npe/include/IxQMgrDispatcher_p.h delete mode 100644
drivers/net/npe/include/IxQMgrLog_p.h delete mode 100644
drivers/net/npe/include/IxQMgrQAccess_p.h delete mode 100644
drivers/net/npe/include/IxQMgrQCfg_p.h delete mode 100644
drivers/net/npe/include/IxQueueAssignments.h delete mode 100644
drivers/net/npe/include/IxSspAcc.h delete mode 100644
drivers/net/npe/include/IxTimeSyncAcc.h delete mode 100644
drivers/net/npe/include/IxTimerCtrl.h delete mode 100644
drivers/net/npe/include/IxTypes.h delete mode 100644
drivers/net/npe/include/IxUART.h delete mode 100644
drivers/net/npe/include/IxVersionId.h delete mode 100644
drivers/net/npe/include/ix_error.h delete mode 100644
drivers/net/npe/include/ix_macros.h delete mode 100644
drivers/net/npe/include/ix_os_type.h delete mode 100644
drivers/net/npe/include/ix_ossl.h delete mode 100644
drivers/net/npe/include/ix_symbols.h delete mode 100644
drivers/net/npe/include/ix_types.h delete mode 100644
drivers/net/npe/include/npe.h delete mode 100644
drivers/net/npe/include/os_datatypes.h delete mode 100644
drivers/net/npe/miiphy.c delete mode 100644 drivers/net/npe/npe.c
delete mode 100644 drivers/pci/pci_ixp.c create mode 100644
drivers/pci/pcie_imx.c delete mode 100644 drivers/serial/serial_ixp.c
delete mode 100644 drivers/usb/host/ehci-ixp4xx.c delete mode 100644
include/configs/actux1.h delete mode 100644 include/configs/actux2.h
delete mode 100644 include/configs/actux3.h delete mode 100644
include/configs/actux4.h delete mode 100644 include/configs/dvlhost.h
Amicalement,
--
Albert.
next reply other threads:[~2014-02-20 13:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 13:57 Albert ARIBAUD [this message]
2014-02-20 17:19 ` [U-Boot] Pull request (with merge conflict resolution): u-boot-arm/master Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140220145742.52ef6261@lilith \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.