platform/kernel/u-boot.git
14 years agoTQM8xx: add device tree support for TQM8xx based boards.
Heiko Schocher [Tue, 9 Feb 2010 14:50:21 +0000 (15:50 +0100)]
TQM8xx: add device tree support for TQM8xx based boards.

Also use hwconfig to configure whether the board has a FEC or not.
We then can adjust the DTS to tell Linux if there is a FEC present.

syntax:

hwconfig=fec:on   if hardware has a  FEC
hwconfig=fec:off  if hardware has no FEC

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMove CONFIG_UPDATE_TFTP code after CONFIG_PREBOOT
Wolfgang Denk [Thu, 11 Mar 2010 22:56:03 +0000 (23:56 +0100)]
Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOT

The auto-update feature (CONFIG_UPDATE_TFTP) requires that the env
variable serverip be set for the TFTP access. If DHCP is to be used
to get the serverip env variable, this doesn't work as DHCP happens
after the auto-update attempt has run. A solution is to run DHCP in
PREBOOT, but even this is too late.

To solve this, we move update_tftp() below the PREBOOT stuff.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agomkimage: dont force entry point with xip
Mike Frysinger [Mon, 25 Jan 2010 23:50:11 +0000 (18:50 -0500)]
mkimage: dont force entry point with xip

Some people boot images with the entry point in the middle of the blob
(like Linux with the head code in discardable .init.text), and there is no
no real requirement that the entry point be right after the mkimage header
when doing XIP, so let people specify whatever they want.  If they do need
an entry right after the header, then they still can do that with normal
-e behavior.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoPPC: Record U-Boot's relocated address in RAM and show in bdinfo.
Richard Retanubun [Fri, 15 Jan 2010 15:06:06 +0000 (10:06 -0500)]
PPC: Record U-Boot's relocated address in RAM and show in bdinfo.

This patch uses gd->relocaddr variable to store uboot's relocated
address in RAM and shows it in bdinfo command.

This patch moves CONFIG_AMIGAONEG3SE style copying of the address
in board_init_f to just before relocation is actually done.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Tested-by: Detlev Zundel <dzu@denx.de>
14 years agoFix memory leak in mmc_read()
Wolfgang Denk [Thu, 11 Mar 2010 22:35:43 +0000 (23:35 +0100)]
Fix memory leak in mmc_read()

There is be a path through mmc_read in drivers/mmc/mmc.c where
malloc'd memory is not freed before exiting mmc_read: it occurs if
mmc_set_blocklen() returns a non-zero value.

Reported-by: Quentin Armitage <Quentin@Armitage.org.uk>
Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoAT91: Update otc570 board to new SoC access
Daniel Gorsulowski [Thu, 11 Feb 2010 13:57:04 +0000 (14:57 +0100)]
AT91: Update otc570 board to new SoC access

* convert otc570 board to use c stucture SoC access
* change gpio access to at91_gpio syntax

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
14 years agoupdates the at91 main_clock calculation
Jens Scharsig [Sun, 14 Feb 2010 11:20:43 +0000 (12:20 +0100)]
updates the at91 main_clock calculation

* updates the conditional main_clock calculation (if AT91_MAIN_CLOCK defined) to c structure SoC access
 * add need register flags

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoarm: kirkwood: suen3: fixed build warning
Prafulla Wadaskar [Wed, 3 Mar 2010 09:57:37 +0000 (15:27 +0530)]
arm: kirkwood: suen3: fixed build warning

This patch fixes following build warning

Invalid Kwbimage command Type - valid names are: BOOT_FROM, NAND_ECC_MODE, NAND_PAGE_SIZE, SATA_PIO_MODE, DDR_INIT_DELAY, DATA, , spi, nand, sata, pex, uart

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
14 years agoMX51: removed warnings for the mx51evk
Stefano Babic [Fri, 5 Mar 2010 16:54:37 +0000 (17:54 +0100)]
MX51: removed warnings for the mx51evk

The patch removes warnings at compile time and provides
some cleanup code:
- Removed comment on NAND (not yet supported) from lowlevel_init.S
- Removed NFMS bit definition from imx-regs.h
  The bit is only related to MX.25/35 and can lead to confusion
- Moved is_soc_rev() to soc specific code (removed from mx51evk.c)

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agoSPEAr : Supporting new mach ids for spear310 and spear320
Vipin Kumar [Tue, 2 Mar 2010 05:16:52 +0000 (10:46 +0530)]
SPEAr : Supporting new mach ids for spear310 and spear320

Supporting new machine ids for SoCs spear310 and spear320

include/asm-arm/mach-types.h has to be updated before applying
this patch for build to work

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
14 years agoarm, suen3: fix compile error, if doing not a local build
Heiko Schocher [Mon, 1 Mar 2010 14:58:18 +0000 (15:58 +0100)]
arm, suen3: fix compile error, if doing not a local build

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoarm: add support for the suen3 board from keymile
Heiko Schocher [Mon, 22 Feb 2010 11:13:02 +0000 (16:43 +0530)]
arm: add support for the suen3 board from keymile

Add support for the ARM part of the mgcoge2, named suen3.
This board is based on the Marvell Kirkwood (88F6281) SoC.
As there come more board variants, common config options
are collected in include/configs/km_arm.h. Also, this board
use common code for all keymile boards, which is stored in
board/keymile/common/common.c

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoAdd support for KARO TX25 board
John Rigby [Tue, 26 Jan 2010 06:12:58 +0000 (23:12 -0700)]
Add support for KARO TX25 board

This is an i.MX25 base board with only NAND
so it uses nand_spl to boot.

Signed-off-by: John Rigby <jcrigby@gmail.com>
Tune configuration, add support for (redundant) environment in NAND.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
CC: Fred Fan <fanyefeng@gmail.com>
CC: Tom <Tom.Rix@windriver.com>
14 years agofec_mxc: add MX25 support
John Rigby [Tue, 26 Jan 2010 06:12:57 +0000 (23:12 -0700)]
fec_mxc: add MX25 support

Use RMII for MX25
Add code to init gasket that enables RMII

Signed-off-by: John Rigby <jcrigby@gmail.com>
CC: Ben Warren <biggerbadderben@gmail.com>
14 years agofec_mxc: cleanup and factor out MX27 dependencies
John Rigby [Tue, 26 Jan 2010 06:12:55 +0000 (23:12 -0700)]
fec_mxc: cleanup and factor out MX27 dependencies

general cleanup
move clock init to cpu_eth_init in cpu/arm926ejs/mx27/generic.c
make MX27 specific phy init conditional on CONFIG_MX27
replace call to imx_get_ahbclk with one to imx_get_fecclk
and define imx_get_fecclk in include/asm-arm/arch-mx27/clock.h

Signed-off-by: John Rigby <jcrigby@gmail.com>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Fred Fan <fanyefeng@gmail.com>
CC: Tom <Tom.Rix@windriver.com>
14 years agoAdd support for Freescale MX25 SOC
John Rigby [Tue, 26 Jan 2010 06:12:56 +0000 (23:12 -0700)]
Add support for Freescale MX25 SOC

ARM926EJS core with MX31 peripherals.

Signed-off-by: John Rigby <jcrigby@gmail.com>
Earlier Version Signed-off-by: Wolfgang Denk <wd@denx.de>
CC: Fred Fan <fanyefeng@gmail.com>
CC: Tom <Tom.Rix@windriver.com>
14 years agomxc_serial replace platform specific clock
John Rigby [Tue, 26 Jan 2010 06:12:51 +0000 (23:12 -0700)]
mxc_serial replace platform specific clock

remove ifdef'd clock selection code from
serial_mxc.c and replace with call to imx_get_uartclk

Add definitions for imx_get_uartclk to imx31 and imx27
include files.

This makes it easier to add new imx platforms.

Signed-off-by: John Rigby <jcrigby@gmail.com>
14 years agoAdd initial support for Freescale mx51evk board
Stefano Babic [Fri, 5 Feb 2010 14:13:58 +0000 (15:13 +0100)]
Add initial support for Freescale mx51evk board

The patch adds initial support for the Freescale mx51evk board.
Network (FEC) and SD controller (fsl_esdhc) are supported.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fred Fan <fanyefeng@gmail.com>
14 years agofsl_esdhc: add support for mx51 processor
Stefano Babic [Fri, 5 Feb 2010 14:11:27 +0000 (15:11 +0100)]
fsl_esdhc: add support for mx51 processor

The esdhc controller in the mx51 processor is quite
the same as the one in some powerpc processors
(MPC83xx, MPC85xx). This patches adapts the driver
to support the arm mx51.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agoARM: add accessors functions
Stefano Babic [Fri, 5 Feb 2010 14:07:33 +0000 (15:07 +0100)]
ARM: add accessors functions

Some Freescale's processors of different architecture
have the same peripheral (eSDHC controller in PowerPC
and i.MX51). This patch adds accessors for
the internal registers of the SOCs, as already
implemented in the PowerPC architecture.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agoMMC: add weak function to detect MMC/SD card
Stefano Babic [Fri, 5 Feb 2010 14:04:43 +0000 (15:04 +0100)]
MMC: add weak function to detect MMC/SD card

Most controllers can check if there is a card in the slot.
However, they require pins that could be not available because
required by other functions and the detection of a card must
be performed in another way. This patch adds a weak function
that a board can implement to add its internal custom way
to check the presence of a MMC/SD card.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agommc: check correctness of the voltage mask in ocr
Stefano Babic [Wed, 20 Jan 2010 17:20:39 +0000 (18:20 +0100)]
mmc: check correctness of the voltage mask in ocr

Most cards do not answer if some reserved bits
in the ocr are set. However, some controllers
can set bit 7 (reserved for low voltages), but
how to manage low voltages SD card is not yet
specified.

Signed-off-by: Stefano Babic <sbabic@denx.de>
14 years agoserial_mxc: add support for MX51 processor
Stefano Babic [Wed, 20 Jan 2010 17:20:19 +0000 (18:20 +0100)]
serial_mxc: add support for MX51 processor

The patch adds support for the Freescale mx51 processor.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fred Fan <fanyefeng@gmail.com>
14 years agoMX51: Add pin and multiplexer definitions.
Stefano Babic [Wed, 20 Jan 2010 17:20:04 +0000 (18:20 +0100)]
MX51: Add pin and multiplexer definitions.

The patch add header files to support the pin multiplexer
of the the Freescale i.MX51 processor.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fred Fan <fanyefeng@gmail.com>
14 years agoMX51: Add register definitions
Stefano Babic [Wed, 20 Jan 2010 17:19:51 +0000 (18:19 +0100)]
MX51: Add register definitions

The patch add header files to support the Freescale i.MX51
processor, setting definitions for internal registers.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fred Fan <fanyefeng@gmail.com>
14 years agoMX51: Add initial support for the Freescale MX51
Stefano Babic [Wed, 20 Jan 2010 17:19:32 +0000 (18:19 +0100)]
MX51: Add initial support for the Freescale MX51

The patch add initial support for the Freescale i.MX51 processor
(family arm cortex_a8).

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Fred Fan <fanyefeng@gmail.com>
14 years agoedb93xx: Fix SDRAM initialization
Matthias Kaehlcke [Wed, 24 Feb 2010 18:45:39 +0000 (19:45 +0100)]
edb93xx: Fix SDRAM initialization

edb93xx: Fix SDRAM initialization by issuing a precharge all command before
forcing the precharge and select mode register update mode before programming
the mode registers. Write to the SDRAM banks in order to force a precharge,
reading causes the edb93xx boards to hang

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agoAdd bootcount to AT91
Anders Darander [Thu, 25 Feb 2010 14:57:03 +0000 (15:57 +0100)]
Add bootcount to AT91

Use AT91_GPBR 3 as a bootcount register.
The bootmagic and the bootcount shares AT91_GPBR 3.

Signed-off-by: Anders Darander <ad@datarespons.se>
14 years agoARM Update mach-types
Tom Rix [Thu, 25 Feb 2010 18:05:32 +0000 (12:05 -0600)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit aea187c46f7d03ce985e55eb1398d0776a15b928

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoep93xx: Refactoring of timer code
Matthias Kaehlcke [Tue, 23 Feb 2010 23:22:09 +0000 (00:22 +0100)]
ep93xx: Refactoring of timer code

ep93xx: Refactoring of the timer code, including the following changes

 * use a free running timer instead of a periodical one
 * use unsigned long long for total number of ticks
 * hold the timer state in a structure instead of separate variables
 * increment the timer counter instead of decrementing it
 * remove unused function udelay_masked()
 * remove unused function set_timer()

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agoep93xx: Fix calculation of sys ticks in clk_to_systicks()
Matthias Kaehlcke [Tue, 23 Feb 2010 23:22:00 +0000 (00:22 +0100)]
ep93xx: Fix calculation of sys ticks in clk_to_systicks()

ep93xx: Use unsigned long long for calculation of sys ticks in clk_to_systicks()
for proper handling of large intermediate values

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agoOMAP3: workaround for ARM Cortex-A8 erratum 725233
Siarhei Siamashka [Wed, 24 Feb 2010 04:56:36 +0000 (23:56 -0500)]
OMAP3: workaround for ARM Cortex-A8 erratum 725233

725233: PLD instructions executed with PLD data forwarding
enabled can result in a processor deadlock

This deadlock can happen when NEON load instructions are used together
with cache preload instructions (PLD). The problematic conditions
can be triggered in-the-wild by NEON optimized functions from pixman
library (http://cgit.freedesktop.org/pixman), which perform dynamic
adjustment of prefetch distance.

The workaround disables PLD data forwarding by setting PLD_FWD bit
in L2 Cache Auxiliary Control Register as recommended in ARM Cortex-A8
errata list.

The deadlock can only happen on r1pX revisions of Cortex-A8 (used in
OMAP34xx/OMAP35xx). Performance impact of the workaround is practically
non-existant.

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoARM change name of defines for AT91 arm926ejs
Achim Ehrlich [Wed, 24 Feb 2010 09:29:16 +0000 (10:29 +0100)]
ARM change name of defines for AT91 arm926ejs

Configuration defines should be preceeded with CONFIG_SYS_. Renamed
some at91 specific defines to conform to this naming convention:

AT91_CPU_NAME to CONFIG_SYS_AT91_CPU_NAME
AT91_MAIN_CLOCK to CONFIG_SYS_AT91_MAIN_CLOCK

Signed-off-by: Achim Ehrlich <aehrlich@taskit.de>
14 years agoVoiceBlue: fix linker errors
Ladislav Michl [Thu, 18 Feb 2010 02:29:45 +0000 (21:29 -0500)]
VoiceBlue: fix linker errors

linking eeprom with libgeneric.a is not really needed and causes following
error:
../../lib_generic/libgeneric.a(string.o): In function `strcmp':
/home/ladis/src/u-boot-ti/lib_generic/string.c:152: multiple definition of `strcmp'
../../examples/standalone/libstubs.a(stubs.o):include/_exports.h:24: first defined here
make[1]: *** [eeprom.srec] Error 1

Fix undefined reference to memset generated by some versions of gcc
to zero out initialized structure on the stack:
eeprom.o: In function `eeprom':
board/voiceblue/eeprom.c:152: undefined reference to `memset'
make[1]: *** [eeprom] Error 1

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoVoiceBlue: limit line lenght to 80 characters
Ladislav Michl [Thu, 18 Feb 2010 02:29:39 +0000 (21:29 -0500)]
VoiceBlue: limit line lenght to 80 characters

Reindent configuration header to limit line lenght to 80 characters by
removing obvious and sometimes misleading comments.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agonetstar.h: do not exceed 80 columns
Ladislav Michl [Thu, 18 Feb 2010 02:13:53 +0000 (21:13 -0500)]
netstar.h: do not exceed 80 columns

Limit line length to 80 characters mostly by removing obvious and sometimes
misleading comments. Fix indentation, too.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoDaVinci: Adding entry to MAKEALL for DM365 EVM
Sandeep Paulraj [Thu, 18 Feb 2010 02:09:21 +0000 (21:09 -0500)]
DaVinci: Adding entry to MAKEALL for DM365 EVM

The patch adds an entry for the DM365 EVM to MAKEALL

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoda830evm: Add support for TI EMAC
Nick Thompson [Thu, 18 Feb 2010 01:37:24 +0000 (20:37 -0500)]
da830evm: Add support for TI EMAC

Adds support for ethernet networking on the da830evm platform.

This platform uses an SoC EMAC interface and a 3 port ethernet
switch as a PHY with an RMII interface. The PHY also has a i2c
interface for configuring the switch functions.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: make mtdparts default ready for recent kernels
Ladislav Michl [Mon, 8 Feb 2010 19:19:06 +0000 (14:19 -0500)]
NetStar: make mtdparts default ready for recent kernels

Recent kernels are using generic NAND and NOR drivers. Change
default mtdparts to reflect it.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: fix default environment
Ladislav Michl [Mon, 8 Feb 2010 19:17:45 +0000 (14:17 -0500)]
NetStar: fix default environment

Correct switching partitions after upgrade and make it more readable.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - fix linker error
Ladislav Michl [Mon, 8 Feb 2010 19:15:47 +0000 (14:15 -0500)]
NetStar: eeprom - fix linker error

linking eeprom with libgeneric.a is not really needed and causes following
error:
../../lib_generic/libgeneric.a(string.o): In function `strcmp':
lib_generic/string.c:152: multiple definition of `strcmp'
../../examples/standalone/libstubs.a(stubs.o):include/_exports.h:24: first defined here
Remove eeprom linker script as well and generate entry point object
(to start application by jumping on its beginning) on the fly.
Out-of-tree build tested as well.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - be less verbose
Ladislav Michl [Mon, 8 Feb 2010 19:15:43 +0000 (14:15 -0500)]
NetStar: eeprom - be less verbose

Use shorter yet descriptive messages, replace printf() with
puts() where appropriate. This saves few bytes.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - undefined reference to `memset'
Ladislav Michl [Mon, 8 Feb 2010 19:15:15 +0000 (14:15 -0500)]
NetStar: eeprom - undefined reference to `memset'

Defining partially initialized struct eth_device on stack means
gcc has to zero out it, and some gcc versions optimize this with
an implicit call to memset. Move definition to data section
to avoid that (it has also nice side effect that we need not
to pass it to helper functions anymore)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Thu, 4 Mar 2010 20:30:01 +0000 (21:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 4 Mar 2010 20:28:46 +0000 (21:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'next' of git://git.denx.de/u-boot-coldfire
Wolfgang Denk [Thu, 4 Mar 2010 20:24:44 +0000 (21:24 +0100)]
Merge branch 'next' of git://git.denx.de/u-boot-coldfire

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Thu, 4 Mar 2010 20:11:55 +0000 (21:11 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Thu, 4 Mar 2010 20:09:02 +0000 (21:09 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years ago] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM
Wolfgang Wegner [Tue, 2 Mar 2010 09:59:19 +0000 (10:59 +0100)]
] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM

For platforms with flash below ram addresses, the current check to
activate monitor protection is wrong/insufficient. This patch fixes
CONFIG_MONITOR_IS_IN_RAM for these systems by adding a check for
this configuration.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoallow MCF532x to use CONFIG_MONITOR_IS_IN_RAM
Wolfgang Wegner [Tue, 2 Mar 2010 09:59:20 +0000 (10:59 +0100)]
allow MCF532x to use CONFIG_MONITOR_IS_IN_RAM

CONFIG_MONITOR_IS_IN_RAM is broken for MCF532x. This patch fixes this
 by conditionally
- removing the vector table at the beginning of code
- not overwriting the vector base register
- removing the code to re-set the PLL, which effectively disables
  SDRAM access

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
14 years agoMCF5271-only: Added a weak board_reset function to allow custom reset
Richard Retanubun [Mon, 26 Oct 2009 18:19:17 +0000 (14:19 -0400)]
MCF5271-only: Added a weak board_reset function to allow custom reset

This patch adds a board_reset function to allow boards to specify
their own custom reset sequence (e.g. resetting by timing out watchdog).
Tested only on MCF5271, can be expanded if needed.

Based on Mike Frysinger's suggestion on:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/70304

Signed-off-by: Richard Retanubun <RichardRetanubun at RuggedCom.com>
14 years agoMCF532x: make icache_enable use CONFIG_SYS_SDRAM_SIZE
Wolfgang Wegner [Wed, 28 Oct 2009 20:11:00 +0000 (15:11 -0500)]
MCF532x: make icache_enable use CONFIG_SYS_SDRAM_SIZE

in cpu/mcf532x/start.S, the function icache_enable enables the cache for
a fixed 32MB region starting at the SDRAM start address; this patch
changes the function to cover the region defined by CONFIG_SYS_SDRAM_SIZE

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agoadd include/asm-m68k/unaligned.h
Wolfgang Wegner [Wed, 9 Dec 2009 22:32:12 +0000 (17:32 -0500)]
add include/asm-m68k/unaligned.h

lib_generic/zlib.c needs include/asm/unaligned.h since commit
cd514aeb996e2f7aefbe1f78481965d9d074aed4, which broke compilation for
Coldfire/M68K. This patch adds the missing header for these
architectures.

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agosh: Add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernel
Nobuhiro Iwamatsu [Mon, 8 Feb 2010 02:50:16 +0000 (11:50 +0900)]
sh: Add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernel

zlib.c demands asm/unaligned.h. But, SH does not have these.
This commit add asm/unaligned.h and asm/unaligned-sh4a.h from Linux
kernel and modifyf for u-boot.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
14 years agompc83xx: fix out-of-tree mpc8315 nand build
Kim Phillips [Mon, 1 Mar 2010 17:10:17 +0000 (11:10 -0600)]
mpc83xx: fix out-of-tree mpc8315 nand build

commit 2e95004deb6e33e33bf1b8a92a38cd2115bac4c2 "mpc83xx: Add NAND boot support
for MPC8315E-RDB boards" symlinked nand_spl/board/freescale/mpc8315erdb to
mpc8313erdb in order to not duplicate code.

Since the main makefile builds nand_spl/board/$(BOARDDIR) (which makes sense),
and the board Makefile and linker script are the only two necessary files
to enable out-of-tree building, and other boards have duplicated nand makefiles
(e.g. 8536ds & 8569mds), it only seems prudent to copy these two files in the
name of the 8315 too.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Wolfgang Denk <wd@denx.de>
14 years agompc83xx: vme8349: fix incorrect BR0_PRELIM port size comment
Kim Phillips [Tue, 23 Feb 2010 01:39:16 +0000 (19:39 -0600)]
mpc83xx: vme8349: fix incorrect BR0_PRELIM port size comment

commit 98d92d8c9f4021629a45261ad5ec3f3595f3a27a "sbc8349: fix incorrect
comment" missed this one.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoppc4xx: Corrected EBC register bit definitions
Eugene O'Brien [Wed, 24 Feb 2010 19:10:24 +0000 (14:10 -0500)]
ppc4xx: Corrected EBC register bit definitions

Corrected the bit field positions of the external master priority low
and the external master priority high values in the EBC configuration
register. These bit field positions differ between PPC405 and PPC440
processors

Signed-off-by: Eugene O'Brien <eugene.obrien@advantechamt.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agocmd_itest.c: fix pointer dereferencing
Frans Meulenbroeks [Mon, 22 Feb 2010 21:49:06 +0000 (22:49 +0100)]
cmd_itest.c: fix pointer dereferencing

fix pointer dereferencing
if the size is .b and .w an 8 or 16 bit access is done.

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
14 years agotools: fix imximage warning
Kim Phillips [Tue, 23 Feb 2010 01:37:56 +0000 (19:37 -0600)]
tools: fix imximage warning

Fix build warning:

Configuring for MPC837XEMDS board...
imximage.c: In function `imximage_parse_cfg_file':
imximage.c:146: warning: passing argument 2 of `getline' from incompatible pointer type
/usr/include/bits/stdio.h:116: note: expected `size_t *' but argument is of type `uint32_t *'

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agomkimage: SEGFAULT with imximage on 64 bit systems
Stefano Babic [Fri, 5 Feb 2010 14:16:02 +0000 (15:16 +0100)]
mkimage: SEGFAULT with imximage on 64 bit systems

Running mkimage to generate an imximage produces a SEGFAULT
on 64 bit machines due to pointer arithmetic limited to 32 bit.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: remove hardcoded network addresses from config files
Kim Phillips [Fri, 19 Feb 2010 01:28:12 +0000 (19:28 -0600)]
mpc83xx: remove hardcoded network addresses from config files

and avoid e.g., two identical boards from causing random networking
conflicts when hooked up to the same network.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoBug: do_reset issued via netconsole does not reset mpc83xx cpu.
Michael Zaidman [Mon, 15 Feb 2010 08:02:32 +0000 (10:02 +0200)]
Bug: do_reset issued via netconsole does not reset mpc83xx cpu.

The do_reset routine in the cpu/mpc83xx/cpu.c file does not reset
the mpc83xx cpu when issued via netconsole.

Moving the console output "resetting the board." to the beginning of
the routine before disabling interrupts solved the problem.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agonew board (eb_cpux9k2)
Jens Scharsig [Wed, 3 Feb 2010 21:48:09 +0000 (22:48 +0100)]
new board (eb_cpux9k2)

* new board (eb_cpux9k2)
 * support for EB+CPUx9K2 board by BuS Elektronik GmbH & Co. KG
 * select via make eb_cpux9k2_config
 * this also demonstrates, how to use boards with AT91RM9200 cpu
   in at91 arch tree

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agonew at91_emac network driver (NET_MULTI api)
Jens Scharsig [Wed, 3 Feb 2010 21:47:57 +0000 (22:47 +0100)]
new at91_emac network driver (NET_MULTI api)

* add's at91_emac (AT91RM9200) network driver (NET_MULTI api)
 * enable driver with CONFIG_DRIVER_AT91EMAC
 * generic PHY initialization
 * modify AT91RM9200 boards to use NET_MULTI driver
 * the drivers has been tested with LXT971 Phy and DM9161 Phy at MII and RMII
   interface

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoprepare joining at91rm9200 into at91
Jens Scharsig [Wed, 3 Feb 2010 21:47:35 +0000 (22:47 +0100)]
prepare joining at91rm9200 into at91

* prepare joining at91 and at91rm9200
 * add modified copy of soc files to cpu/arm920t/at91 to make
   possible to compile at91rm9200 boards in at91 tree instead
   of at91rm9200
 * add header files with c structure defs for AT91 MC, ST and TC
 * the new cpu files are using at91 c structure soc access
 * please read README.soc-at91 for details

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoupdate at91sam9263ek board to new SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:47:18 +0000 (22:47 +0100)]
update at91sam9263ek board to new SoC access

* convert at91sam9263ek board to use c stucture SoC access
 * change gpio access to at91_gpio syntax

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoconvert common files to new SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:46:58 +0000 (22:46 +0100)]
convert common files to new SoC access

* add's a warning to all files, which need update to new SoC access
 * convert common files in cpu/../at91 and a lot of drivers to use
   c stucture SoC access

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoconvert all at91 files to use at91_gpio driver syntax
Jens Scharsig [Wed, 3 Feb 2010 21:46:46 +0000 (22:46 +0100)]
convert all at91 files to use at91_gpio driver syntax

* convert all files cpu/../at91 to use at91_gpio driver syntax
 * change AT91_PINP([A-F])(\d+) to AT91_PIO_PORT\1, \2
   this makes all 160 AT91_PINPxxx defines obsolete
 * AT91_PINPxxx defines and gpio.h can be remove, if all boards converted to new SoC access

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd a new AT91 GPIO driver
Jens Scharsig [Wed, 3 Feb 2010 21:46:16 +0000 (22:46 +0100)]
add a new AT91 GPIO driver

* add a real AT91 GPIO driver instead of header inline code
* resolve the mixing of port and pins
* change board config files to use new driver
* add macros to gpio to realize backward compatibility

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd c structures for SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:46:01 +0000 (22:46 +0100)]
add c structures for SoC access

* add's c structures for SoC access to pheriperials head files

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd new CONFIG_AT91_LEGACY
Jens Scharsig [Wed, 3 Feb 2010 21:45:42 +0000 (22:45 +0100)]
add new CONFIG_AT91_LEGACY

* add's the new temporary CONFIG_AT91_LEGACY to all board configs
 This will need for backward compatiblity, while change the SoC access
 to c structures. If CONFIG_AT91_LEGACY is defined, the deprecated
 SoC is used.

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoDA830 EVM: Enable NAND support on Spectrum Digital EVM
Nick Thompson [Mon, 8 Feb 2010 16:36:16 +0000 (11:36 -0500)]
DA830 EVM: Enable NAND support on Spectrum Digital EVM

The EVM UI extender card has a NAND device. This change will enable
saveenv to work with NAND and Linux to be booted using:

mtdparts default
nboot kernel
bootm

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoDavinci: Add EMIF-A macros for setting chip select parameters
Nick Thompson [Mon, 8 Feb 2010 16:34:58 +0000 (11:34 -0500)]
Davinci: Add EMIF-A macros for setting chip select parameters

The patch adds EMIF-A macros for setting chip select parameters

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOMAP3: Avoid re-write to PRM_CLKSRC_CTRL
Sanjeev Premi [Mon, 8 Feb 2010 16:33:25 +0000 (11:33 -0500)]
OMAP3: Avoid re-write to PRM_CLKSRC_CTRL

In function get_osc_clk_speed(), do not change/ update
the divider for SYS_CLK as it can has cascading effect
on the other derived clocks.

Sudden change in divider value can lead to inconsistent
behavior in the system - often leading to crashes.

The problem was found when working with OMAP3EVM using
DM3730 processor card.

The patch has been tested with OMAP3530 on OMAP3EVM as
well

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Hiremath Vaibhav <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoSPI: Fix 32 bit transfers in mxc_spi.c
Magnus Lilja [Tue, 9 Feb 2010 21:05:39 +0000 (22:05 +0100)]
SPI: Fix 32 bit transfers in mxc_spi.c

Commit f9b6a1575d9f1ca192e4cb60e547aa66f08baa3f,  "i.MX31: fix SPI
driver for shorter than 32 bit" broke 32 bit transfers. This patch
makes single 32 bit transfer work again.

Transfer lengths that are known not to work will abort and print
an error message.

Tested on i.MX31 Litekit and i.MX31 PDK using 32 bit transfers to
the MC13783/ATLAS chip (using the 'date' command).

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agoedb93xx: enable the uart in devicecfg register
Alessandro Rubini [Sat, 6 Feb 2010 19:54:05 +0000 (20:54 +0100)]
edb93xx: enable the uart in devicecfg register

printf goes to uart1, but it will block forever waiting for
busy to go off unless the uart is enabled first.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoedb93xx: change calculation un early_udelay.h
Alessandro Rubini [Sat, 6 Feb 2010 19:53:54 +0000 (20:53 +0100)]
edb93xx: change calculation un early_udelay.h

Previous code compiled with gcc-4.2.2 makes a call to
__aeabi_uidiv to divide by 20. As a side effect it was
not inline any more, and so sdram_cfg used the stack
as well, but this is early code that has no stack yet.
The patch explicitly removes the division, so no stack is used.

The calculation of the counter calls a division by 20

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoEP93xx: fix syscon_regs definition
Alessandro Rubini [Sat, 6 Feb 2010 19:53:43 +0000 (20:53 +0100)]
EP93xx: fix syscon_regs definition

The structure was missing a reserved entry (not listed in the manual,
actually), so the last registers had a wrong offset. This prevented
all swlocked registers to be modified as swlock is last in the structure.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoARM: Add support for EP93xx SoCs
Matthias Kaehlcke [Mon, 1 Feb 2010 20:29:39 +0000 (21:29 +0100)]
ARM: Add support for EP93xx SoCs

Add support for the Cirrus EP93xx platform

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Acked-by: Tom <Tom.Rix@windriver.com>
14 years agoAdd support for EDB93xx boards
Matthias Kaehlcke [Mon, 1 Feb 2010 20:29:48 +0000 (21:29 +0100)]
Add support for EDB93xx boards

Added support for the following EDB93xx boards:

EDB9301
EDB9302
EDB9302A
EDB9307
EDB9307A
EDB93012
EDB9315
EDB9315A

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agoNetStar: Remove debug junk leaked into eeprom utility
Ladislav Michl [Wed, 27 Jan 2010 16:12:28 +0000 (11:12 -0500)]
NetStar: Remove debug junk leaked into eeprom utility

This patch removes debug junk leaked into eeprom utility.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: make crcit utility more readable
Ladislav Michl [Wed, 27 Jan 2010 16:12:23 +0000 (11:12 -0500)]
NetStar: make crcit utility more readable

This patch makes the crcit utility more readable

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: Disable CONFIG_CMD_JFFS2
Ladislav Michl [Wed, 27 Jan 2010 16:12:08 +0000 (11:12 -0500)]
NetStar: Disable CONFIG_CMD_JFFS2

This patch removes "CONFIG_CMD_JFFS" from the board config

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOMAP3 Move declaration of gpmc_cfg.
Tom Rix [Wed, 27 Jan 2010 16:11:55 +0000 (11:11 -0500)]
OMAP3 Move declaration of gpmc_cfg.

Every omap3 board config file declared the global variable gpmc_cfg.
This changes moves the declaration to a better location in the
arch dependent header file cpu.h.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOvero GPMC registers
Scott Ellis [Wed, 27 Jan 2010 16:11:46 +0000 (11:11 -0500)]
Overo GPMC registers

Use appropriate GPMC timings for the LAN9221 controller on the
Gumstix Overo expansion boards not the values in arch-omap3/mem.h
which are for a different ethernet controller.

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoda830evm: Use table driven pin mux configuration
Nick Thompson [Wed, 27 Jan 2010 16:11:28 +0000 (11:11 -0500)]
da830evm: Use table driven pin mux configuration

Tidyup the pin muxer configuration using the Davinci table driven
pinmux configuration function and data tables.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoTI DaVinci: Driver for the davinci SPI controller
Sekhar Nori [Wed, 27 Jan 2010 16:10:40 +0000 (11:10 -0500)]
TI DaVinci: Driver for the davinci SPI controller

This adds a driver for the SPI controller found on davinci
based SoCs from Texas Instruments.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoat91: Add esd gmbh OTC570 board support
Daniel Gorsulowski [Mon, 25 Jan 2010 09:50:41 +0000 (10:50 +0100)]
at91: Add esd gmbh OTC570 board support

This patch adds support for esd gmbh OTC570 board.
The OTC570 is based on an Atmel AT91SAM9263 SoC.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Mon, 8 Feb 2010 21:09:24 +0000 (22:09 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

14 years agokgdb: cpu/mpc* cpu/74xx: include kgdb.h when needed
Mike Frysinger [Mon, 8 Feb 2010 20:30:16 +0000 (15:30 -0500)]
kgdb: cpu/mpc* cpu/74xx: include kgdb.h when needed

Commit cbb0cab1d929839d broke some platforms which used kgdb code but
didn't actually include kgdb.h.  So include kgdb.h in all the relevant
traps code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agonet: Use 0.5 sec timeout in miiphy_reset() instead of counting loop
Stefan Roese [Tue, 2 Feb 2010 12:43:48 +0000 (13:43 +0100)]
net: Use 0.5 sec timeout in miiphy_reset() instead of counting loop

This patch fixes a problem I've notived on a buggy PPC4xx system. This
system has problems with the PHY MDIO communication and seemed to be
stuck/crashed in miiphy_reset(). But degugging revealed, that the CPU
didn't crash, but "only" hung in this counting loop for about 2 minutes.

This patch now uses a real timeout of 0.5 seconds (as mentioned in the
comment in miiphy_reset).

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agofec_mxc: add support for MX51 processor
Stefano Babic [Mon, 1 Feb 2010 13:51:30 +0000 (14:51 +0100)]
fec_mxc: add support for MX51 processor

The patch add support for the Freescale mx51 processor
to the FEC ethernet driver.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoNET: kirkwood-egiga smi access fix
Siddarth Gore [Tue, 19 Jan 2010 05:39:07 +0000 (11:09 +0530)]
NET: kirkwood-egiga smi access fix

Although the datasheet mentions seperate smi registers for each
port, using Port 1 smi register to access ethernet phys does not
work. Hence only Port 0 smi register should be used to access all
devices connected to the smi bus. This behavior is consistant with
the mv643xx driver in the linux kernel.

Signed-off-by: Siddarth Gore <gores@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agons16550: kick watchdog while waiting for a character
Ladislav Michl [Mon, 1 Feb 2010 22:34:25 +0000 (23:34 +0100)]
ns16550: kick watchdog while waiting for a character

ns16550 busyloops waiting for incoming byte causing watchdog to reboot
while waiting for a key press. A call to WATCHDOG_RESET in NS16550_getc
loop fixes it.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
14 years agoUSB: usb_control_msg wait for driver ISR to set status.
Remy Bohmer [Mon, 1 Feb 2010 18:40:47 +0000 (19:40 +0100)]
USB: usb_control_msg wait for driver ISR to set status.

This patch changes usb_control_msg back to the state prior to commit
48867208444cb2a82e2af9c3249e90b7ed4a1751.

The USB driver ISR routine may update the status.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
14 years agomusb: Add host support for DM365 EVM
Prathap Srinivas [Mon, 11 Jan 2010 10:06:46 +0000 (15:36 +0530)]
musb: Add host support for DM365 EVM

Add support for musb host on DM365 EVM.

Signed-off-by: Prathap Srinivas <msprathap@ti.com>
14 years agousb: musb: fix Blackfin DMA register padding
Cliff Cai [Tue, 19 Jan 2010 05:10:42 +0000 (00:10 -0500)]
usb: musb: fix Blackfin DMA register padding

The conversion from offsets to C structs lost a little padding in the DMA
register map.  Accessing endpoints other than ep0 with DMA would fail as
the addresses wouldn't be adjusted correctly.

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 3 Feb 2010 19:22:10 +0000 (20:22 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 3 Feb 2010 19:15:46 +0000 (20:15 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Wed, 3 Feb 2010 19:10:20 +0000 (20:10 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net