[U-Boot] Pull request: u-boot-arm/master

Albert ARIBAUD
2011-11-15T21:28:25Z

Hi Wolfgang,

The following changes since commit 5721385b187b3154c7768e6c182501022f4e2e45:

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx (2011-11-08
07:44:52 +0100)

are available in the git repository at:

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

Alexander Holler (1):
BeagleBoard: config: Switch to ttyO2

Asen Dimov (1):
ARM: define CONFIG_MACH_TYPE for all ronetix boards

Christian Riesch (3):
arm, davinci: Rename AM1808 lowlevel functions to DA850
arm, davinci: Remove the duplication of LPSC functions
arm, davinci: Fix setting of the SDRAM configuration register

David M?ller (ELSOFT AG) (2):
ARM: re-add MACH_TYPE_XXXXXX for VCMA9 board and add CONFIG_MACH_TYPE
ARM: remove superfluous setting of arch_number in board specific
code.

Fabio Estevam (5):
qong: Use generic function for configuring GPR register
mx31: Remove duplicate definition for GPR register
mx31: Use proper IO accessor for GPR register
mx31: Fix checkpatch warnings in generic.c
m28evk: Fix comment about the number of RAM banks

Heiko Schocher (3):
arm, davinci: da850/dm365 lowlevel cleanup
arm, davinci_emac: fix driver bug if more then 3 PHYs are detected
arm, davinci: add DAVINCI_MMC_CLKID

Linus Walleij (7):
integrator: do not test first part of the memory
integrator: pass configs for core modules
integrator: move text offset to config
integrator: use io-accessors for board init
integrator: make flash writeable on boot
integrator: add system controller header
integrator: enable Vpp and disable flash protection

Manjunath Hadli (2):
dm646x: add new configuration for dm6467T
dm646x: pass board revision info to kernel

Marek Vasut (27):
SPL: Allow ARM926EJS to avoid compiling in the CPU support code
iMX28: Initial support for iMX28 CPU
iMX28: Add SSP MMC driver
FEC: Add support for iMX28 quirks
iMX28: Add PINMUX control
iMX28: Add I2C bus driver
iMX28: Add GPIO control
iMX28: Add SPI driver
iMX28: Add APBH DMA driver
iMX28: Add GPMI NAND driver
iMX28: Add driver for internal RTC
iMX28: Add image header generator tool
iMX28: Add u-boot.sb target to Makefile
iMX28: Add support for DENX M28EVK board
M28: Add MMC SPL
M28: Add doc/README.m28 documentation
iMX28: Fix ARM vector handling
M28: Add memory detection into SPL
iMX28: Add USB and USB PHY register definitions
iMX28: Add USB HOST driver
M28EVK: Enable USB HOST support
PXA: Drop csb226 and innokom boards (unmaintained)
PXA: Cleanup serial_pxa
PXA: vpac270: Enable the new generic MMC driver
OneNAND: Add simple OneNAND SPL
GCC4.6: Fix common/usb.c on xscale
GCC4.6: Squash warnings in onenand_base.c

Nagabhushana Netagunte (1):
da850: add new config file for AM18xx

Po-Yu Chuang (1):
arm: a320: fix broken timer

Prabhakar Lad (1):
da8xxevm: fix build error

Sricharan (7):
omap4: make omap4 code common for future reuse
omap: Checkpatch fixes
omap5: Add minimal support for omap5430.
omap5: clocks: Add clocks support for omap5 platform.
omap5: emif: Add emif/ddr configurations required for omap5 evm
omap4/5: Add support for booting with CH.
omap5: Add omap5_evm board build support.

Stefano Babic (1):
MX25: zmx25: GCC4.6 fix build warnings

Tom Rini (2):
devkit8000: Fix NAND SPL on boards with 256MB NAND
OMAP3: Change omap3_evm maintainer

.gitignore | 1 +
MAINTAINERS | 15 +-
Makefile | 14 +-
README | 6 +
arch/arm/cpu/arm1136/mx31/generic.c | 11 +-
arch/arm/cpu/arm920t/a320/timer.c | 134 +--
arch/arm/cpu/arm926ejs/Makefile | 6 +
arch/arm/cpu/arm926ejs/davinci/Makefile | 2 +-
arch/arm/cpu/arm926ejs/davinci/am1808_lowlevel.c | 428 -------
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 311 +++++
arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 73 +-
.../arm/cpu/arm926ejs/mx28}/Makefile | 11 +-
arch/arm/cpu/arm926ejs/mx28/clock.c | 355 ++++++
arch/arm/cpu/arm926ejs/mx28/iomux.c | 109 ++
arch/arm/cpu/arm926ejs/mx28/mx28.c | 221 ++++
arch/arm/cpu/arm926ejs/mx28/timer.c | 141 +++
arch/arm/cpu/armv7/omap-common/Makefile | 13 +
arch/arm/cpu/armv7/omap-common/clocks-common.c | 609 ++++++++++
arch/arm/cpu/armv7/omap-common/emif-common.c | 1140
+++++++++++++++++
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 267 ++++
.../armv7/{omap4 => omap-common}/lowlevel_init.S | 37 +-
.../{omap4/mem.c => omap-common/mem-common.c} | 0
arch/arm/cpu/armv7/omap-common/spl.c | 9 +-
arch/arm/cpu/armv7/omap4/Makefile | 11 +-
arch/arm/cpu/armv7/omap4/board.c | 384 ------
arch/arm/cpu/armv7/omap4/clocks.c | 628 ++--------
arch/arm/cpu/armv7/omap4/emif.c | 1135
+-----------------
arch/arm/cpu/armv7/omap4/hwinit.c | 167 +++
arch/arm/cpu/armv7/omap4/omap4_mux_data.h | 83 --
arch/arm/cpu/armv7/omap4/sdram_elpida.c | 2 +-
arch/arm/cpu/armv7/omap5/Makefile | 48 +
arch/arm/cpu/armv7/omap5/clocks.c | 432 +++++++
arch/arm/cpu/armv7/omap5/config.mk | 28 +
arch/arm/cpu/armv7/omap5/emif.c | 105 ++
arch/arm/cpu/armv7/omap5/hwinit.c | 78 ++
arch/arm/cpu/armv7/omap5/sdram_elpida.c | 178 +++
arch/arm/include/asm/arch-davinci/aintc_defs.h | 2 +
.../{am1808_lowlevel.h => da850_lowlevel.h} | 26 +-
arch/arm/include/asm/arch-davinci/ddr2_defs.h | 4 +
arch/arm/include/asm/arch-davinci/emif_defs.h | 1 +
arch/arm/include/asm/arch-davinci/hardware.h | 22 +
arch/arm/include/asm/arch-davinci/pll_defs.h | 14 +
arch/arm/include/asm/arch-mx28/clock.h | 61 +
arch/arm/include/asm/arch-mx28/dma.h | 170 +++
arch/arm/include/asm/arch-mx28/gpio.h | 32 +
arch/arm/include/asm/arch-mx28/imx-regs.h | 39 +
arch/arm/include/asm/arch-mx28/iomux-mx28.h | 537 ++++++++
arch/arm/include/asm/arch-mx28/iomux.h | 168 +++
arch/arm/include/asm/arch-mx28/regs-apbh.h | 466 +++++++
arch/arm/include/asm/arch-mx28/regs-base.h | 88 ++
arch/arm/include/asm/arch-mx28/regs-bch.h | 230 ++++
arch/arm/include/asm/arch-mx28/regs-clkctrl.h | 312 +++++
arch/arm/include/asm/arch-mx28/regs-common.h | 66 +
arch/arm/include/asm/arch-mx28/regs-gpmi.h | 222 ++++
arch/arm/include/asm/arch-mx28/regs-i2c.h | 207 ++++
arch/arm/include/asm/arch-mx28/regs-ocotp.h | 173 +++
arch/arm/include/asm/arch-mx28/regs-pinctrl.h | 1284
++++++++++++++++++++
arch/arm/include/asm/arch-mx28/regs-power.h | 413 +++++++
arch/arm/include/asm/arch-mx28/regs-rtc.h | 147 +++
arch/arm/include/asm/arch-mx28/regs-ssp.h | 349 ++++++
arch/arm/include/asm/arch-mx28/regs-timrot.h | 171 +++
arch/arm/include/asm/arch-mx28/regs-usb.h | 178 +++
arch/arm/include/asm/arch-mx28/regs-usbphy.h | 151 +++
arch/arm/include/asm/arch-mx28/sys_proto.h | 32 +
arch/arm/include/asm/arch-mx31/imx-regs.h | 7 +-
arch/arm/include/asm/arch-omap3/mmc_host_def.h | 11 +-
arch/arm/include/asm/arch-omap4/clocks.h | 23 +
arch/arm/include/asm/arch-omap4/emif.h | 1021 ----------------
arch/arm/include/asm/arch-omap4/mmc_host_def.h | 11 +-
.../arm/include/asm/arch-omap4/{omap4.h => omap.h} | 46 +-
arch/arm/include/asm/arch-omap4/sys_proto.h | 38 +-
arch/arm/include/asm/arch-omap5/clocks.h | 722 +++++++++++
arch/arm/include/asm/arch-omap5/cpu.h | 175 +++
arch/arm/include/asm/arch-omap5/gpio.h | 50 +
arch/arm/include/asm/arch-omap5/i2c.h | 74 ++
arch/arm/include/asm/arch-omap5/mmc_host_def.h | 174 +++
arch/arm/include/asm/arch-omap5/mux_omap5.h | 344 ++++++
arch/arm/include/asm/arch-omap5/omap.h | 223 ++++
arch/arm/include/asm/arch-omap5/sys_proto.h | 122 ++
arch/arm/include/asm/arch-pxa/pxa-regs.h | 111 --
arch/arm/include/asm/arch-pxa/regs-uart.h | 109 ++
arch/arm/include/asm/armv7.h | 3 +
arch/arm/include/asm/emif.h | 1035 ++++++++++++++++
arch/arm/include/asm/mach-types.h | 13 +
arch/arm/include/asm/omap_common.h | 31 +-
board/armltd/integrator/arm-ebi.h | 62 +
board/armltd/integrator/config.mk | 5 -
board/armltd/integrator/integrator-sc.h | 91 ++
board/armltd/integrator/integrator.c | 63 +-
board/csb226/csb226.c | 166 ---
board/csb226/flash.c | 368 ------
board/davedenx/qong/qong.c | 2 +-
board/davinci/dm6467evm/dm6467evm.c | 20 +
board/denx/m28evk/Makefile | 56 +
.../sys_info.c => board/denx/m28evk/m28_init.h | 48 +-
board/denx/m28evk/m28evk.c | 216 ++++
board/denx/m28evk/mem_init.c | 240 ++++
board/denx/m28evk/mmc_boot.c | 273 +++++
board/denx/m28evk/power_init.c | 913 ++++++++++++++
board/denx/m28evk/start.S | 234 ++++
board/denx/m28evk/u-boot-spl.lds | 87 ++
board/denx/m28evk/u-boot.bd | 14 +
board/innokom/flash.c | 421 -------
board/innokom/innokom.c | 190 ---
board/mpl/vcma9/vcma9.c | 3 -
board/ronetix/pm9261/pm9261.c | 3 -
board/ronetix/pm9263/pm9263.c | 3 -
board/ronetix/pm9g45/pm9g45.c | 2 -
board/syteco/zmx25/zmx25.c | 2 -
board/{innokom => ti/omap5_evm}/Makefile | 12 +-
board/ti/omap5_evm/evm.c | 101 ++
board/ti/omap5_evm/mux_data.h | 275 +++++
board/ti/panda/Makefile | 2 -
board/ti/panda/panda.c | 27 +-
board/ti/panda/panda_mux_data.h | 54 +-
board/ti/sdp4430/Makefile | 4 +-
board/ti/sdp4430/sdp.c | 27 +-
board/ti/sdp4430/sdp4430_mux_data.h | 53 +-
board/vpac270/vpac270.c | 9 +
boards.cfg | 22 +-
common/usb.c | 13 +-
doc/README.m28 | 223 ++++
drivers/dma/Makefile | 1 +
drivers/dma/apbh_dma.c | 691 +++++++++++
drivers/gpio/Makefile | 1 +
drivers/gpio/mxs_gpio.c | 136 ++
drivers/i2c/Makefile | 1 +
drivers/i2c/mxs_i2c.c | 246 ++++
drivers/mmc/Makefile | 1 +
drivers/mmc/mxsmmc.c | 351 ++++++
drivers/mmc/omap_hsmmc.c | 26 +-
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/mxs_nand.c | 1118
+++++++++++++++++
drivers/mtd/onenand/Makefile | 4 +
drivers/mtd/onenand/onenand_base.c | 18 +-
drivers/mtd/onenand/onenand_spl.c | 146 +++
drivers/net/davinci_emac.c | 24 +-
drivers/net/fec_mxc.c | 44 +-
drivers/rtc/Makefile | 1 +
drivers/rtc/mxsrtc.c | 86 ++
drivers/serial/serial_pxa.c | 464 +++-----
drivers/spi/Makefile | 1 +
drivers/spi/mxs_spi.c | 186 +++
drivers/usb/host/Makefile | 1 +
drivers/usb/host/ehci-mxs.c | 154 +++
include/configs/VCMA9.h | 4 +
include/configs/csb226.h | 506 --------
include/configs/da850_am18xxevm.h | 245 ++++
include/configs/davinci_dm6467Tevm.h | 163 +++
include/configs/davinci_dm6467evm.h | 1 +
include/configs/devkit8000.h | 1 +
include/configs/innokom.h | 507 --------
include/configs/integratorap.h | 1 +
include/configs/integratorcp.h | 1 +
include/configs/m28evk.h | 303 +++++
include/configs/omap3_beagle.h | 2 +-
include/configs/omap4_common.h | 7 +-
include/configs/omap5_evm.h | 284 +++++
include/configs/pm9261.h | 3 +
include/configs/pm9263.h | 3 +
include/configs/pm9g45.h | 3 +
include/configs/vpac270.h | 3 +-
include/onenand_uboot.h | 3 +
spl/Makefile | 4 +
tools/.gitignore | 1 +
tools/Makefile | 6 +
tools/mxsboot.c | 684 +++++++++++
167 files changed, 21354 insertions(+), 6487 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/davinci/am1808_lowlevel.c
create mode 100644 arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
rename {board/csb226 => arch/arm/cpu/arm926ejs/mx28}/Makefile (86%)
create mode 100644 arch/arm/cpu/arm926ejs/mx28/clock.c
create mode 100644 arch/arm/cpu/arm926ejs/mx28/iomux.c
create mode 100644 arch/arm/cpu/arm926ejs/mx28/mx28.c
create mode 100644 arch/arm/cpu/arm926ejs/mx28/timer.c
create mode 100644 arch/arm/cpu/armv7/omap-common/clocks-common.c
create mode 100644 arch/arm/cpu/armv7/omap-common/emif-common.c
create mode 100644 arch/arm/cpu/armv7/omap-common/hwinit-common.c
rename arch/arm/cpu/armv7/{omap4 => omap-common}/lowlevel_init.S (76%)
rename arch/arm/cpu/armv7/{omap4/mem.c => omap-common/mem-common.c} (100%)
delete mode 100644 arch/arm/cpu/armv7/omap4/board.c
create mode 100644 arch/arm/cpu/armv7/omap4/hwinit.c
delete mode 100644 arch/arm/cpu/armv7/omap4/omap4_mux_data.h
create mode 100644 arch/arm/cpu/armv7/omap5/Makefile
create mode 100644 arch/arm/cpu/armv7/omap5/clocks.c
create mode 100644 arch/arm/cpu/armv7/omap5/config.mk
create mode 100644 arch/arm/cpu/armv7/omap5/emif.c
create mode 100644 arch/arm/cpu/armv7/omap5/hwinit.c
create mode 100644 arch/arm/cpu/armv7/omap5/sdram_elpida.c
rename arch/arm/include/asm/arch-davinci/{am1808_lowlevel.h =>
da850_lowlevel.h} (63%)
create mode 100644 arch/arm/include/asm/arch-mx28/clock.h
create mode 100644 arch/arm/include/asm/arch-mx28/dma.h
create mode 100644 arch/arm/include/asm/arch-mx28/gpio.h
create mode 100644 arch/arm/include/asm/arch-mx28/imx-regs.h
create mode 100644 arch/arm/include/asm/arch-mx28/iomux-mx28.h
create mode 100644 arch/arm/include/asm/arch-mx28/iomux.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-apbh.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-base.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-bch.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-clkctrl.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-common.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-gpmi.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-i2c.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-ocotp.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-pinctrl.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-power.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-rtc.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-ssp.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-timrot.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-usb.h
create mode 100644 arch/arm/include/asm/arch-mx28/regs-usbphy.h
create mode 100644 arch/arm/include/asm/arch-mx28/sys_proto.h
delete mode 100644 arch/arm/include/asm/arch-omap4/emif.h
rename arch/arm/include/asm/arch-omap4/{omap4.h => omap.h} (87%)
create mode 100644 arch/arm/include/asm/arch-omap5/clocks.h
create mode 100644 arch/arm/include/asm/arch-omap5/cpu.h
create mode 100644 arch/arm/include/asm/arch-omap5/gpio.h
create mode 100644 arch/arm/include/asm/arch-omap5/i2c.h
create mode 100644 arch/arm/include/asm/arch-omap5/mmc_host_def.h
create mode 100644 arch/arm/include/asm/arch-omap5/mux_omap5.h
create mode 100644 arch/arm/include/asm/arch-omap5/omap.h
create mode 100644 arch/arm/include/asm/arch-omap5/sys_proto.h
create mode 100644 arch/arm/include/asm/arch-pxa/regs-uart.h
create mode 100644 arch/arm/include/asm/emif.h
create mode 100644 board/armltd/integrator/arm-ebi.h
delete mode 100644 board/armltd/integrator/config.mk
create mode 100644 board/armltd/integrator/integrator-sc.h
delete mode 100644 board/csb226/csb226.c
delete mode 100644 board/csb226/flash.c
create mode 100644 board/denx/m28evk/Makefile
rename arch/arm/cpu/armv7/omap4/sys_info.c =>
board/denx/m28evk/m28_init.h (53%)
create mode 100644 board/denx/m28evk/m28evk.c
create mode 100644 board/denx/m28evk/mem_init.c
create mode 100644 board/denx/m28evk/mmc_boot.c
create mode 100644 board/denx/m28evk/power_init.c
create mode 100644 board/denx/m28evk/start.S
create mode 100644 board/denx/m28evk/u-boot-spl.lds
create mode 100644 board/denx/m28evk/u-boot.bd
delete mode 100644 board/innokom/flash.c
delete mode 100644 board/innokom/innokom.c
rename board/{innokom => ti/omap5_evm}/Makefile (86%)
create mode 100644 board/ti/omap5_evm/evm.c
create mode 100644 board/ti/omap5_evm/mux_data.h
create mode 100644 doc/README.m28
create mode 100644 drivers/dma/apbh_dma.c
create mode 100644 drivers/gpio/mxs_gpio.c
create mode 100644 drivers/i2c/mxs_i2c.c
create mode 100644 drivers/mmc/mxsmmc.c
create mode 100644 drivers/mtd/nand/mxs_nand.c
create mode 100644 drivers/mtd/onenand/onenand_spl.c
create mode 100644 drivers/rtc/mxsrtc.c
create mode 100644 drivers/spi/mxs_spi.c
create mode 100644 drivers/usb/host/ehci-mxs.c
delete mode 100644 include/configs/csb226.h
create mode 100644 include/configs/da850_am18xxevm.h
create mode 100644 include/configs/davinci_dm6467Tevm.h
delete mode 100644 include/configs/innokom.h
create mode 100644 include/configs/m28evk.h
create mode 100644 include/configs/omap5_evm.h
create mode 100644 tools/mxsboot.c

Amicalement,
--
Albert.