Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

diff --combined Makefile
index ff72deb831a2dc77c9d4dcef19d4716b999bdf48,f4a9b336bd92f3120a49552c9ecac6a24c6624a5..107ee4f909af8c65a4ac738a7ccc7a5d90a9df44
--- 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 \
@@@ -508,6 -507,7 +507,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
@@@ -530,7 -530,7 +530,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
@@@ -843,7 -843,8 +843,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 b519bc496500f5c6bbcb7327510abfc0f1c188d8,7d03620e4f9cb7de17e23988c92edf4d579e9a95..787615aa571b0ae1765ed3690e586fd76c22eb8b
--- 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
@@@ -290,7 -292,6 +292,7 @@@ 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
  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

diff --combined spl/Makefile
index 842f15455691a9fd00233609f0e943684f1b8969,d8efad0290c3af1a2ddd36e86883e96b48fc2034..101d478c669a30284dbfec99102fb36a9993e8a6
--- 1/spl/Makefile
--- 2/spl/Makefile
+++ b/spl/Makefile
@@@ -86,7 -86,7 +86,7 @@@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34X
  LIBS-y += $(CPUDIR)/omap-common/libomap-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
@@@ -141,11 -141,8 +141,8 @@@ $(OBJTREE)/MLO.byteswap: $(obj)u-boot-s
        $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
                -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
  
- ifneq ($(CONFIG_IMX_CONFIG),)
- $(OBJTREE)/SPL:       $(obj)u-boot-spl.bin
-       $(OBJTREE)/tools/mkimage -n  $(SRCTREE)/$(CONFIG_IMX_CONFIG) -T imximage \
-               -e $(CONFIG_SPL_TEXT_BASE) -d $< $@
- endif
+ $(OBJTREE)/SPL : $(obj)u-boot-spl.bin depend
+               $(MAKE) -C $(SRCTREE)/arch/arm/imx-common $@
  
  ALL-y += $(obj)u-boot-spl.bin