| Message ID | 20130315230112.14998ce0@lilith |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Albert, On Fri, 15 Mar 2013 23:01:12 +0100, Albert ARIBAUD <albert.u.boot@aribaud.net> wrote: > Hello Tom, > > Here is a PR for ARM. Note that doc/README.scrapyard will need a manual > merge resolution due to ARM tree having a commit that reorders the > headers and reformats the lines while mainline has a commit adding two > new entries still in the older format. > > The following changes since commit > fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to b27673ccbd3d5435319b5c09c3e7061f559f925d: > > Merge branch 'u-boot-tegra/master' into > 'u-boot-arm/master' (2013-03-15 20:50:43 +0100) Sorry about the extra merge conflicts -- at the time of my posting, I only had the scapyard one. Seems like most new conflicts are due to Simon's BSS name change; that should be resolved by taking my BSS changes and changing the symbol's name as Simon does elsewhere, but by the looks of your IRC comment, you'd already figured it out and only the tegra conflict is left to resolve. Amicalement,
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/16/2013 04:19 AM, Albert ARIBAUD wrote: > Hi Albert, > > On Fri, 15 Mar 2013 23:01:12 +0100, Albert ARIBAUD > <albert.u.boot@aribaud.net> wrote: > >> Hello Tom, >> >> Here is a PR for ARM. Note that doc/README.scrapyard will need a >> manual merge resolution due to ARM tree having a commit that >> reorders the headers and reformats the lines while mainline has a >> commit adding two new entries still in the older format. >> >> The following changes since commit >> fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: >> >> x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 >> -0800) >> >> are available in the git repository at: >> >> git://git.denx.de/u-boot-arm master >> >> for you to fetch changes up to >> b27673ccbd3d5435319b5c09c3e7061f559f925d: >> >> Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' >> (2013-03-15 20:50:43 +0100) > > Sorry about the extra merge conflicts -- at the time of my posting, > I only had the scapyard one. Seems like most new conflicts are due > to Simon's BSS name change; that should be resolved by taking my > BSS changes and changing the symbol's name as Simon does elsewhere, > but by the looks of your IRC comment, you'd already figured it out > and only the tegra conflict is left to resolve. I suspect I have all conflicts resolved correctly, but can't run-time test them. If someone with a Tegra platform would like to get ahold of me privately, quickly, I'll send along a binary to try out and confirm I've got the merge correct. Otherwise I'll post the diff monday morning. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRRhxAAAoJENk4IS6UOR1W70gP/0O2fnhKbuNYHw5g0BT8iapR +xfhKflu5+QDIcruCDX4QkzxgG8onvrBwAkjahSWMjJy+QRRjwM4ik24HYMzLbMN jWjy/AkJ9hAfrp4Knq/dcKkordM97Bsg0E2mrnSxJTxqQ8vRU5UzZdBga7bl3YRK U5+YeN5c9ZmGHHtbmhw7zbcPo+7ZwRQEhiMMa4hnCzjZiCu7h3ZNTCuenu/povcr enQ3LmGtmJdBHsyMccuYh0EJNnYeMnfFmNk5S3roH1ryxqiTOFZIk5n6O7xLxWBD BxeFC+KmFAt+pbXtl/CUrW0WWyw8YsecO5q/chl0tKXt/EeGGbcuABQ5RrBkXsYU zD0anY0y9xip8R81IRwbINqvOPxX0tkhJXSQoL6luYNgggZxt4xqrYEUaHaBQJE1 04jy12qRdH5ijUci6/PexY6yigS5yK+G3oiy7GVqSPWW/b3aCgdlygBSsKFONY9p KHjRNWMz5V/JRCDI0doEzsqJMO94OqGpyZLa6GWIyy6Fk+nheja/OZtDg/fQaSin 10V8GU9YqZ47Ojbr3r2thfDOsmxp4ICjIm2zoKPUuNG9JPImAf3CTtD+DGkijoU/ NIHqHjV3kBSVpxROTfNc8yc+jEjik7FoFCaRTjknKajuZbRTW8anQPiaSmX12WfR /3UQOpob05rx+OCYYEpq =L6aj -----END PGP SIGNATURE-----
Hi Tom, On Mon, 18 Mar 2013 13:06:06 -0400, Tom Rini <trini@ti.com> wrote: > I've merged, but not pushed this, with the following merge commit (I > couldn't get a nice pretty print like last time): > > To try and explain this since diff-diffs are funny: > - Consolidate around using __bss_end (so in a few new files, and a lot > of changed files, add __bss_end not __bssend__ or similar). > - Add hashes for PCIPPC2 / PCIPPC6 in scrapyard. > - In tegra20, both CONFIG_SYS_GENERIC_BOARD and CONFIG_BOUNCE_BUFFER are > set. > > commit cf0d1242c87217ba0ce5ecb2f87dfcd1b40b7892 > Merge: b5bec88 b27673c > Author: Tom Rini <trini@ti.com> > Date: Mon Mar 18 12:31:00 2013 -0400 > > 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 IDs for when stuff was removed. This is ever so slightly incorrect regarding scrapyard: IDs are present also in mainline. What ARM changes is, columns are aligned and the order of headers is fixed wrt actual content. Apart from that, all seems ok to me. > 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 arch/arm/cpu/armv7/am33xx/u-boot-spl.lds > index 0000000,69f6d48..b6a929f > mode 000000,100644..100644 > --- a/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 @@@ > + /* > + * (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__ = .; > ++ __bss_end = .; > + } >.sdram > + } > diff --cc arch/arm/cpu/ixp/u-boot.lds > index 2c823e1,5e66dd1..8345b55 > --- a/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 > --- a/arch/arm/cpu/u-boot-spl.lds > +++ b/arch/arm/cpu/u-boot-spl.lds > @@@ -1,0 -1,93 +1,93 @@@ > + /* > + * 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); > - __bss_end__ = .; > ++ __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"); > ++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 > --- a/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 > --- a/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 > --- a/arch/arm/lib/bss.c > +++ b/arch/arm/lib/bss.c > @@@ -1,0 -1,39 +1,39 @@@ > + /* > + * 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__"))); > ++char __bss_end[0] __attribute__((used, section(".__bss_end"))); > diff --cc board/actux1/u-boot.lds > index a0d217b,7cf5b46..c76728a > --- a/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 > --- a/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 > --- a/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/dvlhost/u-boot.lds > index ed91003,eb83b6f..b13d3e1 > --- a/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/freescale/mx31ads/u-boot.lds > index 4d1858b,2d08fea..264c4e8 > --- a/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 doc/README.scrapyard > index 7d73ea0,e9ca96c..189b883 > --- a/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 > --- a/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_ */ > Amicalement,
On Mon, Mar 18, 2013 at 06:43:00PM +0100, Albert ARIBAUD wrote: > Hi Tom, > > On Mon, 18 Mar 2013 13:06:06 -0400, Tom Rini <trini@ti.com> wrote: > > > I've merged, but not pushed this, with the following merge commit (I > > couldn't get a nice pretty print like last time): > > > > To try and explain this since diff-diffs are funny: > > - Consolidate around using __bss_end (so in a few new files, and a lot > > of changed files, add __bss_end not __bssend__ or similar). > > - Add hashes for PCIPPC2 / PCIPPC6 in scrapyard. > > - In tegra20, both CONFIG_SYS_GENERIC_BOARD and CONFIG_BOUNCE_BUFFER are > > set. > > > > commit cf0d1242c87217ba0ce5ecb2f87dfcd1b40b7892 > > Merge: b5bec88 b27673c > > Author: Tom Rini <trini@ti.com> > > Date: Mon Mar 18 12:31:00 2013 -0400 > > > > 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 IDs for when stuff was removed. > > This is ever so slightly incorrect regarding scrapyard: IDs are present > also in mainline. What ARM changes is, columns are aligned and the > order of headers is fixed wrt actual content. > > Apart from that, all seems ok to me. > > > 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 arch/arm/cpu/armv7/am33xx/u-boot-spl.lds > > index 0000000,69f6d48..b6a929f > > mode 000000,100644..100644 > > --- a/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 @@@ > > + /* > > + * (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__ = .; > > ++ __bss_end = .; > > + } >.sdram > > + } > > diff --cc arch/arm/cpu/ixp/u-boot.lds > > index 2c823e1,5e66dd1..8345b55 > > --- a/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 > > --- a/arch/arm/cpu/u-boot-spl.lds > > +++ b/arch/arm/cpu/u-boot-spl.lds > > @@@ -1,0 -1,93 +1,93 @@@ > > + /* > > + * 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); > > - __bss_end__ = .; > > ++ __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"); > > ++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 > > --- a/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 > > --- a/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 > > --- a/arch/arm/lib/bss.c > > +++ b/arch/arm/lib/bss.c > > @@@ -1,0 -1,39 +1,39 @@@ > > + /* > > + * 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__"))); > > ++char __bss_end[0] __attribute__((used, section(".__bss_end"))); > > diff --cc board/actux1/u-boot.lds > > index a0d217b,7cf5b46..c76728a > > --- a/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 > > --- a/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 > > --- a/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/dvlhost/u-boot.lds > > index ed91003,eb83b6f..b13d3e1 > > --- a/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/freescale/mx31ads/u-boot.lds > > index 4d1858b,2d08fea..264c4e8 > > --- a/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 doc/README.scrapyard > > index 7d73ea0,e9ca96c..189b883 > > --- a/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 > > --- a/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_ */ Thanks for the clarification, I've reworded the commit message slightly and pushed.
Hello Tom, Here is a PR for ARM. Note that doc/README.scrapyard will need a manual merge resolution due to ARM tree having a commit that reorders the headers and reformats the lines while mainline has a commit adding two new entries still in the older format. The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to b27673ccbd3d5435319b5c09c3e7061f559f925d: Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' (2013-03-15 20:50:43 +0100) ---------------------------------------------------------------- Albert ARIBAUD (9): Merge 'u-boot-microblaze/mainline/arm' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master' arm: omap: map u_boot_lists section to .sram Remove linker lists (LGAs) from SPL linker scripts arm: make __bss_start and __bss_end__ compiler-generated Refactor linker-generated arrays Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' Benoît Thébaudeau (6): imx: mx6q DDR3 init: Fix tMRD imx: mx6q DDR3 init: Fix tXPR imx: mx6q DDR3 init: Fix SDE_to_RST imx: mx6q DDR3 init: Fix RST_to_CKE imx: mx6q DDR3 init: Fix MR0.PPD imx: mx6q DDR3 init: Benefit from available CL = 7 Bo Shen (3): ARM: atmel: add at91sam9g20ek_2mmc nand boot support ARM: at91: change nand flash table ARM: at91sam9x5: Using CPU string directly Chase Maupin (3): am335x_evm: Add NAND environment variables am335x_evm: Add SPI environment variables am335x_evm: Add NET environment variables Enric Balletbo i Serra (7): OMAP3: igep00x0: use official board names. OMAP3: igep00x0: add missing include mach-types.h OMAP3: igep00x0: Add new IGEP COM PROTON. SPL: ONENAND: Fix some ONENAND related defines. SPL: ONENAND: Fix onenand_spl_load_image implementation. SPL: ONENAND: Support SPL to boot u-boot from OneNAND. OMAP3: Initialize gpmc if SPL_ONENAND_SUPPORT is enabled. Eric Nelson (8): i.MX6Q: mx6qsabre*: Configure to allow CONFIG_SYS_ALT_MEMTEST i.MX6: mx6qsabrelite: indent with tabs i.MX6: consolidate pad names for multi-CPU boards i.MX6: crm_regs: define CCM_CCGRx for use in board config files i.MX6: crm_regs: define IOMUXC_GPR4/6/7 i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO i.MX6: Add DDR controller registers Add Boundary Devices Nitrogen6X boards Fabio Estevam (6): mx6: Disable Power Down Bit of watchdog mx23evk: Remove CONFIG_SYS_BAUDRATE_TABLE mx23evk: Turn on caches common: cmd_sata: Fix usage text for 'sata init' mx6: Provide a structure for accessing HDMI registers nitrogen6x: Fix RAM size variable Fadil Berisha (2): mxs: timrot: Add support to i.MX23 mxs: timrot: Rename local macros Howard Gray (1): omap3: mvblx: change console to ttyO0 and make silent by default. Ilya Yanok (4): spl: support for booting via usbeth am33xx: support for booting via usbeth am335x_evm: enable support for booting via USB doc/SPL/README.am335x-network: Document using ethernet (and USB) SPL Jesse Gilles (1): ARM: sam9x5: fix ethernet pins in MII mode Lars Poeschel (1): am33xx: pcm051: Remove wp pin mux for sd-card Lokesh Vutla (13): ARM: OMAP4+: emif: Detect SDRAM from SDRAM config register ARM: OMAP4+: Cleanup emif specific files ARM: OMAP4+: Make control module register structure generic ARM: OMAP5: Clean up iosettings code ARM: OMAP5: Add DDR changes required for OMAP543X ES2.0 SOCs ARM: OMAP5: srcomp: enable slew rate compensation cells after powerup arm: dra7xx: clock: Add the prcm changes arm: dra7xx: clock: Add the dplls data arm: dra7xx: Add control module changes arm: dra7xx: Add DDR related data for DRA752 ES1.0 arm: dra7xx: Add board files for DRA7XX socs arm: dra7xx: Add dra7xx_evm build support arm: dra7xx: Add silicon id support for DRA752 soc Lucas Stach (7): tegra: usb: set USB_PORTS_MAX to correct value tegra: usb: make controller init functions more self contained tegra: usb: remove unneeded function parameter tegra: usb: move controller init into start_port tegra: usb: various small cleanups tegra: usb: move implementation into right directory tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] Marek Vasut (7): mxs: Reset the EMI block on mx23 mxs: mmc: spi: dma: Better wrap the MXS differences mxs: spi: Fix the MXS SPI for mx23 mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE mxs: Squash the header file usage in ehci-mxs mxs: Make ehci-mxs multiport capable mxs: m28: Enable power to USB port 0 Mark Jackson (1): Allow AM33xx boards to setup GPMC chipselects. Michael Jones (2): omap3: mvblx: select fpgafilename according to orientation omap3: mvblx: pass FPGA version to the kernel Michal Simek (3): xilinx: zynq: Enable DCC and create new zynq_dcc board arm: zynq: Add SLCR support with system reset arm: zynq: Add lowlevel initialization to C Mugunthan V N (1): am335x: cpsw: optimize cpsw_send to increase network performance Nicolas Ferre (2): arm: at91/configs: add libfdt to configuration arm: at91/configs: add bootz to configuration Nikita Kiryanov (14): omap: consolidate common mmc definitions omap_hsmmc: fix out of bounds array access omap_hsmmc: introduce omap_hsmmc_data struct omap_hsmmc: implement driver check for card detection cm-t35: implement board specific card detect check mmc: add support for write protection omap_hsmmc: add driver check for write protection omap3: add useful dss defines omap3: allow dynamic selection of gfx_format lcd: add option for board specific splash screen preparation cm-t35: add support for dvi displays cm-t35: add support for user defined lcd parameters lcd: implement a callback for splashimage cm_t35: prevent splashimage from being set to a bad value Otavio Salvador (11): build: imx: Fix 'u-boot.imx' build without full OBJTREE reference mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT mx23: Document the tRAS lockout setting in memory initialization mx23evk: Adjust DRAM control register to use full 128MB of RAM led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set mxs: Fix iomux.h to not break build during assembly stage mx23_olinuxino: Add support for status LED mx23evk: Enable USB support mx23_olinuxino: Enable USB support mx23_olinuxino: Add ethernet support mx23_olinuxino: Fix warning for implicit declaration SRICHARAN R (6): ARM: OMAP4+: Change the PRCM structure prototype common for all Socs ARM: OMAP4+: Cleanup the clocks layer ARM: OMAP4+: Clean up the pmic code ARM: OMAP5: Add silicon id support for ES2.0 revision. ARM: OMAP5: clock: Add the prcm register changes required for ES2.0 ARM: OMAP4/5: clocks: Add the required OPP settings as per the latest addendum Stefano Babic (3): Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm USB: drop unneeded header in ehci-mx6 Stephen Warren (8): ARM: mx6: use common CPU errata config options ARM: implement some Cortex-A9 errata workarounds ARM: tegra: enable some CPU errata workarounds ARM: tegra: implement WAR for Tegra114 CPU reset vector ARM: tegra: make bounce buffer option common disk: define HAVE_BLOCK_DEVICE in a common place disk: define HAVE_BLOCK_DEVICE if CONFIG_CMD_PART ARM: tegra: enable a common set of disk-related commands everywhere Tom Rini (9): am335x evm: Add am335x_evm_spiboot target am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL am335x_evm: Add am335x_evm_usbspl build target am33xx: Update DDR3 EMIF configuration sequence am335x_evm: Enable CONFIG_CMD_BOOTZ omap5_evm: Enable CONFIG_CMD_BOOTZ omap3_beagle: Enable CONFIG_CMD_BOOTZ omap4_common: Enable CONFIG_CMD_BOOTZ Merge u-boot/master into u-boot-ti/master Tom Warren (27): Tegra114: I2C: Take DVFS out of reset to allow I2C5 (PWR_I2C) to work Tegra: I2C: Add T114 clock support to tegra_i2c driver Tegra114: fdt: Update DT files with I2C info for T114/Dalmore Tegra114: I2C: Enable I2C driver on Dalmore E1611 eval board Tegra: fdt: Change /include/ to #include for C preprocessor Tegra: fdt: tamonten: Add common tamonten.dtsi file from linux Tegra: fdt: Add/enhance sdhci (mmc) nodes for all T20 DT files Tegra: MMC: Add DT support to MMC driver for all T20 boards Tegra: fdt: Remove memreserve line from Cardhu/Seaboard DT files Tegra30: fdt: Sync DT nodes with kernel DT files (I2C, SPI, GPIO, clock) Tegra: Add twarren as maintainer for Tegra30 and Tegra114 SoCs Tegra: Remove unused CONFIG_SYS_CPU_OSC_FREQUENCY define Tegra114: fdt: Sync DT nodes with kernel DT files (GPIO, tegra_car) Tegra30: Cardhu: Remove unneeded cardhu.c.mmc file Tegra114: pinmux: Update pinmux tables & code, fix a bug w/SDMMC3 init Tegra30: Cardhu: Add pad config tables/code based on pinmux code Tegra30: fdt: Add SDMMC (sdhci) nodes for T30 boards (Cardhu for now) Tegra: MMC: Added/update SDMMC registers/base addresses for T20/T30 Tegra30: MMC: Add SD bus power-rail and SDMMC pad init routines mmc: Tegra: Add SD bus power/voltage function and MMC pad init call. Tegra30: mmc: Add Tegra30 SDMMC compatible entry to fdtdec & driver Tegra30: MMC: Enable DT MMC driver support for Tegra30 Cardhu boards Tegra114: pinmux: Fix bad CAM_MCLK func 3 table entry Tegra114: Fix/update GP padcfg register struct Tegra114: Dalmore: Always use DEFAULT instead of DISABLE for lock bits Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras Tegra114: Dalmore: Add pad config tables/code based on pinmux code Tomas Novotny (2): da8xx: ea20: Add the configuration define for the exact SoC variant da8xx: Add the missing pinmux for da830 to the gpio driver Wolfgang Denk (2): README.scrapyard: add missing commit IDs ARM: ns9750dev: remove remainders of dead board fabio.estevam@freescale.com (1): nitrogen: Use unsigned long to specify the total RAM size robertcnelson@gmail.com (2): beagle: expansion boards: retry i2c_read with 16bit addressing beagle: expansion boards: add LSR COM6L adapter .gitignore | 1 - MAINTAINERS | 11 + Makefile | 17 +- README | 29 ++ arch/arm/cpu/arm1136/mx35/generic.c | 2 +- arch/arm/cpu/arm720t/tegra114/cpu.c | 37 ++- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 2 +- arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 30 +- arch/arm/cpu/arm926ejs/config.mk | 2 +- arch/arm/cpu/arm926ejs/mxs/clock.c | 3 +- arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 16 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 39 ++- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 6 - arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 6 - arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- arch/arm/cpu/armv7/am33xx/ddr.c | 12 +- arch/arm/cpu/armv7/am33xx/u-boot-spl.lds | 67 +++++ arch/arm/cpu/armv7/config.mk | 2 +- arch/arm/cpu/armv7/mx6/Makefile | 1 - arch/arm/cpu/armv7/mx6/soc.c | 16 + arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +- arch/arm/cpu/armv7/omap-common/clocks-common.c | 312 ++++++++++++++------ arch/arm/cpu/armv7/omap-common/emif-common.c | 73 ++--- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 23 +- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 4 - arch/arm/cpu/armv7/omap-common/vc.c | 11 +- arch/arm/cpu/armv7/omap3/board.c | 6 +- arch/arm/cpu/armv7/omap4/Makefile | 3 +- arch/arm/cpu/armv7/omap4/clocks.c | 517 -------------------------------- arch/arm/cpu/armv7/omap4/hw_data.c | 491 ++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap4/hwinit.c | 36 +-- arch/arm/cpu/armv7/omap4/prcm-regs.c | 315 ++++++++++++++++++++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 34 ++- arch/arm/cpu/armv7/omap5/Makefile | 3 +- arch/arm/cpu/armv7/omap5/clocks.c | 494 ------------------------------- arch/arm/cpu/armv7/omap5/hw_data.c | 596 +++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/hwinit.c | 292 ++++++++++++------ arch/arm/cpu/armv7/omap5/prcm-regs.c | 958 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/sdram.c | 214 +++++++++++--- arch/arm/cpu/armv7/start.S | 19 ++ arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 567 ----------------------------------- arch/arm/cpu/armv7/zynq/Makefile | 1 + arch/arm/cpu/armv7/zynq/cpu.c | 28 +- arch/arm/cpu/armv7/zynq/slcr.c | 63 ++++ arch/arm/cpu/ixp/u-boot.lds | 14 +- arch/arm/cpu/tegra114-common/pinmux.c | 410 ++++++++++++++++++++------ arch/arm/cpu/tegra30-common/pinmux.c | 190 +++++++++++- arch/arm/cpu/u-boot-spl.lds | 93 ++++++ arch/arm/cpu/u-boot.lds | 14 +- arch/arm/dts/tegra114.dtsi | 75 ++++- arch/arm/dts/tegra20.dtsi | 18 +- arch/arm/dts/tegra30.dtsi | 124 +++++--- arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-am33xx/spl.h | 1 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + arch/arm/include/asm/arch-at91/at91sam9x5.h | 6 - arch/arm/include/asm/arch-davinci/gpio.h | 7 +- arch/arm/include/asm/arch-mx35/spl.h | 2 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 12 + arch/arm/include/asm/arch-mx6/imx-regs.h | 8 + arch/arm/include/asm/arch-mx6/iomux.h | 5 + arch/arm/include/asm/arch-mx6/mx6-ddr.h | 85 ++++++ arch/arm/include/asm/arch-mx6/mx6-pins.h | 31 ++ arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 71 +++++ arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 193 ++++++------ arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 69 +++++ arch/arm/include/asm/arch-mx6/mx6q_pins.h | 1671 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1671 ------------------------------------------------------------------------------------------------------- arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 1083 ++++++++++++++++++++++++++++++++++--------------------------------- arch/arm/include/asm/arch-mxs/dma.h | 19 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 + arch/arm/include/asm/arch-mxs/iomux.h | 5 + arch/arm/include/asm/arch-mxs/regs-ssp.h | 26 ++ arch/arm/include/asm/arch-mxs/regs-timrot.h | 101 +++++++ arch/arm/include/asm/arch-omap3/dss.h | 31 ++ arch/arm/include/asm/arch-omap3/mmc_host_def.h | 139 +-------- arch/arm/include/asm/arch-omap3/spl.h | 2 +- arch/arm/include/asm/arch-omap4/clocks.h | 562 +++-------------------------------- arch/arm/include/asm/arch-omap4/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-omap4/omap.h | 34 +-- arch/arm/include/asm/arch-omap4/spl.h | 2 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap5/clocks.h | 539 ++------------------------------- arch/arm/include/asm/arch-omap5/mmc_host_def.h | 140 +-------- arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 344 +++++++++++++++++++++ arch/arm/include/asm/arch-omap5/mux_omap5.h | 8 - arch/arm/include/asm/arch-omap5/omap.h | 125 +++----- arch/arm/include/asm/arch-omap5/spl.h | 2 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 10 +- arch/arm/include/asm/arch-tegra/mmc.h | 2 +- arch/arm/include/asm/arch-tegra/tegra_i2c.h | 6 + arch/arm/include/asm/arch-tegra/tegra_mmc.h | 48 ++- arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h | 22 -- arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 34 ++- arch/arm/include/asm/arch-tegra114/pinmux.h | 246 ++++++++-------- arch/arm/include/asm/arch-tegra20/tegra.h | 1 - arch/arm/include/asm/arch-tegra30/gp_padctrl.h | 6 + arch/arm/include/asm/arch-tegra30/pinmux.h | 67 ++++- arch/arm/include/asm/arch-tegra30/tegra.h | 2 + arch/arm/include/asm/arch-zynq/hardware.h | 85 ++++++ arch/arm/{cpu/armv7/mx6/lowlevel_init.S => include/asm/arch-zynq/sys_proto.h} | 27 +- arch/arm/include/asm/armv7.h | 1 + arch/arm/include/asm/emif.h | 20 +- arch/arm/include/asm/omap_common.h | 523 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/omap_mmc.h | 168 +++++++++++ arch/arm/lib/Makefile | 1 + arch/arm/lib/bss.c | 39 +++ arch/avr32/cpu/u-boot.lds | 2 +- arch/blackfin/cpu/u-boot.lds | 2 +- arch/microblaze/cpu/u-boot.lds | 2 +- arch/mips/cpu/u-boot.lds | 2 +- arch/nds32/cpu/n1213/u-boot.lds | 2 +- arch/nios2/cpu/u-boot.lds | 2 +- arch/powerpc/cpu/74xx_7xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc512x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- arch/powerpc/cpu/mpc5xxx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8220/u-boot.lds | 2 +- arch/powerpc/cpu/mpc824x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8260/u-boot.lds | 2 +- arch/powerpc/cpu/mpc83xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc86xx/u-boot.lds | 2 +- arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 +- arch/sandbox/cpu/u-boot.lds | 2 +- arch/sh/cpu/sh2/u-boot.lds | 2 +- arch/sh/cpu/sh3/u-boot.lds | 2 +- arch/sh/cpu/sh4/u-boot.lds | 2 +- arch/x86/cpu/u-boot.lds | 2 +- board/BuS/eb_cpu5282/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/RRvision/u-boot.lds | 2 +- board/actux1/u-boot.lds | 24 +- board/actux2/u-boot.lds | 24 +- board/actux3/u-boot.lds | 18 +- board/adder/u-boot.lds | 2 +- board/ait/cam_enc_4xx/u-boot-spl.lds | 4 - board/altera/nios2-generic/u-boot.lds | 2 +- board/amcc/acadia/u-boot-nand.lds | 2 +- board/amcc/bamboo/u-boot-nand.lds | 2 +- board/amcc/canyonlands/u-boot-nand.lds | 2 +- board/amcc/kilauea/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-ram.lds | 2 +- board/astro/mcf5373l/u-boot.lds | 2 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 7 +- board/avionic-design/common/tamonten.c | 19 +- board/avionic-design/dts/tegra20-medcom-wide.dts | 3 +- board/avionic-design/dts/tegra20-plutux.dts | 3 +- board/avionic-design/dts/tegra20-tamonten.dtsi | 489 ++++++++++++++++++++++++++++++ board/avionic-design/dts/tegra20-tec.dts | 3 +- board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 58 ++++ board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/6x_bootscript.txt | 63 ++++ board/boundary/nitrogen6x/6x_bootscript_android.txt | 64 ++++ board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt | 64 ++++ board/boundary/nitrogen6x/6x_upgrade.txt | 45 +++ board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 58 ++++ board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 57 ++++ board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 58 ++++ board/boundary/nitrogen6x/Makefile | 41 +++ board/boundary/nitrogen6x/README | 92 ++++++ board/boundary/nitrogen6x/clocks.cfg | 46 +++ board/boundary/nitrogen6x/ddr-setup.cfg | 112 +++++++ board/boundary/nitrogen6x/nitrogen6dl.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6q.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6q2g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6s.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6s1g.cfg | 45 +++ board/boundary/nitrogen6x/nitrogen6x.c | 895 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/cm_t35/Makefile | 1 + board/cm_t35/cm_t35.c | 16 +- board/cm_t35/display.c | 428 +++++++++++++++++++++++++++ board/cobra5272/u-boot.lds | 2 +- board/cogent/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/comelit/dig297/dig297.c | 3 +- board/compal/dts/tegra20-paz00.dts | 21 +- board/compal/paz00/paz00.c | 26 +- board/compulab/dts/tegra20-trimslice.dts | 16 +- board/compulab/trimslice/trimslice.c | 23 +- board/corscience/tricorder/tricorder.c | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 5 - board/davinci/da8xxevm/u-boot-spl-hawk.lds | 5 - board/denx/m28evk/m28evk.c | 4 + board/dvlhost/u-boot.lds | 18 +- board/eltec/mhpc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds | 2 +- board/ep88x/u-boot.lds | 2 +- board/esd/dasa_sim/u-boot.lds | 2 +- board/esd/pmc440/u-boot-nand.lds | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/evb64260/u-boot.lds | 2 +- board/fads/u-boot.lds | 2 +- board/flagadm/u-boot.lds | 2 +- board/flagadm/u-boot.lds.debug | 2 +- board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 10 +- board/freescale/m5208evbe/u-boot.lds | 2 +- board/freescale/m52277evb/u-boot.lds | 2 +- board/freescale/m5235evb/u-boot.lds | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 2 +- board/freescale/m5282evb/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54418twr/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.lds | 2 +- board/freescale/m54455evb/u-boot.lds | 2 +- board/freescale/m547xevb/u-boot.lds | 2 +- board/freescale/m548xevb/u-boot.lds | 2 +- board/freescale/mx23evk/spl_boot.c | 10 + board/freescale/mx31ads/u-boot.lds | 16 +- board/freescale/mx6qarm2/mx6qarm2.c | 78 ++--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 ++-- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 292 +++++++++--------- board/freescale/mx6qsabresd/mx6qsabresd.c | 102 +++---- board/gaisler/gr_cpci_ax2000/u-boot.lds | 2 +- board/gaisler/gr_ep2s60/u-boot.lds | 2 +- board/gaisler/gr_xc3s_1500/u-boot.lds | 2 +- board/gaisler/grsim/u-boot.lds | 2 +- board/gaisler/grsim_leon2/u-boot.lds | 2 +- board/gen860t/u-boot-flashenv.lds | 2 +- board/gen860t/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 2 +- board/hermes/u-boot.lds.debug | 2 +- board/htkw/mcx/mcx.c | 3 +- board/hymod/u-boot.lds | 2 +- board/hymod/u-boot.lds.debug | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 2 +- board/ip860/u-boot.lds.debug | 2 +- board/isee/igep00x0/igep00x0.c | 3 +- board/isee/igep00x0/igep00x0.h | 7 +- board/ivm/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/korat/u-boot-F7FC.lds | 2 +- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds.debug | 2 +- board/logicpd/am3517evm/am3517evm.c | 3 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/logicpd/zoom1/zoom1.c | 3 +- board/logicpd/zoom2/zoom2.c | 3 +- board/lwmon/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/manroland/uc100/u-boot.lds | 2 +- board/matrix_vision/mvblx/fpga.c | 14 +- board/matrix_vision/mvblx/mvblx.c | 4 +- board/matrix_vision/mvblx/sys_eeprom.c | 24 ++ board/matrix_vision/mvsmr/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/mvblue/u-boot.lds | 2 +- board/netphone/u-boot.lds | 2 +- board/netphone/u-boot.lds.debug | 2 +- board/netta/u-boot.lds | 2 +- board/netta/u-boot.lds.debug | 2 +- board/netta2/u-boot.lds | 2 +- board/netta2/u-boot.lds.debug | 2 +- board/netvia/u-boot.lds | 2 +- board/netvia/u-boot.lds.debug | 2 +- board/nokia/rx51/rx51.c | 4 +- board/ns9750dev/config.mk | 16 - board/ns9750dev/flash.c | 474 ----------------------------- board/ns9750dev/led.c | 46 --- board/ns9750dev/lowlevel_init.S | 298 ------------------- board/ns9750dev/ns9750dev.c | 125 -------- board/nvidia/cardhu/cardhu.c | 57 +++- board/nvidia/cardhu/cardhu.c.mmc | 151 ---------- board/nvidia/cardhu/pinmux-config-cardhu.h | 21 +- board/nvidia/common/board.c | 56 +++- board/nvidia/dalmore/dalmore.c | 3 + board/nvidia/dalmore/pinmux-config-dalmore.h | 475 ++++++++++++++++++----------- board/nvidia/dts/tegra114-dalmore.dts | 35 ++- board/nvidia/dts/tegra20-harmony.dts | 20 +- board/nvidia/dts/tegra20-seaboard.dts | 15 +- board/nvidia/dts/tegra20-ventana.dts | 17 +- board/nvidia/dts/tegra20-whistler.dts | 15 +- board/nvidia/dts/tegra30-cardhu.dts | 23 +- board/nvidia/harmony/harmony.c | 26 +- board/nvidia/seaboard/seaboard.c | 25 +- board/nvidia/whistler/whistler.c | 30 +- board/nx823/u-boot.lds | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 + board/olimex/mx23_olinuxino/spl_boot.c | 8 + board/openrisc/openrisc-generic/u-boot.lds | 2 +- board/overo/overo.c | 3 +- board/pandora/pandora.c | 3 +- board/phytec/pcm051/mux.c | 1 - board/quantum/u-boot.lds | 2 +- board/r360mpi/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/renesas/sh7752evb/u-boot.lds | 2 +- board/renesas/sh7757lcr/u-boot.lds | 2 +- board/rsdproto/u-boot.lds | 2 +- board/samsung/smdk5250/smdk5250-uboot-spl.lds | 2 +- board/samsung/smdk6400/u-boot-nand.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sandpoint/u-boot.lds | 2 +- board/sixnet/u-boot.lds | 2 +- board/snmc/qs850/u-boot.lds | 2 +- board/snmc/qs860t/u-boot.lds | 2 +- board/spc1920/u-boot.lds | 2 +- board/spd8xx/u-boot.lds | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxxtc/u-boot.lds | 2 +- board/stx/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/u-boot.lds | 2 +- board/technexion/twister/twister.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/ti/am335x/board.c | 40 +-- board/ti/am3517crane/am3517crane.c | 3 +- board/ti/beagle/beagle.c | 17 +- board/ti/beagle/beagle.h | 6 +- board/{ns9750dev => ti/dra7xx}/Makefile | 22 +- board/ti/dra7xx/evm.c | 103 +++++++ board/ti/dra7xx/mux_data.h | 47 +++ board/ti/evm/evm.c | 3 +- board/ti/omap5_evm/evm.c | 4 +- board/ti/panda/panda.c | 3 +- board/ti/sdp3430/sdp.c | 3 +- board/ti/sdp4430/sdp.c | 4 +- board/timll/devkit8000/devkit8000.c | 3 +- board/toradex/colibri_t20_iris/colibri_t20_iris.c | 11 +- board/toradex/dts/tegra20-colibri_t20_iris.dts | 9 +- board/tqc/tqm8xx/u-boot.lds | 2 +- board/v37/u-boot.lds | 2 +- board/vpac270/u-boot-spl.lds | 4 - board/w7o/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- boards.cfg | 12 + common/cmd_help.c | 2 +- common/cmd_led.c | 6 +- common/cmd_mmc.c | 7 + common/cmd_sata.c | 2 +- common/lcd.c | 41 +++ common/spl/Makefile | 1 + common/spl/spl.c | 10 + common/spl/spl_onenand.c | 47 +++ config.mk | 2 - disk/part.c | 10 - disk/part_amiga.c | 6 +- disk/part_dos.c | 7 +- disk/part_efi.c | 8 +- disk/part_iso.c | 7 +- disk/part_mac.c | 7 +- doc/README.commands | 18 +- doc/README.displaying-bmps | 27 ++ doc/README.ns9750dev | 36 --- doc/README.scrapyard | 161 +++++----- doc/SPL/README.am335x-network | 92 ++++++ doc/driver-model/UDM-serial.txt | 2 +- drivers/gpio/da8xx_gpio.c | 137 ++++++++- drivers/i2c/tegra_i2c.c | 42 ++- drivers/mmc/arm_pl180_mmci.c | 1 + drivers/mmc/bfin_sdh.c | 1 + drivers/mmc/davinci_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/ftsdc010_esdhc.c | 1 + drivers/mmc/gen_atmel_mci.c | 1 + drivers/mmc/mmc.c | 17 ++ drivers/mmc/mmc_spi.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/mmc/mxsmmc.c | 21 +- drivers/mmc/omap_hsmmc.c | 103 +++++-- drivers/mmc/sdhci.c | 1 + drivers/mmc/sh_mmcif.c | 1 + drivers/mmc/tegra_mmc.c | 227 ++++++++++---- drivers/mtd/onenand/onenand_spl.c | 14 +- drivers/net/cpsw.c | 20 +- drivers/serial/Makefile | 1 - drivers/serial/ns9750_serial.c | 218 -------------- drivers/serial/serial.c | 2 - drivers/spi/mxs_spi.c | 39 ++- drivers/usb/host/ehci-mx6.c | 1 - drivers/usb/host/ehci-mxs.c | 155 +++++----- drivers/usb/host/ehci-tegra.c | 546 +++++++++++++++++++++++++++++++++- drivers/video/omap3_dss.c | 2 +- dts/Makefile | 3 +- helper.mk | 64 ---- include/command.h | 2 +- include/config_fallbacks.h | 11 + include/configs/am335x_evm.h | 85 +++++- include/configs/apx4devkit.h | 3 +- include/configs/at91rm9200ek.h | 3 + include/configs/at91sam9260ek.h | 23 +- include/configs/at91sam9261ek.h | 19 +- include/configs/at91sam9263ek.h | 20 +- include/configs/at91sam9m10g45ek.h | 17 +- include/configs/at91sam9rlek.h | 3 + include/configs/at91sam9x5ek.h | 12 +- include/configs/cardhu.h | 12 +- include/configs/cm_t35.h | 9 + include/configs/colibri_t20_iris.h | 6 - include/configs/dalmore.h | 9 + include/configs/dra7xx_evm.h | 36 +++ include/configs/ea20.h | 1 + include/configs/harmony.h | 8 - include/configs/igep00x0.h | 7 +- include/configs/m28evk.h | 5 +- include/configs/medcom-wide.h | 5 - include/configs/mx23_olinuxino.h | 64 +++- include/configs/mx23evk.h | 14 +- include/configs/mx28evk.h | 4 +- include/configs/mx6_common.h | 23 ++ include/configs/mx6qarm2.h | 3 + include/configs/mx6qsabre_common.h | 4 + include/configs/mx6qsabrelite.h | 4 + include/configs/nitrogen6x.h | 285 ++++++++++++++++++ include/configs/ns9750dev.h | 187 ------------ include/configs/omap3_beagle.h | 3 +- include/configs/omap3_mvblx.h | 25 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_common.h | 262 ++++++++++++++++ include/configs/omap5_evm.h | 240 +-------------- include/configs/paz00.h | 8 - include/configs/pcm051.h | 2 +- include/configs/plutux.h | 5 - include/configs/sc_sps_1.h | 3 +- include/configs/seaboard.h | 8 - include/configs/tec.h | 5 - include/configs/tegra-common.h | 23 +- include/configs/tegra114-common.h | 3 + include/configs/tegra20-common.h | 12 +- include/configs/tegra30-common.h | 6 + include/configs/trimslice.h | 8 - include/configs/ventana.h | 8 - include/configs/whistler.h | 8 - include/configs/zynq.h | 5 + include/env_callback.h | 9 +- include/fdtdec.h | 3 + include/lcd.h | 1 + include/linker_lists.h | 252 ++++++++++++---- include/mmc.h | 2 + include/ns9750_bbus.h | 125 -------- include/ns9750_mem.h | 172 ----------- include/ns9750_ser.h | 202 ------------- include/ns9750_sys.h | 215 -------------- include/spl.h | 3 + lib/fdtdec.c | 3 + nand_spl/board/freescale/mpc8536ds/Makefile | 7 +- nand_spl/board/freescale/mpc8569mds/Makefile | 7 +- nand_spl/board/freescale/mpc8572ds/Makefile | 7 +- nand_spl/board/freescale/mx31pdk/Makefile | 7 +- nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 +- nand_spl/board/freescale/p1010rdb/Makefile | 7 +- nand_spl/board/freescale/p1023rds/Makefile | 7 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 7 +- nand_spl/board/karo/tx25/Makefile | 7 +- nand_spl/board/karo/tx25/u-boot.lds | 2 +- nand_spl/board/samsung/smdk6400/u-boot.lds | 2 +- spl/.gitignore | 1 - spl/Makefile | 10 +- 486 files changed, 15587 insertions(+), 10406 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/u-boot-spl.lds delete mode 100644 arch/arm/cpu/armv7/omap4/clocks.c create mode 100644 arch/arm/cpu/armv7/omap4/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap4/prcm-regs.c delete mode 100644 arch/arm/cpu/armv7/omap5/clocks.c create mode 100644 arch/arm/cpu/armv7/omap5/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap5/prcm-regs.c delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c create mode 100644 arch/arm/cpu/armv7/zynq/slcr.c create mode 100644 arch/arm/cpu/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h create mode 100644 arch/arm/include/asm/arch-omap5/mux_dra7xx.h rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (89%) create mode 100644 arch/arm/include/asm/arch-zynq/hardware.h rename arch/arm/{cpu/armv7/mx6/lowlevel_init.S => include/asm/arch-zynq/sys_proto.h} (54%) create mode 100644 arch/arm/include/asm/omap_mmc.h create mode 100644 arch/arm/lib/bss.c create mode 100644 board/avionic-design/dts/tegra20-tamonten.dtsi create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/Makefile create mode 100644 board/boundary/nitrogen6x/README create mode 100644 board/boundary/nitrogen6x/clocks.cfg create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c create mode 100644 board/cm_t35/display.c delete mode 100644 board/ns9750dev/config.mk delete mode 100644 board/ns9750dev/flash.c delete mode 100644 board/ns9750dev/led.c delete mode 100644 board/ns9750dev/lowlevel_init.S delete mode 100644 board/ns9750dev/ns9750dev.c delete mode 100644 board/nvidia/cardhu/cardhu.c.mmc rename board/{ns9750dev => ti/dra7xx}/Makefile (74%) create mode 100644 board/ti/dra7xx/evm.c create mode 100644 board/ti/dra7xx/mux_data.h create mode 100644 common/spl/spl_onenand.c create mode 100644 doc/README.displaying-bmps delete mode 100644 doc/README.ns9750dev create mode 100644 doc/SPL/README.am335x-network delete mode 100644 drivers/serial/ns9750_serial.c delete mode 100644 helper.mk create mode 100644 include/configs/dra7xx_evm.h create mode 100644 include/configs/mx6_common.h create mode 100644 include/configs/nitrogen6x.h delete mode 100644 include/configs/ns9750dev.h create mode 100644 include/configs/omap5_common.h delete mode 100644 include/ns9750_bbus.h delete mode 100644 include/ns9750_mem.h delete mode 100644 include/ns9750_ser.h delete mode 100644 include/ns9750_sys.h Amicalement,