[U-Boot] [PULL] u-boot-atmel/master -> u-boot-arm/master

Andreas Bießmann
2013-11-04T19:43:31Z

Dear Albert Aribaud,

please pull u-boot-atmel/master into u-boot-arm/master.

The following changes since commit 304db0b38cfb04cfdb05a740d5ef27da06ea98ea:

arm: Remove IXP425 boards pdnb3 and scpu (2013-10-17 09:28:08 +0200)

are available in the git repository at:

git://git.denx.de/u-boot-atmel.git master

for you to fetch changes up to c12f941bece9ed79efccfe9e4a9fd977da6975f9:

at91: add defines for reset type (2013-11-04 20:32:39 +0100)

----------------------------------------------------------------
Bo Shen (3):
net: macb: get DMA bus width from design config register
arm: atmel: at91sam9n12ek: add usb host support
arm: atmel: get rid of too many ifdeffery

Jens Scharsig (BuS Elektronik) (1):
ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot target

Roger Meier (1):
at91: add defines for reset type

arch/arm/include/asm/arch-at91/at91_pmc.h | 2 ++
arch/arm/include/asm/arch-at91/at91_rstc.h | 7 +++++++
board/atmel/at91sam9n12ek/at91sam9n12ek.c | 11 +++++++++++
drivers/net/macb.c | 20 +++++++++++++++++++-
drivers/net/macb.h | 11 +++++++++++
drivers/usb/host/ohci-at91.c | 19 ++++++++++---------
include/configs/afeb9260.h | 1 +
include/configs/at91rm9200ek.h | 1 +
include/configs/at91sam9260ek.h | 1 +
include/configs/at91sam9261ek.h | 1 +
include/configs/at91sam9263ek.h | 1 +
include/configs/at91sam9n12ek.h | 13 +++++++++++++
include/configs/at91sam9x5ek.h | 3 ++-
include/configs/cpu9260.h | 1 +
include/configs/cpuat91.h | 1 +
include/configs/eb_cpux9k2.h | 4 +++-
include/configs/ethernut5.h | 1 +
include/configs/meesc.h | 1 +
include/configs/otc570.h | 1 +
include/configs/pm9261.h | 1 +
include/configs/pm9263.h | 1 +
include/configs/pm9g45.h | 1 +
include/configs/sama5d3xek.h | 1 +
include/configs/sbc35_a9g20.h | 1 +
include/configs/snapper9260.h | 1 +
include/configs/stamp9g20.h | 1 +
include/configs/top9000.h | 1 +
include/configs/vl_ma2sc.h | 1 +
28 files changed, 97 insertions(+), 12 deletions(-)