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

Albert's rework of the linker scripts conflicted with Simon's making
everyone use __bss_end.  We also had a minor conflict over
README.scrapyard being added to in mainline and enhanced in
u-boot-arm/master with proper formatting.

Conflicts:
	arch/arm/cpu/ixp/u-boot.lds
	arch/arm/cpu/u-boot.lds
	arch/arm/lib/Makefile
	board/actux1/u-boot.lds
	board/actux2/u-boot.lds
	board/actux3/u-boot.lds
	board/dvlhost/u-boot.lds
	board/freescale/mx31ads/u-boot.lds
	doc/README.scrapyard
	include/configs/tegra-common.h

Build tested for all of ARM and run-time tested on am335x_evm.

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc MAINTAINERS
Simple merge

diff --cc README
Simple merge

diff --cc arch/arm/cpu/arm920t/ep93xx/u-boot.lds
Simple merge

diff --cc arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
Simple merge

diff --cc arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds
Simple merge

diff --cc arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
index 0000000,69f6d48..b6a929f
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
+++ b/arch/arm/cpu/armv7/am33xx/u-boot-spl.lds
@@@ -1,0 -1,67 +1,67 @@@
 -              __bss_end__ = .;
+ /*
+  * (C) Copyright 2002
+  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
+  *
+  * (C) Copyright 2010
+  * Texas Instruments, <www.ti.com>
+  *    Aneesh V <aneesh@ti.com>
+  *
+  * See file CREDITS for list of people who contributed to this
+  * project.
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License as
+  * published by the Free Software Foundation; either version 2 of
+  * the License, or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  * MA 02111-1307 USA
+  */
+ 
+ MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\
+               LENGTH = CONFIG_SPL_MAX_SIZE }
+ MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
+               LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
+ 
+ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+ OUTPUT_ARCH(arm)
+ ENTRY(_start)
+ SECTIONS
+ {
+       .text      :
+       {
+               __start = .;
+               arch/arm/cpu/armv7/start.o      (.text)
+               *(.text*)
+       } >.sram
+ 
+       . = ALIGN(4);
+       .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram
+ 
+       . = ALIGN(4);
+       .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
+ 
+       .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
+       } >.sram
+ 
+       . = ALIGN(4);
+       __image_copy_end = .;
+       _end = .;
+ 
+       .bss :
+       {
+               . = ALIGN(4);
+               __bss_start = .;
+               *(.bss*)
+               . = ALIGN(4);
++              __bss_end = .;
+       } >.sdram
+ }

diff --cc arch/arm/cpu/armv7/omap-common/u-boot-spl.lds
Simple merge

diff --cc arch/arm/cpu/armv7/start.S
Simple merge

diff --cc arch/arm/cpu/ixp/u-boot.lds
index 2c823e1,5e66dd1..8345b55
--- 1/arch/arm/cpu/ixp/u-boot.lds
--- 2/arch/arm/cpu/ixp/u-boot.lds
+++ b/arch/arm/cpu/ixp/u-boot.lds
@@@ -67,11 -67,17 +67,17 @@@ SECTION
  
        _end = .;
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               __bss_end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
+       }
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
        }
  
        /DISCARD/ : { *(.dynstr*) }

diff --cc arch/arm/cpu/u-boot-spl.lds
index 0000000,8321afb..3c0d99c
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@@ -1,0 -1,93 +1,93 @@@
 -              __bss_end__ = .;
+ /*
+  * Copyright (c) 2004-2008 Texas Instruments
+  *
+  * (C) Copyright 2002
+  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
+  *
+  * See file CREDITS for list of people who contributed to this
+  * project.
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License as
+  * published by the Free Software Foundation; either version 2 of
+  * the License, or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  * MA 02111-1307 USA
+  */
+ 
+ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+ OUTPUT_ARCH(arm)
+ ENTRY(_start)
+ SECTIONS
+ {
+       . = 0x00000000;
+ 
+       . = ALIGN(4);
+       .text :
+       {
+               __image_copy_start = .;
+               CPUDIR/start.o (.text*)
+               *(.text*)
+       }
+ 
+       . = ALIGN(4);
+       .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+ 
+       . = ALIGN(4);
+       .data : {
+               *(.data*)
+       }
+ 
+       . = ALIGN(4);
+ 
+       . = .;
+ 
+       __image_copy_end = .;
+ 
+       .rel.dyn : {
+               __rel_dyn_start = .;
+               *(.rel*)
+               __rel_dyn_end = .;
+       }
+ 
+       .dynsym : {
+               __dynsym_start = .;
+               *(.dynsym)
+       }
+ 
+       _end = .;
+ 
+       /*
+        * Deprecated: this MMU section is used by pxa at present but
+        * should not be used by new boards/CPUs.
+        */
+       . = ALIGN(4096);
+       .mmutable : {
+               *(.mmutable)
+       }
+ 
+       .bss __rel_dyn_start (OVERLAY) : {
+               __bss_start = .;
+               *(.bss*)
+                . = ALIGN(4);
 -ASSERT(__bss_end__ < (CONFIG_SPL_TEXT_BASE + CONFIG_SPL_MAX_SIZE), "SPL image too big");
++              __bss_end = .;
+       }
+ 
+       /DISCARD/ : { *(.dynstr*) }
+       /DISCARD/ : { *(.dynamic*) }
+       /DISCARD/ : { *(.plt*) }
+       /DISCARD/ : { *(.interp*) }
+       /DISCARD/ : { *(.gnu*) }
+ }
+ 
+ #if defined(CONFIG_SPL_TEXT_BASE) && defined(CONFIG_SPL_MAX_SIZE)
++ASSERT(__bss_end < (CONFIG_SPL_TEXT_BASE + CONFIG_SPL_MAX_SIZE), "SPL image too big");
+ #endif

diff --cc arch/arm/cpu/u-boot.lds
index b337e7b,d4ad352..3a1083d
--- 1/arch/arm/cpu/u-boot.lds
--- 2/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@@ -81,11 -81,17 +81,18 @@@ SECTION
                *(.mmutable)
        }
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               __bss_end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
+       }
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
        }
  
        /DISCARD/ : { *(.dynstr*) }

diff --cc arch/arm/lib/Makefile
index 24c7e7a,11c2674..6ae161a
--- 1/arch/arm/lib/Makefile
--- 2/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@@ -39,10 -39,8 +39,11 @@@ GLCOBJS     += div0.
  SOBJS-y += crt0.o
  
  ifndef CONFIG_SPL_BUILD
 -COBJS-y += bss.o
 +ifndef CONFIG_SYS_GENERIC_BOARD
  COBJS-y       += board.o
 +endif
++COBJS-y += bss.o
 +
  COBJS-y       += bootm.o
  COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
  SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o

diff --cc arch/arm/lib/bss.c
index 0000000,7c0b154..99eda59
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/lib/bss.c
+++ b/arch/arm/lib/bss.c
@@@ -1,0 -1,39 +1,39 @@@
 -char __bss_end__[0] __attribute__((used, section(".__bss_end__")));
+ /*
+  * Copyright 2013 Albert ARIBAUD <albert.u.boot@aribaud.net>
+  *
+  * See file CREDITS for list of people who contributed to this
+  * project.
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License as
+  * published by the Free Software Foundation; either version 2 of
+  * the License, or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  * MA 02111-1307 USA
+  */
+ 
+ /**
+  * These two symbols are declared in a C file so that the linker
+  * uses R_ARM_RELATIVE relocation, rather than the R_ARM_ABS32 one
+  * it would use if the symbols were defined in the linker file.
+  * Using only R_ARM_RELATIVE relocation ensures that references to
+  * the symbols are correct after as well as before relocation.
+  *
+  * We need a 0-byte-size type for these symbols, and the compiler
+  * does not allow defining objects of C type 'void'. Using an empty
+  * struct is allowed by the compiler, but causes gcc versions 4.4 and
+  * below to complain about aliasing. Therefore we use the next best
+  * thing: zero-sized arrays, which are both 0-byte-size and exempt from
+  * aliasing warnings.
+  */
+ 
+ char __bss_start[0] __attribute__((used, section(".__bss_start")));
++char __bss_end[0] __attribute__((used, section(".__bss_end")));

diff --cc arch/avr32/cpu/u-boot.lds
Simple merge

diff --cc arch/nds32/cpu/n1213/u-boot.lds
Simple merge

diff --cc arch/nios2/cpu/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/74xx_7xx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc512x/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc5xx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc5xxx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc8220/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc824x/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc8260/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc83xx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc85xx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/mpc86xx/u-boot.lds
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/u-boot.lds
Simple merge

diff --cc arch/sh/cpu/sh2/u-boot.lds
Simple merge

diff --cc arch/sh/cpu/sh3/u-boot.lds
Simple merge

diff --cc arch/sh/cpu/sh4/u-boot.lds
Simple merge

diff --cc arch/x86/cpu/u-boot.lds
Simple merge

diff --cc board/BuS/eb_cpu5282/u-boot.lds
Simple merge

diff --cc board/LEOX/elpt860/u-boot.lds
Simple merge

diff --cc board/RPXClassic/u-boot.lds
Simple merge

diff --cc board/RPXlite/u-boot.lds
Simple merge

diff --cc board/RPXlite_dw/u-boot.lds
Simple merge

diff --cc board/RRvision/u-boot.lds
Simple merge

diff --cc board/actux1/u-boot.lds
index a0d217b,7cf5b46..c76728a
--- 1/board/actux1/u-boot.lds
--- 2/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@@ -72,13 -72,21 +72,21 @@@ SECTION
                *(.dynsym)
        }
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       _end = .;
+ 
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               _end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
        }
-       __bss_end =.;
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
+       }
+ 
        /DISCARD/ : { *(.dynstr*) }
        /DISCARD/ : { *(.dynamic*) }
        /DISCARD/ : { *(.plt*) }

diff --cc board/actux2/u-boot.lds
index da2b4e2,e9b5547..984f70e
--- 1/board/actux2/u-boot.lds
--- 2/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@@ -72,13 -72,21 +72,21 @@@ SECTION
                *(.dynsym)
        }
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       _end = .;
+ 
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               _end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
        }
-       __bss_end =.;
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
+       }
+ 
        /DISCARD/ : { *(.dynstr*) }
        /DISCARD/ : { *(.dynamic*) }
        /DISCARD/ : { *(.plt*) }

diff --cc board/actux3/u-boot.lds
index f922033,b79ea3c..fc48cf0
--- 1/board/actux3/u-boot.lds
--- 2/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@@ -72,13 -72,21 +72,21 @@@ SECTION
                *(.dynsym)
        }
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       _end = .;
+ 
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               _end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
        }
-       __bss_end =.;
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
+       }
+ 
        /DISCARD/ : { *(.dynstr*) }
        /DISCARD/ : { *(.dynamic*) }
        /DISCARD/ : { *(.plt*) }

diff --cc board/adder/u-boot.lds
Simple merge

diff --cc board/ait/cam_enc_4xx/u-boot-spl.lds
Simple merge

diff --cc board/altera/nios2-generic/u-boot.lds
Simple merge

diff --cc board/amcc/acadia/u-boot-nand.lds
Simple merge

diff --cc board/amcc/bamboo/u-boot-nand.lds
Simple merge

diff --cc board/amcc/canyonlands/u-boot-nand.lds
Simple merge

diff --cc board/amcc/kilauea/u-boot-nand.lds
Simple merge

diff --cc board/amcc/sequoia/u-boot-nand.lds
Simple merge

diff --cc board/amcc/sequoia/u-boot-ram.lds
Simple merge

diff --cc board/astro/mcf5373l/u-boot.lds
Simple merge

diff --cc board/cobra5272/u-boot.lds
Simple merge

diff --cc board/cogent/u-boot.lds
Simple merge

diff --cc board/dave/PPChameleonEVB/u-boot.lds
Simple merge

diff --cc board/davinci/da8xxevm/u-boot-spl-da850evm.lds
Simple merge

diff --cc board/davinci/da8xxevm/u-boot-spl-hawk.lds
Simple merge

diff --cc board/dvlhost/u-boot.lds
index ed91003,eb83b6f..b13d3e1
--- 1/board/dvlhost/u-boot.lds
--- 2/board/dvlhost/u-boot.lds
+++ b/board/dvlhost/u-boot.lds
@@@ -72,13 -72,21 +72,21 @@@ SECTION
                *(.dynsym)
        }
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
+       _end = .;
+ 
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
                *(.bss*)
                 . = ALIGN(4);
-               _end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
        }
-       __bss_end =.;
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
+       }
+ 
        /DISCARD/ : { *(.dynstr*) }
        /DISCARD/ : { *(.dynamic*) }
        /DISCARD/ : { *(.plt*) }

diff --cc board/eltec/mhpc/u-boot.lds
Simple merge

diff --cc board/emk/top860/u-boot.lds
Simple merge

diff --cc board/ep88x/u-boot.lds
Simple merge

diff --cc board/esd/dasa_sim/u-boot.lds
Simple merge

diff --cc board/esd/pmc440/u-boot-nand.lds
Simple merge

diff --cc board/esd/tasreg/u-boot.lds
Simple merge

diff --cc board/esteem192e/u-boot.lds
Simple merge

diff --cc board/evb64260/u-boot.lds
Simple merge

diff --cc board/fads/u-boot.lds
Simple merge

diff --cc board/flagadm/u-boot.lds
Simple merge

diff --cc board/freescale/m5208evbe/u-boot.lds
Simple merge

diff --cc board/freescale/m52277evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5235evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5249evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5253demo/u-boot.lds
Simple merge

diff --cc board/freescale/m5253evbe/u-boot.lds
Simple merge

diff --cc board/freescale/m5271evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5272c3/u-boot.lds
Simple merge

diff --cc board/freescale/m5275evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5282evb/u-boot.lds
Simple merge

diff --cc board/freescale/m53017evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5329evb/u-boot.lds
Simple merge

diff --cc board/freescale/m5373evb/u-boot.lds
Simple merge

diff --cc board/freescale/m54418twr/u-boot.lds
Simple merge

diff --cc board/freescale/m54451evb/u-boot.lds
Simple merge

diff --cc board/freescale/m54455evb/u-boot.lds
Simple merge

diff --cc board/freescale/m547xevb/u-boot.lds
Simple merge

diff --cc board/freescale/m548xevb/u-boot.lds
Simple merge

diff --cc board/freescale/mx31ads/u-boot.lds
index 4d1858b,2d08fea..264c4e8
--- 1/board/freescale/mx31ads/u-boot.lds
--- 2/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@@ -80,11 -80,17 +80,17 @@@ SECTION
  
        _end = .;
  
-       .bss __rel_dyn_start (OVERLAY) : {
-               __bss_start = .;
-               *(.bss)
+       .bss_start __rel_dyn_start (OVERLAY) : {
+               KEEP(*(.__bss_start));
+       }
+ 
+       .bss __bss_start (OVERLAY) : {
+               *(.bss*)
                 . = ALIGN(4);
-               __bss_end = .;
 -               ___bssend___ = .;
++               __bss_end = .;
+       }
 -      .bss_end ___bssend___ (OVERLAY) : {
 -              KEEP(*(.__bss_end__));
++      .bss_end __bss_end (OVERLAY) : {
++              KEEP(*(__bss_end));
        }
  
        /DISCARD/ : { *(.bss*) }

diff --cc board/gaisler/gr_cpci_ax2000/u-boot.lds
Simple merge

diff --cc board/gaisler/gr_ep2s60/u-boot.lds
Simple merge

diff --cc board/gaisler/gr_xc3s_1500/u-boot.lds
Simple merge

diff --cc board/gaisler/grsim/u-boot.lds
Simple merge

diff --cc board/gaisler/grsim_leon2/u-boot.lds
Simple merge

diff --cc board/gen860t/u-boot-flashenv.lds
Simple merge

diff --cc board/gen860t/u-boot.lds
Simple merge

diff --cc board/genietv/u-boot.lds
Simple merge

diff --cc board/hermes/u-boot.lds
Simple merge

diff --cc board/hymod/u-boot.lds
Simple merge

diff --cc board/icu862/u-boot.lds
Simple merge

diff --cc board/idmr/u-boot.lds
Simple merge

diff --cc board/ip860/u-boot.lds
Simple merge

diff --cc board/ivm/u-boot.lds
Simple merge

diff --cc board/korat/u-boot-F7FC.lds
Simple merge

diff --cc board/kup/kup4k/u-boot.lds
Simple merge

diff --cc board/kup/kup4x/u-boot.lds
Simple merge

diff --cc board/lwmon/u-boot.lds
Simple merge

diff --cc board/manroland/uc100/u-boot.lds
Simple merge

diff --cc board/matrix_vision/mvsmr/u-boot.lds
Simple merge

diff --cc board/mbx8xx/u-boot.lds
Simple merge

diff --cc board/mousse/u-boot.lds
Simple merge

diff --cc board/mvblue/u-boot.lds
Simple merge

diff --cc board/netphone/u-boot.lds
Simple merge

diff --cc board/netta/u-boot.lds
Simple merge

diff --cc board/netta2/u-boot.lds
Simple merge

diff --cc board/netvia/u-boot.lds
Simple merge

diff --cc board/nx823/u-boot.lds
Simple merge

diff --cc board/quantum/u-boot.lds
Simple merge

diff --cc board/r360mpi/u-boot.lds
Simple merge

diff --cc board/rbc823/u-boot.lds
Simple merge

diff --cc board/renesas/sh7752evb/u-boot.lds
Simple merge

diff --cc board/renesas/sh7757lcr/u-boot.lds
Simple merge

diff --cc board/rsdproto/u-boot.lds
Simple merge

diff --cc board/samsung/smdk5250/smdk5250-uboot-spl.lds
Simple merge

diff --cc board/samsung/smdk6400/u-boot-nand.lds
Simple merge

diff --cc board/sandpoint/u-boot.lds
Simple merge

diff --cc board/sixnet/u-boot.lds
Simple merge

diff --cc board/snmc/qs850/u-boot.lds
Simple merge

diff --cc board/snmc/qs860t/u-boot.lds
Simple merge

diff --cc board/spc1920/u-boot.lds
Simple merge

diff --cc board/spd8xx/u-boot.lds
Simple merge

diff --cc board/stx/stxxtc/u-boot.lds
Simple merge

diff --cc board/svm_sc8xx/u-boot.lds
Simple merge

diff --cc board/tqc/tqm8xx/u-boot.lds
Simple merge

diff --cc board/v37/u-boot.lds
Simple merge

diff --cc board/vpac270/u-boot-spl.lds
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc config.mk
Simple merge

diff --cc doc/README.scrapyard
index 7d73ea0,e9ca96c..189b883
--- 1/doc/README.scrapyard
--- 2/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@@ -9,85 -9,84 +9,86 @@@ maintain a list of such former fellows
  easily if here is something they might want to dig for...
  
  
- Board Arch    CPU     removed     Commit      last known maintainer/contact
- =============================================================================
- AMX860        powerpc mpc860  -         -             Wolfgang Denk <wd@denx.de>
- c2mon powerpc mpc855  -         -             Wolfgang Denk <wd@denx.de>
- ETX094        powerpc mpc850  -         -             Wolfgang Denk <wd@denx.de>
- IAD210        powerpc mpc860  -         -             -
- LANTEC        powerpc mpc850  -         -             Wolfgang Denk <wd@denx.de>
- SCM   powerpc mpc8260 -         -             Wolfgang Grandegger <wg@denx.de>
- SX1   arm     arm925t -         -
- TQM85xx       powerpc MPC85xx d923a5d5  2012-10-04    Stefan Roese <sr@denx.de>
- apollon arm     omap24xx 535c74f  2012-09-18    Kyungmin Park <kyungmin.park@samsung.com>
- tb0229        mips    mips32  3f3110d   2011-12-12
- rmu   powerpc MPC850  fb82fd7   2011-12-07    Wolfgang Denk <wd@denx.de>
- OXC   powerpc MPC8240 309a292   2011-12-07
- BAB7xx        powerpc MPC740/MPC750 c53043b 2011-12-07 Frank Gottschling <fgottschling@eltec.de>
- xm250   arm     pxa     c746cdd   2011-25-11
- pleb2   arm     pxa     b185a1c   2011-25-11
- cradle  arm     pxa     4e24f8a   2011-25-11    Kyle Harris <kharris@nexus-tech.net>
- cerf250 arm     pxa     a3f1241   2011-25-11    Prakash Kumar <prakash@embedx.com>
- mpq101        powerpc mpc85xx e877fab   2011-10-23    Alex Dubov <oakad@yahoo.com>
- ixdpg425 arm  ixp     0ca8eb7   2011-09-22    Stefan Roese <sr@denx.de>
- ixdp425 arm   ixp     0ca8eb7   2011-09-22    Kyle Harris <kharris@nexus-tech.net>
- zylonite arm  pxa     b66521a   2011-09-05
- shannon arm   sa1100  5df092d   2011-09-05    Rolf Offermanns <rof@sysgo.de>
- modnet50 arm  arm720t 9c62815   2011-09-05    Thomas Elste <info@elste.org>
- lpc2292sodimm arm arm720t d1a067a  2011-09-05
- lart  arm     sa1100  3d57573   2011-09-05    Alex Züpke <azu@sysgo.de>
- impa7 arm     arm720t c1f8750   2011-09-05    Marius Gröger <mag@sysgo.de>
- gcplus        arm     sa1100  2c650e2   2011-09-05    George G. Davis <gdavis@mvista.com>
- evb4510       arm     arm720t 26e670e   2011-09-05    Curt Brune <curt@cucy.com>
- ep7312        arm     arm720t c8f63b4   2011-09-05    Marius Gröger <mag@sysgo.de>
- dnp1110       arm     sa1100  fc5e5ce   2011-09-05    Alex Züpke <azu@sysgo.de>
- SMN42 arm     arm720t 6aac646   2011-09-05
- at91rm9200dk arm arm920t 1c85752  2011-07-17
- m501sk        arm     arm920t b1a2bd4   2011-07-17
- kb9202        arm     arm920t 5bd3814   2011-07-17
- csb637        arm     arm920t d14af08   2011-07-17
- cmc_pu2       arm     arm920t 37a9b4d   2011-07-17
- at91cap9adk arm       arm926ejs b550834 2011-07-17    Stelian Pop <stelian@popies.net>
- voiceblue arm arm925t 1b793a4   2011-07-17
- smdk2400 arm  arm920t ad218a8   2011-07-17    Gary Jennejohn <garyj@denx.de>
- sbc2410x arm  arm920t 1f7f0ed   2011-07-17
- netstar       arm     arm925t 6ea2405   2011-07-17
- mx1fs2        arm     arm920t 6962419   2011-07-17
- lpd7a404 arm  lh7a40x 957731e   2011-07-17
- edb9301       arm     arm920t 716f7ad   2011-07-17
- edb9302       arm     arm920t 716f7ad   2011-07-17
- edb9302a arm  arm920t 716f7ad   2011-07-17
- edb9307        arm    arm920t 716f7ad   2011-07-17
- edb9307a arm  arm920t 716f7ad   2011-07-17
- edb9312       arm     arm920t 716f7ad   2011-07-17
- edb9315       arm     arm920t 716f7ad   2011-07-17
- edb9315a arm  arm920t 716f7ad   2011-07-17
- B2    arm     s3c44b0 5dcf536   2011-07-16    Andrea Scian <andrea.scian@dave-tech.it>
- armadillo arm arm720t be28857   2011-07-16    Rowel Atienza <rowel@diwalabs.com>
- assabet       arm     sa1100  c91e90d   2011-07-16    George G. Davis <gdavis@mvista.com>
- trab  arm     S3C2400 566e5cf   2011-05-01    Gary Jennejohn <garyj@denx.de>
- xsengine ARM  PXA2xx  4262a7c   2010-10-20
- wepep250 ARM  PXA2xx  7369478   2010-10-20    Peter Figuli <peposh@etc.sk>
- delta ARM     PXA2xx  75e2035   2010-10-20
- mp2usb        ARM     AT91RM2900  ee986e2 2011-01-25  Eric Bénard <eric@eukrea.com>
- barco powerpc MPC8245 afaa27b   2010-11-23    Marc Leeman <marc.leeman@barco.com>
- ERIC  powerpc 405GP   d9ba451   2010-11-21    Swen Anderson <sand@peppercon.de>
- VoVPN-GW_100MHz       powerpc MPC8260 26fe3d2 2010-10-24      Juergen Selent <j.selent@elmeg.de>
- NC650 powerpc MPC852  333d86d   2010-10-19    Wolfgang Denk <wd@denx.de>
- CP850 powerpc MPC852  333d86d   2010-10-19    Wolfgang Denk <wd@denx.de>
- logodl        ARM     PXA2xx  059e778   2010-10-18    August Hoeraendl <august.hoerandl@gmx.at>
- CCM   powerpc MPC860  dff07e1   2010-10-06    Wolfgang Grandegger <wg@denx.de>
- PCU_E powerpc MPC860T 544d97e   2010-10-06    Wolfgang Denk <wd@denx.de>
- spieval       powerpc MPC5200 69434e4   2010-09-19
- smmaco4       powerpc MPC5200 9ddc3af   2010-09-19
- HMI10 powerpc MPC823  77efe35   2010-09-19    Wolfgang Denk <wd@denx.de>
- GTH   powerpc MPC860  0fe247b   2010-07-17    Thomas Lange <thomas@corelatus.se>
- AmigaOneG3SE          953b7e6   2010-06-23
- suzaku        microblaze      4f18060   2009-10-03    Yasushi Shoji <yashi@atmark-techno.com>
- XUPV2P        microblaze      8fab49e   2008-12-10    Michal Simek <monstr@monstr.eu>
- MVS1  powerpc MPC823  306620b   2008-08-26    Andre Schwarz <andre.schwarz@matrix-vision.de>
- adsvix        ARM     PXA27x  7610db1   2008-07-30    Adrian Filipi <adrian.filipi@eurotech.com>
- R5200 ColdFire        48ead7a   2008-03-31    Zachary P. Landau <zachary.landau@labxtechnologies.com>
- CPCI440       powerpc 440GP   b568fd2   2007-12-27    Matthias Fuchs <matthias.fuchs@esd-electronics.com>
- PCIPPC2       powerpc MPC740/MPC750 -   -             Wolfgang Denk <wd@denx.de>
+ Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
+ =================================================================================================
+ ns9750dev        arm         arm926ejs      -           -           Markus Pietrek <mpietrek@fsforth.de>
+ AMX860           powerpc     mpc860         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
+ c2mon            powerpc     mpc855         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
+ ETX094           powerpc     mpc850         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
+ IAD210           powerpc     mpc860         1b0757e     2012-10-28  -
+ LANTEC           powerpc     mpc850         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
+ SCM              powerpc     mpc8260        1b0757e     2012-10-28  Wolfgang Grandegger <wg@denx.de>
+ SX1              arm         arm925t        53c4154     2012-10-26
+ TQM85xx          powerpc     MPC85xx        d923a5d     2012-10-04  Stefan Roese <sr@denx.de>
+ apollon          arm         omap24xx       535c74f     2012-09-18  Kyungmin Park <kyungmin.park@samsung.com>
+ tb0229           mips        mips32         3f3110d     2011-12-12
+ rmu              powerpc     MPC850         fb82fd7     2011-12-07  Wolfgang Denk <wd@denx.de>
+ OXC              powerpc     MPC8240        309a292     2011-12-07
+ BAB7xx           powerpc     MPC740/MPC750  c53043b     2011-12-07  Frank Gottschling <fgottschling@eltec.de>
+ xm250            arm         pxa            c746cdd     2011-25-11
+ pleb2            arm         pxa            b185a1c     2011-25-11
+ cradle           arm         pxa            4e24f8a     2011-25-11  Kyle Harris <kharris@nexus-tech.net>
+ cerf250          arm         pxa            a3f1241     2011-25-11  Prakash Kumar <prakash@embedx.com>
+ mpq101           powerpc     mpc85xx        e877fab     2011-10-23  Alex Dubov <oakad@yahoo.com>
+ ixdpg425         arm         ixp            0ca8eb7     2011-09-22  Stefan Roese <sr@denx.de>
+ ixdp425          arm         ixp            0ca8eb7     2011-09-22  Kyle Harris <kharris@nexus-tech.net>
+ zylonite         arm         pxa            b66521a     2011-09-05
+ shannon          arm         sa1100         5df092d     2011-09-05  Rolf Offermanns <rof@sysgo.de>
+ modnet50         arm         arm720t        9c62815     2011-09-05  Thomas Elste <info@elste.org>
+ lpc2292sodimm    arm         arm720t        d1a067a     2011-09-05
+ lart             arm         sa1100         3d57573     2011-09-05  Alex Züpke <azu@sysgo.de>
+ impa7            arm         arm720t        c1f8750     2011-09-05  Marius Gröger <mag@sysgo.de>
+ gcplus           arm         sa1100         2c650e2     2011-09-05  George G. Davis <gdavis@mvista.com>
+ evb4510          arm         arm720t        26e670e     2011-09-05  Curt Brune <curt@cucy.com>
+ ep7312           arm         arm720t        c8f63b4     2011-09-05  Marius Gröger <mag@sysgo.de>
+ dnp1110          arm         sa1100         fc5e5ce     2011-09-05  Alex Züpke <azu@sysgo.de>
+ SMN42            arm         arm720t        6aac646     2011-09-05
+ at91rm9200dk     arm         arm920t        1c85752     2011-07-17
+ m501sk           arm         arm920t        b1a2bd4     2011-07-17
+ kb9202           arm         arm920t        5bd3814     2011-07-17
+ csb637           arm         arm920t        d14af08     2011-07-17
+ cmc_pu2          arm         arm920t        37a9b4d     2011-07-17
+ at91cap9adk      arm         arm926ejs      b550834     2011-07-17  Stelian Pop <stelian@popies.net>
+ voiceblue        arm         arm925t        1b793a4     2011-07-17
+ smdk2400         arm         arm920t        ad218a8     2011-07-17  Gary Jennejohn <garyj@denx.de>
+ sbc2410x         arm         arm920t        1f7f0ed     2011-07-17
+ netstar          arm         arm925t        6ea2405     2011-07-17
+ mx1fs2           arm         arm920t        6962419     2011-07-17
+ lpd7a404         arm         lh7a40x        957731e     2011-07-17
+ edb9301          arm         arm920t        716f7ad     2011-07-17
+ edb9302          arm         arm920t        716f7ad     2011-07-17
+ edb9302a         arm         arm920t        716f7ad     2011-07-17
+ edb9307          arm         arm920t        716f7ad     2011-07-17
+ edb9307a         arm         arm920t        716f7ad     2011-07-17
+ edb9312          arm         arm920t        716f7ad     2011-07-17
+ edb9315          arm         arm920t        716f7ad     2011-07-17
+ edb9315a         arm         arm920t        716f7ad     2011-07-17
+ B2               arm         s3c44b0        5dcf536     2011-07-16  Andrea Scian <andrea.scian@dave-tech.it>
+ armadillo        arm         arm720t        be28857     2011-07-16  Rowel Atienza <rowel@diwalabs.com>
+ assabet          arm         sa1100         c91e90d     2011-07-16  George G. Davis <gdavis@mvista.com>
+ trab             arm         S3C2400        566e5cf     2011-05-01  Gary Jennejohn <garyj@denx.de>
+ xsengine         ARM         PXA2xx         4262a7c     2010-10-20
+ wepep250         ARM         PXA2xx         7369478     2010-10-20  Peter Figuli <peposh@etc.sk>
+ delta            ARM         PXA2xx         75e2035     2010-10-20
+ mp2usb           ARM         AT91RM2900     ee986e2     2011-01-25  Eric Bénard <eric@eukrea.com>
+ barco            powerpc     MPC8245        afaa27b     2010-11-23  Marc Leeman <marc.leeman@barco.com>
+ ERIC             powerpc     405GP          d9ba451     2010-11-21  Swen Anderson <sand@peppercon.de>
+ VoVPN-GW_100MHz  powerpc     MPC8260        26fe3d2     2010-10-24  Juergen Selent <j.selent@elmeg.de>
+ NC650            powerpc     MPC852         333d86d     2010-10-19  Wolfgang Denk <wd@denx.de>
+ CP850            powerpc     MPC852         333d86d     2010-10-19  Wolfgang Denk <wd@denx.de>
+ logodl           ARM         PXA2xx         059e778     2010-10-18  August Hoeraendl <august.hoerandl@gmx.at>
+ CCM              powerpc     MPC860         dff07e1     2010-10-06  Wolfgang Grandegger <wg@denx.de>
+ PCU_E            powerpc     MPC860T        544d97e     2010-10-06  Wolfgang Denk <wd@denx.de>
+ spieval          powerpc     MPC5200        69434e4     2010-09-19
+ smmaco4          powerpc     MPC5200        9ddc3af     2010-09-19
+ HMI10            powerpc     MPC823         77efe35     2010-09-19  Wolfgang Denk <wd@denx.de>
+ GTH              powerpc     MPC860         0fe247b     2010-07-17  Thomas Lange <thomas@corelatus.se>
+ AmigaOneG3SE     powerpc     74xx_7xx       953b7e6     2010-06-23
+ suzaku           microblaze  -              4f18060     2009-10-03  Yasushi Shoji <yashi@atmark-techno.com>
+ XUPV2P           microblaze  -              8fab49e     2008-12-10  Michal Simek <monstr@monstr.eu>
+ MVS1             powerpc     MPC823         306620b     2008-08-26  Andre Schwarz <andre.schwarz@matrix-vision.de>
+ adsvix           ARM         PXA27x         7610db1     2008-07-30  Adrian Filipi <adrian.filipi@eurotech.com>
+ R5200            ColdFire    -              48ead7a     2008-03-31  Zachary P. Landau <zachary.landau@labxtechnologies.com>
+ CPCI440          powerpc     440GP          b568fd2     2007-12-27  Matthias Fuchs <matthias.fuchs@esd-electronics.com>
++PCIPPC2          powerpc     MPC740/MPC750  7c9e89b     2013-02-07  Wolfgang Denk <wd@denx.de>
 +PCIPPC6       powerpc MPC740/MPC750 -   -             Wolfgang Denk <wd@denx.de>

diff --cc include/configs/tegra-common.h
index 88acccf,4cc35e5..036ded0
--- 1/include/configs/tegra-common.h
--- 2/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@@ -157,6 -167,7 +167,8 @@@
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_GPIO_SUPPORT
  
 +#define CONFIG_SYS_GENERIC_BOARD
+ /* Misc utility code */
+ #define CONFIG_BOUNCE_BUFFER
  
  #endif /* _TEGRA_COMMON_H_ */

diff --cc nand_spl/board/freescale/mx31pdk/u-boot.lds
Simple merge

diff --cc nand_spl/board/karo/tx25/u-boot.lds
Simple merge

diff --cc nand_spl/board/samsung/smdk6400/u-boot.lds
Simple merge