Tom Rini 0ce033d258 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>		2013-03-18 14:37:18 -04:00
..
clock.c	mxs: mmc: spi: dma: Better wrap the MXS differences	2013-03-07 17:22:56 +01:00
iomux.c	mxs: prefix register acessor macros with 'mxs' prefix	2012-09-01 14:58:17 +02:00
Makefile	mxs: rename mx28.c to mxs.c as it is common to i.MX233 and i.MX28 SoCs	2012-09-01 14:58:17 +02:00
mxs_init.h	mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT	2013-03-07 17:22:57 +01:00
mxs.c	mxs: Use __weak annotation to simplify code	2013-01-28 06:54:19 +01:00
spl_boot.c	mx23: SPL: Add boot mode support	2013-01-21 12:05:21 +01:00
spl_lradc_init.c	mxs: Reowork SPL to use 'mxs' prefix for methods	2012-09-01 14:58:17 +02:00
spl_mem_init.c	mx23: Document the tRAS lockout setting in memory initialization	2013-03-07 17:22:57 +01:00
spl_power_init.c	mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT	2013-03-07 17:22:57 +01:00
start.S	Replace __bss_end__ with __bss_end	2013-03-15 16:13:54 -04:00
timer.c	mxs: timrot: Rename local macros	2013-03-07 17:50:55 +01:00
u-boot-imx23.bd	mx23: config: Enable building of u-boot.sb binary	2013-01-21 12:05:21 +01:00
u-boot-imx28.bd	MX28: config: Allow different target generation in elftosb call	2012-09-01 14:58:27 +02:00
u-boot-spl.lds	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00