Merge branch 'master' of git://git.denx.de/u-boot-arm

diff --combined MAINTAINERS
index d3ed3905eac3fa66d73460c47de326c29ac68a5b,64a7ec893ac8ee6ea17babf94bd4d07d2ca3c42c..45e2dd45411fda77564c0b1a1781efe17d76889d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -27,10 -27,6 +27,10 @@@ Poonam Aggrwal <poonam.aggrwal@freescal
  
        BSC9131RDB      BSC9131
  
 +Naveen Burmi <NaveenBurmi@freescale.com>
 +
 +      BSC9132QDS      BSC9132
 +
  Greg Allen <gallen@arlut.utexas.edu>
  
        UTX8245         MPC8245
@@@ -819,6 -815,9 +819,9 @@@ Dave Peverley <dpeverley@mpc-data.co.uk
  
        omap730p2       ARM926EJS
  
+ Lars Poeschel <poeschel@lemonage.de>
+       pcm051          ARM ARMV7 (AM33xx Soc)
+ 
  Mathieu Poirier <mathieu.poirier@linaro.org>
  
        snowball        ARM ARMV7 (u8500 SoC)
@@@ -939,6 -938,7 +942,7 @@@ Marek Vasut <marek.vasut@gmail.com
        palmtc          xscale/pxa
        vpac270         xscale/pxa
        zipitz2         xscale/pxa
+       mx23_olinuxino  i.MX23
        m28evk          i.MX28
        sc_sps_1        i.MX28
  
@@@ -950,6 -950,10 +954,10 @@@ Matt Waddel <matt.waddel@linaro.org
  
        ca9x4_ct_vxp    ARM ARMV7 (Quad Core)
  
+ Otavio Salvador <otavio@ossystems.com.br>
+ 
+       mx23evk         i.MX23
+ 
  Prafulla Wadaskar <prafulla@marvell.com>
  
        aspenite        ARM926EJS (ARMADA100 88AP168 SoC)

diff --combined Makefile
index 51bd918475c513c29b282ef8a434946ebeacde70,107ee4f909af8c65a4ac738a7ccc7a5d90a9df44..35eee704dd18aed084a06e1b6cc464499ab3a29e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -348,7 -348,7 +348,7 @@@ endi
  ifeq ($(SOC),exynos)
  LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
  endif
- ifeq ($(SOC),tegra20)
+ ifneq ($(CONFIG_TEGRA),)
  LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
  LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o
  LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o
@@@ -413,7 -413,7 +413,7 @@@ ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$
  ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
  
  # enable combined SPL/u-boot/dtb rules for tegra
- ifeq ($(SOC),tegra20)
+ ifneq ($(CONFIG_TEGRA),)
  ifeq ($(CONFIG_OF_SEPARATE),y)
  ALL-y += $(obj)u-boot-dtb-tegra.bin
  else
@@@ -467,9 -467,8 +467,8 @@@ $(obj)u-boot.img:  $(obj)u-boot.bi
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
  
- $(obj)u-boot.imx:       $(obj)u-boot.bin
-               $(obj)tools/mkimage -n  $(CONFIG_IMX_CONFIG) -T imximage \
-               -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
+ $(OBJTREE)/u-boot.imx : $(obj)u-boot.bin $(SUBDIR_TOOLS) depend
+               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
  
  $(obj)u-boot.kwb:       $(obj)u-boot.bin
                $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
@@@ -486,12 -485,8 +485,12 @@@ $(obj)u-boot.sha1:       $(obj)u-boot.bi
  $(obj)u-boot.dis:     $(obj)u-boot
                $(OBJDUMP) -d $< > $@
  
 +
 +
  $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 -              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
 +              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(or $(CONFIG_SPL_PAD_TO),0) \
 +                      -O binary $(obj)spl/u-boot-spl \
 +                      $(obj)spl/u-boot-spl-pad.bin
                cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
                rm $(obj)spl/u-boot-spl-pad.bin
  
@@@ -512,6 -507,7 +511,7 @@@ $(obj)u-boot.ais:       $(obj)spl/u-boo
                        $(obj)u-boot.ais
  
  # Specify the target for use in elftosb call
+ ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
  ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
  
  $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
@@@ -534,7 -530,7 +534,7 @@@ $(obj)u-boot.spr:  $(obj)u-boot.img $(ob
                        conv=notrunc 2>/dev/null
                cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@
  
- ifeq ($(SOC),tegra20)
+ ifneq ($(CONFIG_TEGRA),)
  ifeq ($(CONFIG_OF_SEPARATE),y)
  nodtb=dtb
  dtbfile=$(obj)u-boot.dtb
@@@ -847,7 -843,8 +847,8 @@@ clean
        @$(MAKE) -s -C doc/DocBook/ cleandocs
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \
-               -o -name '*.o'  -o -name '*.a' -o -name '*.exe' \) -print \
+               -o -name '*.o'  -o -name '*.a' -o -name '*.exe' \
+               -o -name '*.cfgtmp' \) -print \
                | xargs rm -f
  
  # Removes everything not needed for testing u-boot

diff --combined boards.cfg
index 98f7a14d1e6799ea1bb4143a111a77d000c0d914,0507a9cee546a0f0ab759c735279bfaf3a675060..cd220af6e2ca04742fcef8c4546264205a8c3840
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -191,7 -191,9 +191,9 @@@ tx25                         ar
  zmx25                        arm         arm926ejs   zmx25               syteco         mx25
  imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
  magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
+ mx23_olinuxino               arm         arm926ejs   mx23_olinuxino      olimex         mxs           mx23_olinuxino
  apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs           apx4devkit
+ mx23evk                      arm         arm926ejs   mx23evk             freescale      mxs           mx23evk
  m28evk                       arm         arm926ejs   m28evk              denx           mxs           m28evk
  mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk
  sc_sps_1                     arm         arm926ejs   sc_sps_1            schulercontrol mxs
@@@ -236,6 -238,7 +238,7 @@@ am335x_evm_uart2             ar
  am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=4
  am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
  am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
+ pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
  highbank                     arm         armv7       highbank            -              highbank
  mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
  mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
@@@ -255,10 -258,10 +258,10 @@@ cm_t35                       ar
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
  dig297                       arm         armv7       dig297              comelit        omap3
- igep0020                     arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND
- igep0020_nand                arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND
- igep0030                     arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
- igep0030_nand                arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND
+ igep0020                     arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND
+ igep0020_nand                arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND
+ igep0030                     arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
+ igep0030_nand                arm         armv7       igep00x0            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND
  am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
  mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
  omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
@@@ -290,6 -293,8 +293,8 @@@ harmony                      ar
  seaboard                     arm         armv7:arm720t seaboard          nvidia         tegra20
  ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
  whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
+ cardhu                       arm         armv7:arm720t cardhu            nvidia         tegra30
+ dalmore                      arm         armv7:arm720t dalmore           nvidia         tegra114
  colibri_t20_iris             arm         armv7:arm720t colibri_t20_iris  toradex        tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
  snowball                     arm         armv7       snowball               st-ericsson    u8500
@@@ -661,8 -666,8 +666,8 @@@ vme8349                      powerp
  MPC8308RDB                   powerpc     mpc83xx     mpc8308rdb          freescale
  MPC8313ERDB_33               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ
  MPC8313ERDB_66               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ
 -MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT
 -MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT
 +MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND
 +MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND
  MPC8315ERDB                  powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB
  MPC8315ERDB_NAND             powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB:NAND_U_BOOT
  MPC8323ERDB                  powerpc     mpc83xx     mpc8323erdb         freescale
@@@ -856,24 -861,12 +861,24 @@@ P5020DS_SPIFLASH             powerpc     mpc85
  P5020DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P5040DS                      powerpc     mpc85xx     corenet_ds          freescale
  BSC9131RDB_SPIFLASH          powerpc     mpc85xx     bsc9131rdb          freescale      -           BSC9131RDB:BSC9131RDB,SPIFLASH
 +BSC9132QDS_NOR_DDRCLK100     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_100
 +BSC9132QDS_NOR_DDRCLK133     powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_133
 +BSC9132QDS_SDCARD_DDRCLK100  powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100
 +BSC9132QDS_SDCARD_DDRCLK133  powerpc     mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133
 +BSC9132QDS_SPIFLASH_DDRCLK100 powerpc    mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100
 +BSC9132QDS_SPIFLASH_DDRCLK133 powerpc    mpc85xx     bsc9132qds          freescale      -           BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133
  stxgp3                       powerpc     mpc85xx     stxgp3              stx
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
  T4240QDS                     powerpc     mpc85xx     t4qds               freescale
  T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +B4860QDS                     powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860
 +B4860QDS_NAND              powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4860,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
 +B4860QDS_SPIFLASH            powerpc     mpc85xx     b4860qds            freescale    -           B4860QDS:PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
 +B4420QDS                     powerpc     mpc85xx     b4860qds            freescale    -           B4860QDS:PPC_B4420
 +B4420QDS_NAND              powerpc     mpc85xx     b4860qds            freescale      -           B4860QDS:PPC_B4420,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
 +B4420QDS_SPIFLASH            powerpc     mpc85xx     b4860qds            freescale    -           B4860QDS:PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  xpedite520x                  powerpc     mpc85xx     -                   xes
  xpedite537x                  powerpc     mpc85xx     -                   xes
  xpedite550x                  powerpc     mpc85xx     -                   xes

diff --combined include/configs/igep00x0.h
index e59f41eccdc90acd989b3248b9bafab1a49723cc,f1d6c6a193e5f73914f41287aa089ba3b3b6b664..0e7f9247c8fd6da4d20fd99cf43f00891ea2f44c
--- 1/include/configs/igep00x0.h
--- 2/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@@ -85,6 -85,9 +85,9 @@@
  #define CONFIG_OMAP_HSMMC             1
  #define CONFIG_DOS_PARTITION          1
  
+ /* define to enable boot progress via leds */
+ #define CONFIG_SHOW_BOOT_PROGRESS
+ 
  /* USB */
  #define CONFIG_MUSB_UDC                       1
  #define CONFIG_USB_OMAP3              1
@@@ -115,7 -118,9 +118,9 @@@
  #ifdef CONFIG_BOOT_NAND
  #define CONFIG_CMD_NAND
  #endif
+ #if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020)
  #define CONFIG_CMD_NET                /* bootp, tftpboot, rarpboot    */
+ #endif
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_NFS                /* NFS support                  */
@@@ -129,6 -134,8 +134,6 @@@
  #define CONFIG_HARD_I2C                       1
  #define CONFIG_SYS_I2C_SPEED          100000
  #define CONFIG_SYS_I2C_SLAVE          1
 -#define CONFIG_SYS_I2C_BUS            0
 -#define CONFIG_SYS_I2C_BUS_SELECT     1
  #define CONFIG_DRIVER_OMAP34XX_I2C    1
  
  /*

diff --combined include/configs/omap4_common.h
index ca4e724e8d3dc0a85a7d14facf32f65747cac77d,dfdfea95eb8b70ca4d833a8811ae1eab7a3d883a..180cb24f388293b4161e9a1f007689eba0bb4e4b
--- 1/include/configs/omap4_common.h
--- 2/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@@ -91,6 -91,8 +91,6 @@@
  #define CONFIG_HARD_I2C                       1
  #define CONFIG_SYS_I2C_SPEED          100000
  #define CONFIG_SYS_I2C_SLAVE          1
 -#define CONFIG_SYS_I2C_BUS            0
 -#define CONFIG_SYS_I2C_BUS_SELECT     1
  #define CONFIG_DRIVER_OMAP34XX_I2C    1
  #define CONFIG_I2C_MULTI_BUS          1
  
@@@ -157,6 -159,9 +157,9 @@@
        "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
        "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
                "source ${loadaddr}\0" \
+       "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+       "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
+               "env import -t ${loadaddr} ${filesize}\0" \
        "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
        "mmcboot=echo Booting from mmc${mmcdev} ...; " \
                "run mmcargs; " \
@@@ -164,12 -169,20 +167,20 @@@
  
  #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev}; if mmc rescan; then " \
+               "echo SD/MMC found on device ${mmcdev};" \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \
-                       "if run loaduimage; then " \
-                               "run mmcboot; " \
-                       "fi; " \
+                       "if run loadbootenv; then " \
+                               "run importbootenv; " \
+                       "fi;" \
+                       "if test -n ${uenvcmd}; then " \
+                               "echo Running uenvcmd ...;" \
+                               "run uenvcmd;" \
+                       "fi;" \
+               "fi;" \
+               "if run loaduimage; then " \
+                       "run mmcboot; " \
                "fi; " \
        "fi"
  

diff --combined include/configs/sc_sps_1.h
index f807a61c73d2fc6027147ecb6a096e406420e0a2,21c76b52743a08d083375a42c520cd01a1c2517e..decf8d9dec855aeef9408cc1905c0ed91be90bcb
--- 1/include/configs/sc_sps_1.h
--- 2/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@@ -158,8 -158,8 +158,7 @@@
  #ifdef CONFIG_CMD_NET
  #define CONFIG_ETHPRIME                       "FEC0"
  #define CONFIG_FEC_MXC
- #define CONFIG_FEC_MXC_MULTI
  #define CONFIG_MII
 -#define CONFIG_DISCOVER_PHY
  #define CONFIG_FEC_XCV_TYPE           RMII
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_SMSC