Merge git://git.denx.de/u-boot

diff --combined MAINTAINERS
index 311c0e7fb637d44466d199f286ddc8d5b82bd9bc,c43057484c2fc01c1e830bb0bff0a3060edf50bc..e34d9f3ec36811ae170b10c7397da604e4379f2b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -104,8 -104,6 +104,6 @@@ Wolfgang Denk <wd@denx.de
  
        ARIA            MPC5121e
  
-       AMX860          MPC860
-       ETX094          MPC850
        FPS850L         MPC850
        FPS860L         MPC860
        ICU862          MPC862
@@@ -116,7 -114,6 +114,6 @@@
        IVMS8           MPC860
        IVMS8_128       MPC860
        IVMS8_256       MPC860
-       LANTEC          MPC850
        LWMON           MPC823
        R360MPI         MPC823
        RRvision        MPC823
@@@ -128,7 -125,6 +125,6 @@@
        TQM855L         MPC855
        TQM860L         MPC860
        TQM860L_FEC     MPC860
-       c2mon           MPC855
        hermes          MPC860
        lwmon           MPC823
  
@@@ -214,9 -210,7 +210,7 @@@ Siddarth Gore <gores@marvell.com
  Paul Gortmaker <paul.gortmaker@windriver.com>
  
        sbc8349         MPC8349
-       sbc8540         MPC8540
        sbc8548         MPC8548
-       sbc8560         MPC8560
        sbc8641d        MPC8641D
  
  Frank Gottschling <fgottschling@eltec.de>
@@@ -229,7 -223,6 +223,6 @@@ Wolfgang Grandegger <wg@denx.de
  
        PN62            MPC8240
        IPHASE4539      MPC8260
-       SCM             MPC8260
  
  Anatolij Gustschin <agust@denx.de>
  
@@@ -545,7 -538,6 +538,6 @@@ Unknown / orphaned boards
        FADS850SAR      MPC8xx
        FADS860T        MPC8xx
        GENIETV         MPC8xx
-       IAD210          MPC8xx
        MBX             MPC8xx
        MBX860T         MPC8xx
        NX823           MPC8xx
@@@ -573,6 -565,10 +565,10 @@@ Albert ARIBAUD <albert.u.boot@aribaud.n
  
        edminiv2        ARM926EJS (Orion5x SoC)
  
+ Raphael Assenat <raph@8d.com>
+ 
+       eco5pk          ARM ARMV7 (AM35x SoC)
+ 
  Stefano Babic <sbabic@denx.de>
  
        ea20            davinci
@@@ -584,8 -580,11 +580,12 @@@
        trizepsiv       xscale/pxa
        twister         omap3
        vision2         i.MX51
 +      woodburn        i.MX35
  
+ Lukasz Dalek <luk0104@gmail.com>
+ 
+       h2200           xscale/pxa
+ 
  Jason Liu <r64343@freescale.com>
  
        mx53evk         i.MX53
@@@ -901,6 -900,10 +901,10 @@@ Michal Simek <monstr@monstr.eu
  
        zynq            ARM ARMV7 (Zynq SoC)
  
+ Lucas Stach <dev@lynxeye.de>
+ 
+       colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
+ 
  Nick Thompson <nick.thompson@gefanuc.com>
  
        da830evm        ARM926EJS (DA830/OMAP-L137)
@@@ -1010,6 -1013,10 +1014,10 @@@ Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj
  
        armadillo-800eva        R8A7740 (RMOBILE SoC)
  
+ Pali Rohár <pali.rohar@gmail.com>
+ 
+       nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
+ 
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --combined Makefile
index 249b109c32a76e4576d2b439cc0ce280532d2a28,9dc89f938c56954dda780ed675160501a23fa6c0..4fc6a82f79a94d0375c53a81e303d799fa9f5c35
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -21,10 -21,10 +21,10 @@@
  # MA 02111-1307 USA
  #
  
- VERSION = 2012
- PATCHLEVEL = 10
+ VERSION = 2013
+ PATCHLEVEL = 01
  SUBLEVEL =
- EXTRAVERSION =
+ EXTRAVERSION = -rc1
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -260,7 -260,9 +260,9 @@@ LIBS-y += drivers/net/npe/libnpe.
  endif
  LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
  LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
- LIBS-y += fs/cramfs/libcramfs.o \
+ LIBS-y += fs/libfs.o \
+       fs/cbfs/libcbfs.o \
+       fs/cramfs/libcramfs.o \
        fs/ext4/libext4fs.o \
        fs/fat/libfat.o \
        fs/fdos/libfdos.o \
@@@ -514,17 -516,18 +516,18 @@@ $(obj)u-boot.spr:       $(obj)u-boot.img $(ob
  
  ifeq ($(SOC),tegra20)
  ifeq ($(CONFIG_OF_SEPARATE),y)
- $(obj)u-boot-dtb-tegra.bin:   $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot.dtb
-               $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -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 $(obj)u-boot.dtb > $@
-               rm $(obj)spl/u-boot-spl-pad.bin
+ nodtb=dtb
+ dtbfile=$(obj)u-boot.dtb
  else
- $(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+ nodtb=nodtb
+ dtbfile=
+ endif
+ 
+ $(obj)u-boot-$(nodtb)-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(dtbfile)
                $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -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 > $@
+               cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(dtbfile) > $@
                rm $(obj)spl/u-boot-spl-pad.bin
  endif
- endif
  
  ifeq ($(CONFIG_SANDBOX),y)
  GEN_UBOOT = \
@@@ -533,9 -536,10 +536,10 @@@
                        $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
  else
  GEN_UBOOT = \
-               UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
-               sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
-               cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \
+               UNDEF_LST=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
+               sed  -n -e 's/.*\($(SYM_PREFIX)_u_boot_list_.*\)/-u\1/p'|sort|uniq`;\
+               cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \
+                       $$UNDEF_LST $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
  endif
@@@ -568,8 -572,12 +572,12 @@@ $(SUBDIR_EXAMPLES): $(obj)u-boo
  $(LDSCRIPT):  depend
                $(MAKE) -C $(dir $@) $(notdir $@)
  
- $(obj)u-boot.lds: $(LDSCRIPT)
-               $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+ # The following line expands into whole rule which generates u-boot.lst,
+ # the file containing u-boots LG-array linker section. This is included into
+ # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
+ $(eval $(call make_u_boot_list, $(obj)include/u-boot.lst, $(LIBBOARD) $(LIBS)))
+ $(obj)u-boot.lds: $(LDSCRIPT) $(obj)include/u-boot.lst
+               $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
  
  nand_spl:     $(TIMESTAMP_FILE) $(VERSION_FILE) depend
                $(MAKE) -C nand_spl/board/$(BOARDDIR) all
@@@ -748,20 -756,6 +756,6 @@@ $(obj).boards.depend:     boards.cf
  lcname        = $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
  ucname        = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
  
- #========================================================================
- # ARM
- #========================================================================
- 
- SX1_stdout_serial_config \
- SX1_config:           unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _stdout_serial_, $@)" ] ; then \
-               echo "#undef CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
-       else \
-               echo "#define CONFIG_STDOUT_USBTTY" >> $(obj)include/config.h ; \
-       fi;
-       @$(MKCONFIG) -n $@ SX1 arm arm925t sx1
- 
  #########################################################################
  ## ARM1176 Systems
  #########################################################################
@@@ -808,6 -802,7 +802,7 @@@ clean
               $(obj)board/matrix_vision/*/bootscript.img                 \
               $(obj)board/voiceblue/eeprom                               \
               $(obj)u-boot.lds                                           \
+              $(obj)include/u-boot.lst                                   \
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
               $(obj)arch/blackfin/cpu/init.{lds,elf}
        @rm -f $(obj)include/bmp_logo.h
@@@ -841,10 -836,11 +836,12 @@@ clobber:        tid
        @rm -f $(obj)u-boot.dtb
        @rm -f $(obj)u-boot.sb
        @rm -f $(obj)u-boot.spr
-       @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
-       @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
+       @rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
+       @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
+       @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map}
+       @rm -f $(obj)spl/{u-boot-spl.lds,u-boot.lst}
        @rm -f $(obj)MLO
 +      @rm -f $(obj)SPL
        @rm -f $(obj)tools/xway-swap-bytes
        @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c

diff --combined board/freescale/mx31ads/u-boot.lds
index 91ffdbefd1310729cae71094b1c12b875fc1389e,29ad0e6e79c94b856d669ebb3d24b44c0427ee34..52677299e889a384a32ecc0d1de1c77be6222473
--- 1/board/freescale/mx31ads/u-boot.lds
--- 2/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@@ -57,14 -57,14 +57,16 @@@ SECTION
        }
  
        . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       __u_boot_cmd_end = .;
+ 
+       . = ALIGN(4);
+       .u_boot_list : {
+       #include <u-boot.lst>
+       }
  
        . = ALIGN(4);
  
 +      __image_copy_end = .;
 +
        .rel.dyn : {
                __rel_dyn_start = .;
                *(.rel*)

diff --combined boards.cfg
index 04ecdeb4df49c8e2a23df10e84c09257bb1bae34,4dd989383c28af863d2ebcb876fc13553931c6c4..6f21af08215687ec8d24d567d1153bba5cc4abe9
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -50,8 -50,6 +50,8 @@@ tt01                         ar
  imx31_litekit                arm         arm1136     -                   logicpd        mx31
  flea3                        arm         arm1136     -                   CarMediaLab    mx35
  mx35pdk                      arm         arm1136     -                   freescale      mx35
 +woodburn                     arm         arm1136     -                   -              mx35
 +woodburn_sd                  arm         arm1136     woodburn            -              mx35        woodburn_sd:IMX_CONFIG=board/woodburn/imximage.cfg
  omap2420h4                   arm         arm1136     -                   ti             omap24xx
  tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
  rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
@@@ -227,7 -225,12 +227,12 @@@ versatileqemu                ar
  integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
  integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
- am335x_evm                   arm         armv7       am335x              ti             am33xx
+ am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
+ am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
+ am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL3,CONS_INDEX=3
+ 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
  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
@@@ -242,6 -245,7 +247,7 @@@ mx6qarm2                     ar
  mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg
  mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
  mx6qsabresd                  arm         armv7       mx6qsabresd         freescale      mx6           mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+ eco5pk                       arm         armv7       eco5pk              8dtech         omap3
  cm_t35                       arm         armv7       cm_t35              -              omap3
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
@@@ -266,6 -270,7 +272,7 @@@ devkit8000                   ar
  mcx                          arm         armv7       mcx                 htkw           omap3
  tricorder                    arm         armv7       tricorder           corscience     omap3
  twister                      arm         armv7       twister             technexion     omap3
+ nokia_rx51                   arm         armv7       rx51                nokia          omap3
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
  omap5_evm                    arm         armv7       omap5_evm           ti           omap5
@@@ -280,6 -285,7 +287,7 @@@ harmony                      ar
  seaboard                     arm         armv7:arm720t seaboard          nvidia         tegra20
  ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
  whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
+ 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
  kzm9g                        arm         armv7       kzm9g               kmc            rmobile
@@@ -297,6 -303,7 +305,7 @@@ dvlhost                      ar
  pdnb3                        arm         ixp         pdnb3               prodrive
  scpu                         arm         ixp         pdnb3               prodrive       -           pdnb3:SCPU
  balloon3                     arm         pxa
+ h2200                        arm         pxa
  lubbock                      arm         pxa
  palmld                       arm         pxa
  palmtc                       arm         pxa
@@@ -381,6 -388,12 +390,12 @@@ M53017EVB                    m68
  M5329AFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=0
  M5329BFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=16
  M5373EVB                     m68k        mcf532x     m5373evb            freescale      -           M5373EVB:NANDFLASH_SIZE=16
+ M54418TWR                    m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
+ M54418TWR_nand_mii           m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000
+ M54418TWR_nand_rmii          m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
+ M54418TWR_nand_rmii_lowfreq  m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
+ M54418TWR_serial_mii         m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000
+ M54418TWR_serial_rmii        m68k        mcf5445x    m54418twr           freescale      -           M54418TWR:CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000
  M54451EVB                    m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000
  M54451EVB_stmicro            m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000
  M54455EVB                    m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333
@@@ -406,6 -419,8 +421,8 @@@ M5485HFE                m68k        mcf547x_8x  
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
  qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
  qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
+ qemu_mips64                  mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_BIG_ENDIAN
+ qemu_mips64el                mips        mips64      qemu-mips           -              -           qemu-mips64:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -546,7 -561,6 +563,6 @@@ Alaska8220                   powerp
  sorcery                      powerpc     mpc8220
  Yukon8220                    powerpc     mpc8220     alaska
  A3000                        powerpc     mpc824x     a3000
- BMW                          powerpc     mpc824x     bmw
  CPC45                        powerpc     mpc824x     cpc45               -              -           CPC45
  CPC45_ROMBOOT                powerpc     mpc824x     cpc45               -              -           CPC45:BOOT_ROM
  CU824                        powerpc     mpc824x     cu824
@@@ -619,7 -633,6 +635,6 @@@ PQ2FADS-ZU_lowboot           powerp
  VoVPN-GW_66MHz               powerpc     mpc8260     vovpn-gw            funkwerk       -           VoVPN-GW:CLKIN_66MHz
  mgcoge                       powerpc     mpc8260     km82xx              keymile        -           km82xx:MGCOGE
  mgcoge3ne                    powerpc     mpc8260     km82xx              keymile        -           km82xx:MGCOGE3NE
- SCM                          powerpc     mpc8260     -                   siemens
  TQM8255_AA                   powerpc     mpc8260     tqm8260             tqc            -           TQM8260:MPC8255,300MHz
  TQM8260_AA                   powerpc     mpc8260     tqm8260             tqc            -           TQM8260:MPC8260,200MHz
  TQM8260_AB                   powerpc     mpc8260     tqm8260             tqc            -           TQM8260:MPC8260,200MHz,L2_CACHE,BUSMODE_60x
@@@ -679,21 -692,16 +694,16 @@@ MVBLM7                       powerp
  SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
  SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_SP
  TQM834x                      powerpc     mpc83xx     tqm834x             tqc
- suvd3                        powerpc     mpc83xx     km83xx              keymile
+ suvd3                        powerpc     mpc83xx     km83xx              keymile        -           suvd3:SUVD3
+ kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
  tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
  tuxx1                        powerpc     mpc83xx     km83xx              keymile
  kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
- sbc8540                      powerpc     mpc85xx     sbc8560             -              -           SBC8540
- sbc8540_33                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
- sbc8540_66                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
  sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
  sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
  sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE
  sbc8548_PCI_66               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66
  sbc8548_PCI_66_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,66,PCIE
- sbc8560                      powerpc     mpc85xx     sbc8560             -              -           sbc8560
- sbc8560_33                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
- sbc8560_66                   powerpc     mpc85xx     sbc8560             -              -           sbc8560
  socrates                     powerpc     mpc85xx     socrates
  HWW1U1A                      powerpc     mpc85xx     hww1u1a             exmeritus
  MPC8536DS                    powerpc     mpc85xx     mpc8536ds           freescale      -           MPC8536DS
@@@ -844,6 -852,9 +854,9 @@@ BSC9131RDB_SPIFLASH          powerp
  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
  xpedite520x                  powerpc     mpc85xx     -                   xes
  xpedite537x                  powerpc     mpc85xx     -                   xes
  xpedite550x                  powerpc     mpc85xx     -                   xes
@@@ -857,11 -868,8 +870,8 @@@ Adder87x                     powerp
  AdderII                      powerpc     mpc8xx      adder               -              -           Adder:MPC852T
  AdderUSB                     powerpc     mpc8xx      adder               -              -           Adder
  ADS860                       powerpc     mpc8xx      fads
- c2mon                        powerpc     mpc8xx
  cogent_mpc8xx                powerpc     mpc8xx      cogent
- EP88x                        powerpc     mpc8xx      ep88x
  ESTEEM192E                   powerpc     mpc8xx      esteem192e
- ETX094                       powerpc     mpc8xx      etx094
  FADS823                      powerpc     mpc8xx      fads
  FADS850SAR                   powerpc     mpc8xx      fads
  FADS860T                     powerpc     mpc8xx      fads
@@@ -879,7 -887,6 +889,6 @@@ IVML24_256                   powerp
  IVMS8                        powerpc     mpc8xx      ivm                 -              -           IVMS8:IVMS8_16M
  IVMS8_128                    powerpc     mpc8xx      ivm                 -              -           IVMS8:IVMS8_32M
  IVMS8_256                    powerpc     mpc8xx      ivm                 -              -           IVMS8:IVMS8_64M
- LANTEC                       powerpc     mpc8xx      lantec
  lwmon                        powerpc     mpc8xx
  MBX                          powerpc     mpc8xx      mbx8xx
  MBX860T                      powerpc     mpc8xx      mbx8xx
@@@ -926,7 -933,6 +935,6 @@@ KUP4K                        powerp
  KUP4X                        powerpc     mpc8xx      kup4x               kup
  ELPT860                      powerpc     mpc8xx      elpt860             LEOX
  uc100                        powerpc     mpc8xx      -                   manroland
- IAD210                       powerpc     mpc8xx      -                   siemens
  QS823                        powerpc     mpc8xx      qs850               snmc
  QS850                        powerpc     mpc8xx      qs850               snmc
  QS860T                       powerpc     mpc8xx      qs860t              snmc
@@@ -952,7 -958,6 +960,6 @@@ TQM885D                      powerp
  TTTech                       powerpc     mpc8xx      tqm8xx              tqc            -           TQM823L:LCD,SHARP_LQ104V7DS01
  virtlab2                     powerpc     mpc8xx      tqm8xx              tqc
  wtk                          powerpc     mpc8xx      tqm8xx              tqc            -           TQM823L:LCD,SHARP_LQ065T9DR51U
- AMX860                       powerpc     mpc8xx      amx860              westel
  csb272                       powerpc     ppc4xx
  csb472                       powerpc     ppc4xx
  G2000                        powerpc     ppc4xx      g2000

diff --combined include/configs/mx51evk.h
index 8cf59fe87555c767ae2bc9cccb59e7035c2d34f3,225d359ecb762d8568a42b17239ff80644374178..89feaed7dd78c0a050e2d906583834299448f2fd
--- 1/include/configs/mx51evk.h
--- 2/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@@ -144,7 -144,7 +144,7 @@@
   ***********************************************************/
  
  #include <config_cmd_default.h>
 -
 +#define CONFIG_CMD_BOOTZ
  #undef CONFIG_CMD_IMLS
  
  #define CONFIG_CMD_DATE
@@@ -181,7 -181,7 +181,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
-       "if mmc rescan ${mmcdev}; then " \
+       "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \

diff --combined include/configs/mx53evk.h
index 0955fda1bc9e066ab35b07e808d4456281e60edd,d1f684cbc5c1c7ee17203a75fce12dfccf863f84..c472075c9adcf9189b85efe02360b0f670b41c44
--- 1/include/configs/mx53evk.h
--- 2/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@@ -59,7 -59,6 +59,7 @@@
  #define CONFIG_PMIC_I2C
  #define CONFIG_PMIC_FSL
  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR    8
 +#define CONFIG_PMIC_FSL_MC13892
  #define CONFIG_RTC_MC13XXX
  
  /* MMC Configs */
@@@ -132,7 -131,7 +132,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
-       "if mmc rescan ${mmcdev}; then " \
+       "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \

diff --combined include/configs/mx53loco.h
index f2384f30bc61ead7a3aafa14e44fb6846e05e835,a1b27cef53569f9e9781ddc711ecfd9bfd0ae3d6..a62ea7859900d1a9da98eb3849d06b06b8ea4bad
--- 1/include/configs/mx53loco.h
--- 2/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@@ -93,7 -93,6 +93,7 @@@
  #define CONFIG_PMIC_I2C
  #define CONFIG_DIALOG_PMIC
  #define CONFIG_PMIC_FSL
 +#define CONFIG_PMIC_FSL_MC13892
  #define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR       0x48
  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR  0x8
  
@@@ -104,7 -103,6 +104,7 @@@
  
  /* Command definition */
  #include <config_cmd_default.h>
 +#define CONFIG_CMD_BOOTZ
  
  #undef CONFIG_CMD_IMLS
  
@@@ -141,7 -139,7 +141,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
-       "if mmc rescan ${mmcdev}; then " \
+       "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \

diff --combined nand_spl/board/freescale/mx31pdk/u-boot.lds
index a130a1f9df7374a372f1baa29f6a9dfdd9371e56,da49c100c5c13845fa17c110f110b18fcfad8c95..a26110f393d8c452c3746eed59b28c5c621fdb38
--- 1/nand_spl/board/freescale/mx31pdk/u-boot.lds
--- 2/nand_spl/board/freescale/mx31pdk/u-boot.lds
+++ b/nand_spl/board/freescale/mx31pdk/u-boot.lds
@@@ -46,14 -46,14 +46,16 @@@ SECTION
        }
  
        . = ALIGN(4);
-       __u_boot_cmd_start = .;
-       .u_boot_cmd : { *(.u_boot_cmd) }
-       __u_boot_cmd_end = .;
+ 
+       . = ALIGN(4);
+       .u_boot_list : {
+               #include <u-boot.lst>
+       }
  
        . = ALIGN(4);
  
 +      __image_copy_end = .;
 +
        .rel.dyn : {
                __rel_dyn_start = .;
                *(.rel*)

diff --combined spl/Makefile
index 58ef40ac0140c0668317d1eeaa3f11b4d0978c0d,3195390b2ff63e1bd1419d0918d2ac726a0673cd..6a79c3cd38f052079106271a109c288c0d574665
--- 1/spl/Makefile
--- 2/spl/Makefile
+++ b/spl/Makefile
@@@ -112,23 -112,14 +112,20 @@@ LDPPFLAGS += 
        $(shell $(LD) --version | \
          sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
  
- ifdef CONFIG_OMAP
  $(OBJTREE)/MLO:       $(obj)u-boot-spl.bin
        $(OBJTREE)/tools/mkimage -T omapimage \
                -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
- endif
- ifdef CONFIG_AM33XX
- $(OBJTREE)/MLO:       $(obj)u-boot-spl.bin
-       $(OBJTREE)/tools/mkimage -T omapimage \
+ 
+ $(OBJTREE)/MLO.byteswap: $(obj)u-boot-spl.bin
+       $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
                -a $(CONFIG_SPL_TEXT_BASE) -d $< $@
- endif
  
 +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
 +
  ALL-y += $(obj)u-boot-spl.bin
  
  ifdef CONFIG_SAMSUNG
@@@ -160,8 -151,12 +157,12 @@@ $(START):        depen
  $(LIBS):      depend
        $(MAKE) -C $(SRCTREE)$(dir $(subst $(SPLTREE),,$@))
  
- $(obj)u-boot-spl.lds: $(LDSCRIPT) depend
-       $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - < $< > $@
+ # The following line expands into whole rule which generates u-boot.lst,
+ # the file containing u-boots LG-array linker section. This is included into
+ # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
+ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS)))
+ $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend
+       $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
  
  depend:       $(obj).depend
  .PHONY: depend