Pull request: u-boot-arm/master

Hi Wolfgang,

I have moved the contents of u-boot-arm/next to u-boot-arm/master, and therefore...

The following changes since commit 1d5e7fb403257d62f0f2419cb83fdf6b0f02f215:

   Prepare v2011.09 (2011-09-29 21:11:15 +0200)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Ajay Bhargav (5):
gpio: Add GPIO driver framework for Marvell SoCs
gpio: Add GPIO driver for Marvell SoC Armada100
net: Adds Fast Ethernet Controller driver for Armada100
Armada100: Enable Ethernet support for GplugD
Armada100: Enable 88E3015 PHY support for GplugD

Aneesh V (1):
omap4: update maintainer for omap4 boards

Balaji T K (2):
mmc: omap: enable high capacity
mmc: omap: config VMMC, MMC1_PBIAS

Fabio Estevam (25):
ARM: mx25: Print the silicon revison
ARM: mx25: Print the source of reset
MX31: mx31pdk: Remove nand_spl config.mk file
MX31: Improve readability for reset cause
mx31pdk: Change the prompt as per other i.MX boards
MX25: tx25: Avoid the usage of extern in C file
MX25: Add initial support for MX25PDK
MX31: Disable watchdog during low-power modes
mx31pdk: Remove dram_init_banksize()
mx25pdk: Remove dram_init_banksize()
mx31ads: Remove dram_init_banksize()
imx31_litekit: Remove dram_init_banksize()
mx31pdk: Place machine ID into board config
mx25pdk: Place machine ID into board config
mx31ads: Place machine ID into board config
imx31_litekit: Place machine ID into board config
mx51evk: Place machine ID into board config
mx53loco: Place machine ID into board config
mx53smd: Place machine ID into board config
mx53ard: Place machine ID into board config
mx53evk: Place machine ID into board config
zmx25: Remove dram_init_banksize()
zmx25: Place machine ID into board config
zmx25: Fix build warning due to 'get_reset_cause' defined but not
used
vision2: Place machine ID into board config

Heiko Schocher (16):
i2c, davinci: add i2c set speed
net, davinci_emac: add KSZ8864 switch
net, davinci_emac: make less verbose - turn printf() into debug() net, davinci_emac: let the EMAC detect the PHYs
arm, davinci: move davinci_timer in header file
arm, davinci: add missing timer baseaddresses for !DA8xx cpu arm, davinci: add internal WDT support for AM1808 cpus arm, davinci: add RTC base addr
rtc, davinci: add support for davinci internal RTC arm, davinci: add SYSCFG1 base and register struct arm, davinci: add some missing defines in hardware.h arm, davinci, am1808, gpio: add missing defines for bank 8 arm, davinci: add ddr2 definition
arm, davinci: add NOR Boot Configuration Word
arm, davinci, am1808: add lowlevel functions for booting from NOR arm, davinci, da8xx: add cpuinfo

Jason Liu (1):
cosmetic: fsl_pmic: cosmetic for the help message

Joe Hershberger (1):
omap4_panda: Ignore omap4 SPL called MLO

Marek Vasut (19):
EfikaMX: Adjust undocumented magic constant in config file
FEC: Use proper accessor to read register in debug call
FEC: Use defined constant instead of magic number
FEC: Kill mode select FIXME's
FEC: Add RMII mode support
FEC: Allow selection of MII mode via CONFIG_FEC_XCV_TYPE
FEC: Abstract access to fec->eth in MII operations
FEC: Allow multiple FECes
FEC: Allow registering MII postconfiguration callback
FEC: Add timeout for chip reset
FEC: Squish "got MAC from fuse" message, make it debug()
FEC: Move imx_get_mac_from_fuse() definition to fec_mxc.h
MX5: Modify the PLL decoding algorithm
MX5: Add AHB clock reporting and fix IPG clock reporting
MX5: Clean up the output of "clocks" command
I2C: mxc_i2c rework
ATA: Squash warnings in mxc_ata.
EfikaMX: Add imximage config for Efika SB
EfikaSB: Add preliminary EfikaSB support

Philip Balister (2):
OMAP3: Overo: Update GPMC timing for ethernet chip
overo: Set IEN on GPMC_CLK to support synchronous clocking.

Sandeep Paulraj (1):
devkit8000: Fix build break

Sanjeev Premi (2):
omap3: Fix compile warning
omap3evm: env: Fix default console

Simon Schwarz (9):
omap-common/omap4: relocate early UART clock setup
omap3: Configure RAM bank 0 if in SPL
omap-common: add nand spl support
spl: add NAND Library to new SPL
spl: Add POWER library to new spl
omap3: new SPL structure support
devkit8000: Add nand-spl support for new SPL
omap3: implement boot parameter saving
omap-common: reorganize spl.c

Thomas Weber (1):
Devkit8000: Change console from ttyS2 to ttyO2

  .gitignore                                         |    1 +
  MAINTAINERS                                        |    9 +-
  arch/arm/cpu/arm1136/mx31/generic.c                |    2 +-
  arch/arm/cpu/arm1136/mx31/timer.c                  |    4 +-
  arch/arm/cpu/arm926ejs/davinci/Makefile            |    3 +-
  arch/arm/cpu/arm926ejs/davinci/am1808_lowlevel.c   |  428 ++++++++++++
  arch/arm/cpu/arm926ejs/davinci/cpu.c               |   16 +-
  arch/arm/cpu/arm926ejs/davinci/ksz8873.c           |   68 ++
  arch/arm/cpu/arm926ejs/davinci/timer.c             |   46 +-
  arch/arm/cpu/arm926ejs/mx25/generic.c              |   53 ++-
  arch/arm/cpu/arm926ejs/start.S                     |    9 +
  arch/arm/cpu/armv7/mx5/clock.c                     |  114 +++-
  arch/arm/cpu/armv7/omap-common/Makefile            |    6 +
  arch/arm/cpu/armv7/omap-common/spl.c               |  165 +----
  arch/arm/cpu/armv7/omap-common/spl_mmc.c           |  150 ++++
  arch/arm/cpu/armv7/omap-common/spl_nand.c          |   71 ++
  arch/arm/cpu/armv7/omap3/board.c                   |   50 ++-
  arch/arm/cpu/armv7/omap3/config.mk                 |   30 +
  arch/arm/cpu/armv7/omap3/lowlevel_init.S           |   10 +
  arch/arm/cpu/armv7/omap3/sdrc.c                    |   32 +-
  arch/arm/cpu/armv7/omap3/sys_info.c                |    2 +-
  arch/arm/cpu/armv7/omap4/board.c                   |    1 +
  arch/arm/include/asm/arch-armada100/armada100.h    |   58 ++
  arch/arm/include/asm/arch-armada100/gpio.h         |   48 ++
  arch/arm/include/asm/arch-armada100/mfp.h          |   19 +
  .../arm/include/asm/arch-davinci/am1808_lowlevel.h |   44 ++
  arch/arm/include/asm/arch-davinci/ddr2_defs.h      |   96 +++
  arch/arm/include/asm/arch-davinci/emac_defs.h      |    6 +
  arch/arm/include/asm/arch-davinci/gpio.h           |    2 +
  arch/arm/include/asm/arch-davinci/hardware.h       |   30 +
  arch/arm/include/asm/arch-davinci/timer_defs.h     |   44 ++
  arch/arm/include/asm/arch-mx25/imx-regs.h          |    4 +-
  arch/arm/include/asm/arch-mx25/sys_proto.h         |   29 +
  arch/arm/include/asm/arch-mx27/imx-regs.h          |    1 -
  arch/arm/include/asm/arch-mx31/imx-regs.h          |    2 +
  arch/arm/include/asm/arch-mx35/imx-regs.h          |    2 -
  arch/arm/include/asm/arch-mx5/crm_regs.h           |   11 +
  arch/arm/include/asm/arch-mx5/imx-regs.h           |    5 +-
  arch/arm/include/asm/arch-omap3/mem.h              |   36 +
  arch/arm/include/asm/arch-omap3/omap_gpmc.h        |    9 +
  arch/arm/include/asm/arch-omap3/sys_proto.h        |    1 +
  arch/arm/include/asm/arch-omap4/omap4.h            |    8 +-
  arch/arm/include/asm/omap_common.h                 |   31 +
  board/Marvell/gplugd/gplugd.c                      |   71 ++
  board/efikamx/efikamx.c                            |  124 +++-
  board/efikamx/{imximage.cfg => imximage_mx.cfg}    |    0
  board/efikamx/{imximage.cfg => imximage_sb.cfg}    |   26 +-
  board/freescale/mx25pdk/Makefile                   |   49 ++
  board/freescale/mx25pdk/imximage.cfg               |   73 ++
  board/freescale/mx25pdk/lowlevel_init.S            |   21 +
  board/freescale/mx25pdk/mx25pdk.c                  |   56 ++
  board/freescale/mx31ads/mx31ads.c                  |    7 -
  board/freescale/mx31pdk/mx31pdk.c                  |    7 -
  board/freescale/mx51evk/mx51evk.c                  |    1 -
  board/freescale/mx53ard/mx53ard.c                  |    1 -
  board/freescale/mx53evk/mx53evk.c                  |    1 -
  board/freescale/mx53loco/mx53loco.c                |    1 -
  board/freescale/mx53smd/mx53smd.c                  |    1 -
  board/isee/igep0020/igep0020.c                     |    1 +
  board/isee/igep0020/igep0020.h                     |    9 -
  board/karo/tx25/tx25.c                             |    3 +-
  board/logicpd/imx31_litekit/imx31_litekit.c        |    7 -
  board/overo/overo.c                                |    1 +
  board/overo/overo.h                                |   11 +-
  board/syteco/zmx25/zmx25.c                         |    8 -
  board/timll/devkit8000/devkit8000.c                |    2 +-
  board/ttcontrol/vision2/vision2.c                  |    1 -
  boards.cfg                                         |    5 +-
  doc/README.SPL                                     |    2 +
  doc/README.davinci                                 |    9 +
  drivers/block/mxc_ata.c                            |   22 +-
  drivers/gpio/Makefile                              |    1 +
  drivers/gpio/mvgpio.c                              |  115 +++
  drivers/gpio/mvgpio.h                              |   74 ++
  drivers/i2c/davinci_i2c.c                          |    5 +
  drivers/i2c/mxc_i2c.c                              |  422 ++++++++----
  drivers/misc/fsl_pmic.c                            |    2 +-
  drivers/mmc/omap_hsmmc.c                           |   34 +-
  drivers/mtd/nand/Makefile                          |   10 +-
  drivers/mtd/nand/nand_base.c                       |    4 +-
  drivers/mtd/nand/nand_spl_simple.c                 |  245 +++++++
  drivers/mtd/nand/omap_gpmc.c                       |   27 +
  drivers/net/Makefile                               |    1 +
  drivers/net/armada100_fec.c                        |  736 
++++++++++++++++++++
  drivers/net/armada100_fec.h                        |  232 ++++++
  drivers/net/davinci_emac.c                         |   12 +-
  drivers/net/fec_mxc.c                              |  170 +++--
  drivers/net/fec_mxc.h                              |    9 +-
  drivers/power/twl6030.c                            |    7 +
  drivers/rtc/Makefile                               |    1 +
  drivers/rtc/davinci.c                              |  125 ++++
  include/configs/devkit8000.h                       |   48 ++-
  include/configs/efikamx.h                          |    6 +-
  include/configs/gplugd.h                           |   30 +-
  include/configs/imx31_litekit.h                    |    4 +-
  include/configs/mx25pdk.h                          |  108 +++
  include/configs/mx31ads.h                          |    2 +
  include/configs/mx31pdk.h                          |    4 +-
  include/configs/mx51evk.h                          |    1 +
  include/configs/mx53ard.h                          |    2 +
  include/configs/mx53evk.h                          |    2 +
  include/configs/mx53loco.h                         |    2 +
  include/configs/mx53smd.h                          |    4 +-
  include/configs/omap3_evm.h                        |    2 +-
  include/configs/omap4_common.h                     |    2 +
  include/configs/omap4_sdp4430.h                    |    2 +
  include/configs/vision2.h                          |    2 +
  include/configs/zmx25.h                            |    1 +
  include/nand.h                                     |    6 +
  include/netdev.h                                   |    8 +-
  include/twl6030.h                                  |    3 +
  nand_spl/board/freescale/mx31pdk/Makefile          |    2 +-
  nand_spl/board/freescale/mx31pdk/config.mk         |    1 -
  spl/Makefile                                       |    2 +
  114 files changed, 4237 insertions(+), 515 deletions(-)

create mode 100644 arch/arm/cpu/arm926ejs/davinci/am1808_lowlevel.c create mode 100644 arch/arm/cpu/arm926ejs/davinci/ksz8873.c create mode 100644 arch/arm/cpu/armv7/omap-common/spl_mmc.c create mode 100644 arch/arm/cpu/armv7/omap-common/spl_nand.c create mode 100644 arch/arm/cpu/armv7/omap3/config.mk create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 arch/arm/include/asm/arch-davinci/am1808_lowlevel.h create mode 100644 arch/arm/include/asm/arch-davinci/ddr2_defs.h create mode 100644 arch/arm/include/asm/arch-davinci/timer_defs.h create mode 100644 arch/arm/include/asm/arch-mx25/sys_proto.h copy board/efikamx/{imximage.cfg => imximage_mx.cfg} (100%) rename board/efikamx/{imximage.cfg => imximage_sb.cfg} (90%) create mode 100644 board/freescale/mx25pdk/Makefile
create mode 100644 board/freescale/mx25pdk/imximage.cfg create mode 100644 board/freescale/mx25pdk/lowlevel_init.S create mode 100644 board/freescale/mx25pdk/mx25pdk.c

create mode 100644 drivers/gpio/mvgpio.c
create mode 100644 drivers/gpio/mvgpio.h
create mode 100644 drivers/mtd/nand/nand_spl_simple.c create mode 100644 drivers/net/armada100_fec.c create mode 100644 drivers/net/armada100_fec.h create mode 100644 drivers/rtc/davinci.c
create mode 100644 include/configs/mx25pdk.h
delete mode 100644 nand_spl/board/freescale/mx31pdk/config.mk

Hi Wolfgang,

I have moved the contents of u-boot-arm/next to u-boot-arm/master, and therefore...

The following changes since commit 1d5e7fb403257d62f0f2419cb83fdf6b0f02f215:

Hi Albert,

Quoted 2 lines · Albert ARIBAUD

Hi Wolfgang,

Quoted 2 lines

I have moved the contents of u-boot-arm/next to u-boot-arm/master, and therefore...

Are you able to pick my the tegra clock/pinmux patch set as discussed please? I will get started on the next series.

Regards,
Simon

Quoted 2 lines

The following changes since commit 1d5e7fb403257d62f0f2419cb83fdf6b0f02f215:

Hi Simon,

Le 04/10/2011 07:35, Simon Glass a ?crit :

Quoted 18 lines

Hi Albert,

Quoted 5 lines · On Fri, Sep 30, 2011 at 1:09 PM, Albert ARIBAUD <[email protected]>…

Hi Wolfgang,

I have moved the contents of u-boot-arm/next to u-boot-arm/master, and therefore...

Are you able to pick my the tegra clock/pinmux patch set as discussed please? I will get started on the next series.

Regards,
Simon

Quoted 1 line

Quoted 2 lines

Quoted 2 lines

The following changes since commit
1d5e7fb403257d62f0f2419cb83fdf6b0f02f215:

FYI, these should all be in the current u-boot-arm/master. Let me know if anything is missing.

Amicalement,
--
Albert.