oweals/u-boot.git
13 years agocfi_flash: Fix problems with status/id read mode
Stefan Roese [Mon, 25 Oct 2010 16:31:29 +0000 (18:31 +0200)]
cfi_flash: Fix problems with status/id read mode

This patch adds some calls to set the flash chip in the read-status-
register- or read-id-mode before the corresponding register is
read back. This problem was detected while porting the common CFI
driver to support the Xilinx DS617 flash chips.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agopowerpc/nand spl: link libgcc
Scott Wood [Fri, 10 Dec 2010 21:13:39 +0000 (15:13 -0600)]
powerpc/nand spl: link libgcc

Recent GCC (4.4+) performs out-of-line epilogues in some cases, when
optimizing for size.  It causes a link error for _restgpr_30_x (and similar)
if libgcc is not linked.

It actually increases size with very small binaries, due to the fixed size
of the out-of-line code, and not having any functions that actually need to
restore more than 2 or 3 registers.  But I don't see a way to turn it off,
other than asking GCC to optimize for speed -- which may also increase
size for some boards.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Wolfgang Denk <wd@denx.de>
13 years agoMAINTAINERS: Transfer openrd_base maintainership to Prafulla Wadaskar
Simon Kagstrom [Sat, 11 Dec 2010 18:08:57 +0000 (23:38 +0530)]
MAINTAINERS: Transfer openrd_base maintainership to Prafulla Wadaskar

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
13 years agoArmada100: Add Board Support for Marvell Aspenite-DB
Prafulla Wadaskar [Mon, 29 Nov 2010 11:31:27 +0000 (17:01 +0530)]
Armada100: Add Board Support for Marvell Aspenite-DB

Aspenite is a Development Board for ASPEN/ARMADA168(88AP168) with
* Processor upto 1.2GHz
        * Parallel 1Gb x8 DDR2-1066 MHz
        * 16 Mb x16 NOR, 4Gb x8 SLC NAND, footprint for SPI NOR
        * Footprints for eMMC/eSD NAND & MMC x8 card
        * 4-in-1 card reader (xD, MMC/SD/MS Pro), CF True IDE socket
        * SEAF memory board, subset of PISMO2
    With Peripherals:
        * 4.3” WVGA 24-bit LCD
        * Audio codecs (AC97 & I2S), TSI
        * VGA camera
        * Video in via 3 RCA jacks, and HDMI type C out
        * Marvell 88W8688 802.11bg/BT module
        * GPS RF IC
        * Dual analog mics & speakers, headset jack, LED, ambient light sensor
        * USB2.0 HS host  (A), OTG (micro AB)
        * FE PHY, PCIE Mini Card  slot
        * GPIO, GPIO expander with DIP switches for easier selection UART serial over USB, CIR

This patch adds basic board support with DRAM and UART functionality
The patch is tested for boot from DRAM using XDB

Signed-off-by: Mahavir Jain <mjain@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agomv-common.h: Add support for ARMADA100 Platforms
Prafulla Wadaskar [Tue, 7 Dec 2010 15:28:35 +0000 (20:58 +0530)]
mv-common.h: Add support for ARMADA100 Platforms

This patch adds commonly used macros for ARMADA100 based
baords, Also some code reshuffled and updated for typos and comments

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoSerial: Add UART support for Marvell ARMADA 100 SoCs.
Prafulla Wadaskar [Wed, 27 Oct 2010 20:37:45 +0000 (02:07 +0530)]
Serial: Add UART support for Marvell ARMADA 100 SoCs.

ARMADA 100 SoCs has NS16550 compatible UART peripheral
This patch enables the same for ARMADA100 platforms

Signed-off-by: Mahavir Jain <mjain@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoSerial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro
Prafulla Wadaskar [Wed, 27 Oct 2010 16:28:31 +0000 (21:58 +0530)]
Serial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro

On some processors this ier register configuration is different
for ex. Marvell Armada100

This patch introduce CONFIG_SYS_NS16550_IER macro support to
unconditionally initialize this register.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoadd Multi Function Pin configuration support for ARMADA100
Prafulla Wadaskar [Tue, 7 Dec 2010 10:00:19 +0000 (15:30 +0530)]
add Multi Function Pin configuration support for ARMADA100

This patch adds the support MFP support for Marvell ARMADA100 SoCs

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agogpio: Add Multi-Function-Pin configuration driver for Marvell SoCs
Prafulla Wadaskar [Tue, 7 Dec 2010 09:53:39 +0000 (15:23 +0530)]
gpio: Add Multi-Function-Pin configuration driver for Marvell SoCs

Most of the Marvell SoCs has Multi Function Pin (MFP) configuration registers
For ex. ARMADA100.

These registers are programmed to expose the specific functionality
associated with respective SoC Pins

This driver provides configuration APIs,
using them, configuration need to be done in board specific code

for ex- following code configures MFPs 107 and 108 for UART_TX/RX functionality

int board_early_init_f(void)
{
        u32 mfp_cfg[] = {
                /* Console on UART1 */
                MFP107_UART1_RXD,
                MFP108_UART1_TXD,
                MFP_EOC         /*End of configureation*/
        };
        /* configure MFP's */
        mfp_config(mfp_cfg);
        return 0;
}

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoarm: Add Support for Marvell ARMADA 100 Familiy SoCs
Prafulla Wadaskar [Tue, 12 Oct 2010 11:01:40 +0000 (16:31 +0530)]
arm: Add Support for Marvell ARMADA 100 Familiy SoCs

ARMADA 100 Family processors are highly integrated SoCs
based on Sheeva_88SV331x-v5 PJ1 cpu core.
Ref: http://www.marvell.com/products/processors/applications/armada_100

SoC versions Supported:
1) ARMADA168/88AP168 (Aspen P)
2) ARMADA166/88AP166 (Aspen M)
3) ARMADA162/88AP162 (Aspen L)

Contributors:
Eric Miao <eric.y.miao@gmail.com>
Lei Wen <leiwen@marvell.com>
Mahavir Jain <mjain@marvell.com>

Signed-off-by: Mahavir Jain <mjain@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoMerge branch 'master' of ../master into next
Wolfgang Denk [Thu, 16 Dec 2010 22:00:53 +0000 (23:00 +0100)]
Merge branch 'master' of ../master into next

13 years agompc52xx: add support for tqm52xx based board charon
Heiko Schocher [Sat, 4 Dec 2010 07:34:04 +0000 (08:34 +0100)]
mpc52xx: add support for tqm52xx based board charon

- serial console in PSC1
- 128MiB DRAM
- 32MiB Flash
- FEC Ethernet
- 2 I2C busses
- FPGA on CS3
- IDE
- VGA SMI501

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Thu, 16 Dec 2010 21:49:16 +0000 (22:49 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agopm9261: enable cache command
Asen Dimov [Sun, 12 Dec 2010 10:41:36 +0000 (12:41 +0200)]
pm9261: enable cache command

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agopm9261: ARM relocation support
Asen Dimov [Sun, 12 Dec 2010 10:41:30 +0000 (12:41 +0200)]
pm9261: ARM relocation support

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agopm9263: enable cache command
Asen Dimov [Sun, 12 Dec 2010 10:42:09 +0000 (12:42 +0200)]
pm9263: enable cache command

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agopm9263: ARM relocation support
Asen Dimov [Sun, 12 Dec 2010 10:41:59 +0000 (12:41 +0200)]
pm9263: ARM relocation support

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agopm9g45: enable cache command
Asen Dimov [Sun, 12 Dec 2010 10:42:38 +0000 (12:42 +0200)]
pm9g45: enable cache command

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agopm9g45: ARM relocation support
Asen Dimov [Sun, 12 Dec 2010 00:42:28 +0000 (00:42 +0000)]
pm9g45: ARM relocation support

Signed-off-by: Asen Dimov <dimov@ronetix.at>
13 years agoppc4xx: Fix missing linker scripts for partial linking
Stefan Roese [Tue, 14 Dec 2010 16:49:52 +0000 (17:49 +0100)]
ppc4xx: Fix missing linker scripts for partial linking

This patch fixes the acadia_nand and kilauea_nand linker scripts
which have been missing in commit ee8028b7 [ppc4xx: Cleanup for
partial linking and --gc-sections]

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bernhard Weirich <Bernhard.Weirich@riedel.net>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Mon, 13 Dec 2010 23:18:19 +0000 (00:18 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 13 Dec 2010 23:06:00 +0000 (00:06 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agoARM: */start.S: use canonical asm syntax
Wolfgang Denk [Thu, 9 Dec 2010 10:26:24 +0000 (11:26 +0100)]
ARM: */start.S: use canonical asm syntax

Make code build with older tool chains.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agompc83xx: fix pcie enumeration
Baidu Boy [Mon, 29 Nov 2010 13:10:45 +0000 (21:10 +0800)]
mpc83xx: fix pcie enumeration

This patch fix a problem for the pcie enumeration for mpc83xx cpus.  Without
this we will not  get correct value in hose->regions[...].

The pointer *reg in function mpc83xx_pcie_init_bus() shall not be changed.
Because we will use this pointer as a parameter to call function
mpc83xx_pcie_register_hose().

Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agop1022ds: fix switching of DIU/LBC signals
Timur Tabi [Fri, 3 Dec 2010 19:03:45 +0000 (13:03 -0600)]
p1022ds: fix switching of DIU/LBC signals

On the P1022, the pins which drive the video display (DIU) are muxed with the
local bus controller (LBC), so if the DIU is active, the pins need to be
temporarily muxed to LBC whenever accessing NOR flash.

The code which handled this transition is checking and changing the wrong
bits in PMUXCR.

Also add a follow-up read after a write to NOR flash if we're going to
mux back to DIU after the write, as described in the P1022 RM.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after resetting the controller
P.V.Suresh [Sat, 4 Dec 2010 05:07:23 +0000 (10:37 +0530)]
fsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after resetting the controller

eSDHC host controller reset results in clearing of snoop bit also.
This patch sets the SNOOP bit after the completion of host controller reset.
Without this patch mmc reads are not consistent.

Signed-off-by: P.V.Suresh <pala@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_upm: Add MxMR/MDR synchronization
John Schmoller [Thu, 2 Dec 2010 17:43:10 +0000 (11:43 -0600)]
fsl_upm: Add MxMR/MDR synchronization

According to Freescale reference manuals (eg section "13.4.4.2
Programming the UPMs" of the P4080 Reference Manual):

"Since the result of any update to the MxMR/MDR register must be in
effect before the dummy read or write to the UPM region, a write to
MxMR/MDR should be followed immediately by a read of MxMR/MDR."

The UPM on a custom P4080-based board did not work without performing
a read of MxMR/MDR after a write.

Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agotsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII
Kumar Gala [Thu, 2 Dec 2010 04:55:54 +0000 (22:55 -0600)]
tsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII

The following commit:

commit 46e91674fb4b6d06c6a4984c0b5ac7d9a16923f4
Author: Peter Tyser <ptyser@xes-inc.com>
Date:   Tue Nov 3 17:52:07 2009 -0600

    tsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode

Removed setting Auto-Neg by default, however this is believed to be
proper default configuration for initialization of the TBI interface.

Instead we explicitly set CONFIG_TSEC_TBICR_SETTINGS for the
XPedite5370 & XPedite5500 boards that use a Broadcomm PHY which require
Auto-Neg to be disabled to function properly.

This addresses a breakage on the P2020 DS & MPC8572 DS boards when used
with an SGMII riser card.  We also remove setting
CONFIG_TSEC_TBICR_SETTINGS on the P1_P2_RDB family of boards as now the
default setting is sufficient for them.

Additionally, we clean up the code a bit to remove an unnecessary second
define.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Peter Tyser <ptyser@xes-inc.com>
13 years agoomap3: emif|sdrc: use a single global data define
Nishanth Menon [Sat, 11 Dec 2010 16:41:42 +0000 (11:41 -0500)]
omap3: emif|sdrc: use a single global data define

DECLARE_GLOBAL_DATA_PTR declarations in functions are inherently
troublesome with various compilers (e.g. gcc 4.5)

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP3: SPI driver
Dirk Behme [Sat, 11 Dec 2010 16:01:00 +0000 (11:01 -0500)]
OMAP3: SPI driver

CC: Ruslan N. Araslanov <byaaka@yandex.ru>
Signed-off-by: Ruslan Araslanov <ruslan.araslanov@vitecmm.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP4: twl6030 add battery charging support
Balaji T K [Thu, 25 Nov 2010 10:52:04 +0000 (16:22 +0530)]
ARMV7: OMAP4: twl6030 add battery charging support

Add battery charging support twl6030 driver.
Add support for battery voltage and current measurements.
Add command to get battery status and start/stop battery charging from USB.

Signed-off-by: Balaji T K <balajitk@ti.com>
Tested-by: Steve Sakoman <steve.sakoman@linaro.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP: Timer: Replace bss variable by gd
Dirk Behme [Sat, 11 Dec 2010 15:50:48 +0000 (10:50 -0500)]
OMAP: Timer: Replace bss variable by gd

Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc bss
values in the OMAP timer driver.

The usage of bss values in drivers before initialisation of bss is forbidden.
In that special case some data in .rel.dyn gets corrupted.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Tested-by: Steve Sakoman <steve.sakoman@linaro.org>
Tested-by: John Rigby <john.rigby@linaro.org>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Tested-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDaVinci DM6446: Config Update
Sandeep Paulraj [Sat, 11 Dec 2010 15:47:30 +0000 (10:47 -0500)]
DaVinci DM6446: Config Update

The DM6446 does not build due to the ARM
relocation patch.

Also the board does not build in the NOR
mode. Changed default to NAND to ensure
no build failure.
While at it removed CONFIG_CMD_KGDB

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agodavinci: Rewrite timer.c to use tbl/tbu emulation variables in gd
Nick Thompson [Sat, 11 Dec 2010 15:46:46 +0000 (10:46 -0500)]
davinci: Rewrite timer.c to use tbl/tbu emulation variables in gd

This change allows the davinci timer functions to be used before
relocation since it avoids using static variables prior to BSS being
made available.

The code is based on that used in the at91 timers, modified to use
a davinci specific hardware timer. It also maintains reset_timer()
to allow deprecated timer usage to continue to work (for example,
in nand_base.c)

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Tested-by: Ben Gardiner <bengardiner@nanometrics.ca>
Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Tested-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMerge branch 'next' of git://git.denx.de/u-boot into next
Sandeep Paulraj [Sat, 11 Dec 2010 15:35:40 +0000 (10:35 -0500)]
Merge branch 'next' of git://git.denx.de/u-boot into next

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-imx
Wolfgang Denk [Thu, 9 Dec 2010 19:52:44 +0000 (20:52 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-imx

13 years agoinclude/linux/mii.h: update for supporting GE
Macpaul Lin [Fri, 3 Dec 2010 05:52:34 +0000 (13:52 +0800)]
include/linux/mii.h: update for supporting GE

This file has been synced (copy) from Linux source code.
This commit was based on kernel 2.6.32.
It updates gigabit related phy registers and basic definitions.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoARM: make timer variables in gt_t available for all ARM platforms
Prafulla Wadaskar [Wed, 1 Dec 2010 12:16:52 +0000 (17:46 +0530)]
ARM: make timer variables in gt_t available for all ARM platforms

All code that attemots to access variables in BSS before relocation
(for example directly or indirectly by board_init_f()) needs to be
fixed. Especially timer.c needs to fix on most of the ARM platforms.

This patch makes timer related variables in gd_t available for
all ARM implementations.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoarmv7: fix relocation skip
Andreas Bießmann [Tue, 30 Nov 2010 23:58:36 +0000 (00:58 +0100)]
armv7: fix relocation skip

I doubt the stack_setup() was defective before:
 we load the current location of _start and compare against destination
 of relocate_code(). If we are already there we shoud skip the
 relocation and jump over to clear_bss. Before the clear_bss was also skipped.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: fixloop(): do not use r8 for relocation
Andreas Bießmann [Tue, 30 Nov 2010 23:58:35 +0000 (00:58 +0100)]
arm: fixloop(): do not use r8 for relocation

r8 is used for global_data and should therefore be left alone!

For C code the compiler flag --fixed-r8 does the job, but in assembler
we need to be aware of that fact.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: relocate_code(): do not set register useless
Andreas Bießmann [Tue, 30 Nov 2010 23:58:34 +0000 (00:58 +0100)]
arm: relocate_code(): do not set register useless

In case we are still at relocation target address before relocation we
do not need to load the registers needed for relocation. We should
instead skip the whole relocation part and jump over to clear_bss
immediately.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm: copy_loop(): use scratch register
Andreas Bießmann [Tue, 30 Nov 2010 23:58:33 +0000 (00:58 +0100)]
arm: copy_loop(): use scratch register

This patch uses r1 as scratch register for copy_loop(). Therefore we do
not longer need r7 for the storage of relocate_code()'s 'addr_moni' (the
destination address of relocation).
Therefore r7 can be used later on for other purposes.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agohwconfig: Fix handling of env_hwconfig, board_hwconfig, and cpu_hwconfig
Kumar Gala [Tue, 30 Nov 2010 21:58:27 +0000 (15:58 -0600)]
hwconfig: Fix handling of env_hwconfig, board_hwconfig, and cpu_hwconfig

The handling of env_hwconfig, board_hwconfig, and cpu_hwconfig got
broken when we removed the boards defining dummy board_hwconfig
& cpu_hwconfig values.

We fix this by handling the various strings in priority order.  If
hwconfig_parse returns NULL for a given string we check the next one
in order (env_hwconfig, board_hwconfig, followed by cpu_hwconfig).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMove LDSCRIPT definitions to board config files.
Wolfgang Denk [Sun, 28 Nov 2010 20:18:58 +0000 (21:18 +0100)]
Move LDSCRIPT definitions to board config files.

Recent cleanup actions resulted in a number of config.mk files that
contained only LDSCRIPT definitions.  Move these into th respective
board config files and remove the now empty config.mk files.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Cc: Peter De Schrijver <p2@mind.be>
Acked-by: Detlev Zundel < dzu@denx.de>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Heiko Schocher<hs@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
13 years agoRemove redundant config.mk files
Wolfgang Denk [Sun, 28 Nov 2010 20:18:57 +0000 (21:18 +0100)]
Remove redundant config.mk files

Recent cleanup actions resulted in a number of config.mk files that
contained only redundant entries like

PLATFORM_CPPFLAGS += -I$(TOPDIR)

or settings of variables that were not used anywhere in the code, like

TEXT_END  = 0xfe080000

Remove these unnecessary files.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Scott McNutt <smcnutt@psyent.com>
Cc: Wolfgang Wegner <w.wegner@astro-kom.de>
Cc: Josef Wagner <Wagner@Microsys.de>
Cc: Tolunay Orkun <torkun@nextio.com>
Cc: Frank Panno <fpanno@delphintech.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Brad Kemp <Brad.Kemp@seranoa.com>
Acked-by: Heiko Schocher<hs@denx.de>
13 years agoDavinci: add support for the ea20 board
Stefano Babic [Tue, 30 Nov 2010 16:46:56 +0000 (11:46 -0500)]
Davinci: add support for the ea20 board

This board uses the OMAP-L138 SOM stacked on a
custom baseboard. It supports SPI Flash, Ethernet
with RMII.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDavinci 8xx: Move common functions to share code
Stefano Babic [Tue, 30 Nov 2010 16:32:10 +0000 (11:32 -0500)]
Davinci 8xx: Move common functions to share code

As more Davinci 8xx board can be added, move common code
to be shared between boards.

 * rebased ontop of Sugosh's patches
 * moving the HAWKBOARD_KICK{0,1}_UNLOCK defines to
   arch/arm/include/asm/arch-davinci/davinci_misc.h from to
   arch/arm/include/asm/arch-davinci/da8xx_common.h
 * don't define dram functions in PRELOADER
 * move sync_env_enetaddr into existing EMAC ifdef
 * use misc.c in hawkboard nand_spl

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda850: Add RMII support for EMAC
Sudhakar Rajashekhara [Thu, 18 Nov 2010 14:59:37 +0000 (09:59 -0500)]
da850: Add RMII support for EMAC

This patch is a port of the work by Sudhakar Rajeshekhara in commit
ab3effbcad8851cc65dc5241a01c064d2030a3b2 of
git://arago-project.org/git/people/sandeep/u-boot-davinci.git.

The da850 UI board has on it an RMII PHY which can be used if the MDC line
to the MII PHY on the baseboard is disabled and the RMII PHY is enabled by
configuring the values of some GPIO pins on the IO expander of the UI board.
This patch implements disabling that line via GPIO2[6], configuring the UI
board's IO expander and setting only the pinmux settings that are needed for
RMII operation.

Tested on da850evm by adding a define for CONFIG_DRIVER_TI_EMAC_USE_RMII.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Sandeep Paulraj <s-paulraj@ti.com>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Mike Frysinger <vapier@gentoo.org>
CC: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoAdd board support for hawkboard
Sughosh Ganu [Tue, 30 Nov 2010 16:25:01 +0000 (11:25 -0500)]
Add board support for hawkboard

The patch adds basic board support for TI's OMAP-L138 based
Hawkboard. This board is pretty similar to the da850 EVM. Support for
nand and network access is added in this version.

The following bootup procedure is used.

At reset, the Rom Boot Loader(RBL), initialises the ddr and the nand
controllers and copies the second stage bootloader(nand_spl) to
RAM. The secondary bootloader then copies u-boot from a predefined
location in the nand flash to the RAM, and passes control to the
u-boot image.

Three config options are supported
* hawkboard_config - Used to create the u-boot.bin. Tftp the
 u-boot.bin image to the RAM from u-boot, and flash to the nand flash
 at address 0xe0000.

* hawkboard_nand_config - Used to generate the secondary
 bootloader(nand_spl) image. This creates an elf file u-boot-spl
 under nand_spl/. Create an AIS signed image using this file, and
 flash it to the nand flash at address 0x20000. The ais file should
 fit in one block.

* hawkboard_uart_config - This is same as the first image, but with
 the TEXT_BASE as expected by the RBL(0xc1080000). Create the AIS

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoRemove board_init_f function from nand_boot.c
Sughosh Ganu [Mon, 29 Nov 2010 01:21:58 +0000 (20:21 -0500)]
Remove board_init_f function from nand_boot.c

Remove the board_init_f function from nand_spl/nand_boot.c. This
 function is to be defined by all boards using the nand_spl
 functionality in their individual board directory.

 Currently this function was being used by the smdk6400 board. Added
 the board specific function definition.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMove and rename common headers from under
Sughosh Ganu [Mon, 29 Nov 2010 01:21:27 +0000 (20:21 -0500)]
Move and rename common headers from under

board/davinci.

 Move the davinci common headers to the architecture specific
 include file path.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda850: Enable SPI Flash
Stefano Babic [Thu, 11 Nov 2010 14:38:02 +0000 (15:38 +0100)]
da850: Enable SPI Flash

The patch was already posted to the arago project,
but not yet to mainline. It allows to save environment into
the spi flash. Tested on LogiPD tmdxl138.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Detlev Zundev <dzu@denx.de>
CC: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda8xx: Add cpu_is_da8xx macros
Sudhakar Rajashekhara [Thu, 11 Nov 2010 14:38:01 +0000 (15:38 +0100)]
da8xx: Add cpu_is_da8xx macros

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Detlev Zundev <dzu@denx.de>
CC: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agopl01x: use C structs and readl/writel
Rabin Vincent [Wed, 5 May 2010 03:53:07 +0000 (09:23 +0530)]
pl01x: use C structs and readl/writel

Use C structs for registers, and use readl/writel instead of custom
accessors.

Acked-by: Michael Brandt <michael.brandt@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
13 years agoadd Xilinx_abort_fn to Xilinx_Spartan3_Slave_Serial_fns
Wolfgang Wegner [Fri, 23 Apr 2010 09:08:05 +0000 (11:08 +0200)]
add Xilinx_abort_fn to Xilinx_Spartan3_Slave_Serial_fns

Currently the hardware was left in an undefined state in case Spartan3
serial load failed. This patch adds Xilinx_abort_fn to give the board
a possibility to clean up in this case.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
13 years agoext2: constify file/dir names
Mike Frysinger [Wed, 20 Oct 2010 11:18:09 +0000 (07:18 -0400)]
ext2: constify file/dir names

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agostdio: constify "name" arg in public api
Mike Frysinger [Wed, 20 Oct 2010 11:18:03 +0000 (07:18 -0400)]
stdio: constify "name" arg in public api

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoarm: add 8-byte alignment for ABI compliance before board_init_f
Heiko Schocher [Fri, 12 Nov 2010 06:53:55 +0000 (07:53 +0100)]
arm: add 8-byte alignment for ABI compliance before board_init_f

suggested from Daniel Hobi<daniel.hobi@schmid-telecom.ch>

Tested on following boards:
arm1136: qong
armv7: omap3_beagle
arm926ejs: magnesium, tx25

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
cc: Albert ARIBAUD <albert.aribaud@free.fr>

13 years agoARMV7: Vexpress: Fix build error
Dirk Behme [Mon, 29 Nov 2010 18:56:59 +0000 (19:56 +0100)]
ARMV7: Vexpress: Fix build error

Fix ca9x4_ct_vxp build error

Configuring for ca9x4_ct_vxp board...
board/armltd/vexpress/libvexpress.o: In function `udelay':
u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c:161: multiple
definition of `udelay'
lib/libgeneric.o:u-boot.git/lib/time.c:34: first defined here

lib/libgeneric.o: In function `udelay':

zlib.c:(.text+0x1ee8): undefined reference to `__udelay'

Signed-of-by: Dirk Behme <dirk.behme@googlemail.com>
13 years agoARMV7: Vexpress: fix compile warnings
Matt Waddel [Tue, 2 Nov 2010 23:25:21 +0000 (17:25 -0600)]
ARMV7: Vexpress: fix compile warnings

Fixed "pointer from integer without a cast" warnings in Vexpress.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
13 years agoARMV7: Vexpress: fix build errors
Matt Waddel [Thu, 2 Dec 2010 19:43:14 +0000 (12:43 -0700)]
ARMV7: Vexpress: fix build errors

This patch fixes build errors in the vexpress system:
  - Removed sys_proto.h requirement from syslib.c.
  - Switched vexpress to the default armv7 linker script.
  - Renamed TEXT_BASE to CONFIG_SYS_TEXT_BASE.

Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 8 Dec 2010 22:17:57 +0000 (23:17 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agoonenand: fix oob print out issue
Lei Wen [Tue, 7 Dec 2010 01:38:18 +0000 (09:38 +0800)]
onenand: fix oob print out issue

Seems original implementation forget to set the pointer to point
to the oobbuf, so when we want to see oob buf, we see nothing...
Fix it by get pointer as the oobbuf set.

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoarm920t/at91/timer: replace bss variables by gd
Andreas Bießmann [Tue, 30 Nov 2010 09:45:06 +0000 (09:45 +0000)]
arm920t/at91/timer: replace bss variables by gd

Reuse the gd->tbl value for timestamp and add gd->lastinc for lastinc
bss values in arm920t/at91/timer driver.
The usage of bss values in driver before initialisation of bss is
forbidden. In that special case some data in .rel.dyn gets corrupted by
the arm920t/at91/timer driver.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoarm920t/at91/reset: board_reset: define weak symbol
Andreas Bießmann [Tue, 30 Nov 2010 09:45:05 +0000 (09:45 +0000)]
arm920t/at91/reset: board_reset: define weak symbol

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
13 years agoMAKEALL: fix AT91
Andreas Bießmann [Tue, 30 Nov 2010 09:45:04 +0000 (09:45 +0000)]
MAKEALL: fix AT91

* add boards_by_soc()
 * remove boards already in boards.cfg from LIST_AT91

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoat91rm9200ek: add configure target for RAM boot
Andreas Bießmann [Tue, 30 Nov 2010 09:45:03 +0000 (09:45 +0000)]
at91rm9200ek: add configure target for RAM boot

This patch also removes now unnecessary config.mk in board directory and
make usage of new features in boards.cfg.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoat91rm9200ek: fix SDRAM initialistation values
Andreas Bießmann [Sat, 4 Dec 2010 11:31:46 +0000 (11:31 +0000)]
at91rm9200ek: fix SDRAM initialistation values

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
13 years agoAT91: add TOP9000 support
Reinhard Meyer [Sat, 30 Oct 2010 23:09:58 +0000 (23:09 +0000)]
AT91: add TOP9000 support

Adds support for the EMK TOP9000 CPU Module which is
based on ATMELs ARM926EJS AT91SAM9XE SoC.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: fix EMAC gpio init in at91sam9260_devices.c
Reinhard Meyer [Wed, 1 Dec 2010 04:49:53 +0000 (05:49 +0100)]
AT91: fix EMAC gpio init in at91sam9260_devices.c

The AT91SAM9G20 BOOT ROM apparently initializes PA23 and PA24 to multi drive
(open drain). Revert this, if those pins are going to be used for MII.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agoAT91: gen_atmel_mci.c: fix bug when Slot B is used
Reinhard Meyer [Tue, 16 Nov 2010 08:24:41 +0000 (09:24 +0100)]
AT91: gen_atmel_mci.c: fix bug when Slot B is used

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years ago83xx NAND boot: fix boards.cfg
Scott Wood [Tue, 7 Dec 2010 00:42:02 +0000 (18:42 -0600)]
83xx NAND boot: fix boards.cfg

This patch http://patchwork.ozlabs.org/patch/72962/ included a boards.cfg
change, but it was omitted when applied as
f1c574d4006d81301792e70fafc31ff39259e793

This fixes the NAND SPL build on MPC8315ERDB.

Signed-off-by: Scott Wood <scottwood@freescale.com>
13 years agofix s3c2410_nand timing default values
David Müller (ELSOFT AG) [Mon, 29 Nov 2010 05:49:19 +0000 (05:49 +0000)]
fix s3c2410_nand timing default values

The attached patch fixes wrong timing default values and adds the
possibility to specify board specific timing value in the board config file.

Signed-off-by: David Mueller <d.mueller@elsoft.ch>
13 years agoenv_nand: Use nand_read_skip_bad instead of nand_read
Steve Sakoman [Fri, 3 Dec 2010 13:25:43 +0000 (13:25 +0000)]
env_nand: Use nand_read_skip_bad instead of nand_read

The nand-read function returns an error code if correctable errors have occurred.
This is not desirable, since the errors have been corrected!

This patch switches to the nand_read_skip_bad function which does not
return an error code if the errors are correctable.

Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
Acked-by: Scott Wood <scottwood@freescale.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Mon, 6 Dec 2010 22:45:35 +0000 (23:45 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-video

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Mon, 6 Dec 2010 22:44:06 +0000 (23:44 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

13 years agoubifs.c: BUG: Error following links
Ricardo Ribalda Delgado [Thu, 2 Dec 2010 14:02:35 +0000 (15:02 +0100)]
ubifs.c: BUG: Error following links

The link_name variable is declared inside the if block and it is used
outside it through the name pointer.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change
Stefan Roese [Mon, 1 Nov 2010 16:28:22 +0000 (17:28 +0100)]
UBI/UBIFS: Automatically unmount UBIFS volume upon UBI partition change

Automatically unmount UBIFS partition when user changes the UBI device.
Otherwise the following UBIFS commands will crash.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Change ubifsload to not read beyond the requested size
Stefan Roese [Mon, 1 Nov 2010 16:28:00 +0000 (17:28 +0100)]
UBIFS: Change ubifsload to not read beyond the requested size

Until now ubifsload pads the destination with 0 up to a multiple of
UBIFS_BLOCK_SIZE (4KiB) while reading a file to memory. This patch
changes this behaviour to only read to the requested length. This
is either the file length or the length/size provided as parameter
to the ubifsload command.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Change "ubifs mount" to "ubifsmount" in ubifsls output
Stefan Roese [Thu, 28 Oct 2010 12:09:29 +0000 (14:09 +0200)]
UBIFS: Change "ubifs mount" to "ubifsmount" in ubifsls output

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoUBIFS: Add ubifsumount command to unmount an active volume
Stefan Roese [Thu, 28 Oct 2010 12:09:22 +0000 (14:09 +0200)]
UBIFS: Add ubifsumount command to unmount an active volume

This new ubifsumount command allows the user to unmount a previously
mounted UBIFS volume.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agompc512x: aria: cleanup board config file
Anatolij Gustschin [Mon, 29 Nov 2010 21:36:39 +0000 (22:36 +0100)]
mpc512x: aria: cleanup board config file

CONFIG_FSL_DIU_LOGO_BMP has been removed while refactoring
MPC8610 and MPC5121 DIU code, so remove it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
13 years agovideo: move fsl_diu_fb driver to drivers/video
Anatolij Gustschin [Mon, 29 Nov 2010 20:17:37 +0000 (21:17 +0100)]
video: move fsl_diu_fb driver to drivers/video

Since the driver is used not only on Freescale boards,
we move it to a common place for video drivers as
suggested by Wolfgang. The patch also cleans up the
top level Makefile.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
13 years agopowerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined
Haiying Wang [Wed, 1 Dec 2010 15:35:30 +0000 (10:35 -0500)]
powerpc/85xx: do not reloc l2srbar if CONFIG_FLASH_BASE is not defined

This fixes the compiling error for the board  which doesn't have NOR flash
(so CONFIG_FLASH_BASE is not defined)

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Enable HWCONFIG on MPC8572DS
Kumar Gala [Fri, 19 Nov 2010 14:53:25 +0000 (08:53 -0600)]
powerpc/85xx: Enable HWCONFIG on MPC8572DS

We need HWCONFIG to allow configuration of DDR params

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems
Kumar Gala [Wed, 1 Dec 2010 12:42:04 +0000 (06:42 -0600)]
powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems

We intended to use the PIC TFRR register however we where missing adding
in the PIC register base offset from IMMR when we defined
_POST_WORD_ADDR.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 21:13:32 +0000 (22:13 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agoMerge branch 'next' of git://git.denx.de/u-boot-arm into next
Wolfgang Denk [Tue, 30 Nov 2010 21:13:15 +0000 (22:13 +0100)]
Merge branch 'next' of git://git.denx.de/u-boot-arm into next

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 30 Nov 2010 21:12:36 +0000 (22:12 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

13 years agohwconfig: Fix dummy initialization of {board, cpu}_hwconfig
Kumar Gala [Tue, 30 Nov 2010 21:01:28 +0000 (15:01 -0600)]
hwconfig: Fix dummy initialization of {board, cpu}_hwconfig

Since board_hwconfig & cpu_hwconfig are defined as weak and dont have a
default value they will get put into the BSS if they aren't defined
elsewhere.  This is problematic as we try to utilize hwconfig before
we've relocated and thus BSS isn't setup.

Instead of giving dummy values in the board files that utilize this
feature, we can just initialize the variables to an empty string and
thus move them out of the BSS if they aren't defined elsewhere.

Also made board_hwconfig & cpu_hwconfig arrays to reduce size associated
with string pointers vs arrays.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC
Kumar Gala [Mon, 29 Nov 2010 20:32:11 +0000 (14:32 -0600)]
powerpc/85xx: Introduce CONFIG_SYS_EXTRA_ENV_RELOC

Some systems need to relocate the env_addr pointer early because the
location it points to will get invalidated before env_relocate is
called.  One example is on systems that might use a L2 or L3 cache
in SRAM mode and initialize that cache from SRAM mode back to being
a cache in cpu_init_r.

We set this on the 85xx boards that have support for NAND, SPI, or
SDHC/MMC boot support as they use a secondary cache in SRAM mode and
need the env_addr pointer relocated since we change from SRAM to normal
cache mode in cpu_init_r.

Also removed CONFIG_SYS_SPL as its not used anywhere.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopl01x: use C structs and readl/writel
Rabin Vincent [Wed, 5 May 2010 03:53:07 +0000 (09:23 +0530)]
pl01x: use C structs and readl/writel

Use C structs for registers, and use readl/writel instead of custom
accessors.

Acked-by: Michael Brandt <michael.brandt@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
13 years agoadd Xilinx_abort_fn to Xilinx_Spartan3_Slave_Serial_fns
Wolfgang Wegner [Fri, 23 Apr 2010 09:08:05 +0000 (11:08 +0200)]
add Xilinx_abort_fn to Xilinx_Spartan3_Slave_Serial_fns

Currently the hardware was left in an undefined state in case Spartan3
serial load failed. This patch adds Xilinx_abort_fn to give the board
a possibility to clean up in this case.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-samsung
Wolfgang Denk [Tue, 30 Nov 2010 20:30:13 +0000 (21:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-samsung

13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 20:28:10 +0000 (21:28 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Tue, 30 Nov 2010 20:28:03 +0000 (21:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Tue, 30 Nov 2010 20:15:25 +0000 (21:15 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agompc83xx: Make it boot again
Joakim Tjernlund [Fri, 19 Nov 2010 13:15:33 +0000 (14:15 +0100)]
mpc83xx: Make it boot again

After the removal of COLD/WARM start flags my mpc8321
board didn't boot anymore.
Trial and error suggests that map/remap_flash_by_xxx needs
to wait after updating LBLAWAR1 to make sure the the change has
reached the HW before continuing with the code that depends on it.
Final fix suggested by Scott Wood.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agompc83xx: Fix for MPC8360 ATM Quad OC3 External Phys
Stefan Popa [Fri, 26 Nov 2010 17:09:40 +0000 (17:09 +0000)]
mpc83xx: Fix for MPC8360 ATM Quad OC3 External Phys

Changed the CS4 and CS5 addresses on Local Bus for matching the PMC0
and PMC1 addresses.

Signed-off-by: Stefan Popa <Stefan.Popa@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
13 years agoDavinci: add support for the ea20 board
Stefano Babic [Tue, 30 Nov 2010 16:46:56 +0000 (11:46 -0500)]
Davinci: add support for the ea20 board

This board uses the OMAP-L138 SOM stacked on a
custom baseboard. It supports SPI Flash, Ethernet
with RMII.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>