10 years agoPrepare v2010.03 v2010.03
Wolfgang Denk [Wed, 31 Mar 2010 21:54:39 +0000 (23:54 +0200)]
Prepare v2010.03

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agonet, doc: How to setup MAC address correctly
Heiko Schocher [Wed, 31 Mar 2010 06:34:51 +0000 (08:34 +0200)]
net, doc: How to setup MAC address correctly

As this seems unclear, document how the flow of setting up
the MAC address is correct.

Signed-off-by: Heiko Schocher <hs@denx.de>
Text changed slightly, adding input from Mike Frysinger.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agonet, fec_mxc: only setup the device enetaddr with eeprom value
Heiko Schocher [Wed, 31 Mar 2010 06:34:46 +0000 (08:34 +0200)]
net, fec_mxc: only setup the device enetaddr with eeprom value

Only fill the device enetaddr with the contents of the eeprom,
do not program it in MAC address registers

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
10 years agodoc: Fix ramdisk examples in doc/uImage.FIT/multi.its
Felix Radensky [Tue, 30 Mar 2010 12:02:13 +0000 (15:02 +0300)]
doc: Fix ramdisk examples in doc/uImage.FIT/multi.its

The ramdisk sections in doc/uImage.FIT/multi.its lack
load address and entry point properties. Using examples
from this file will result in unbootable image, u-boot
will issue the following error messages:

Can't get ramdisk subimage load address!
Ramdisk image is corrupt or invalid

This patch adds missing properties to ramdisk sections.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
10 years agojffs2, suen3: Fix compiler warning
Heiko Schocher [Wed, 24 Mar 2010 12:22:50 +0000 (13:22 +0100)]
jffs2, suen3: Fix compiler warning

$ ./MAKEALL suen3
jffs2_1pass.c: In function 'get_fl_mem':
jffs2_1pass.c:399: warning: unused variable 'id'
jffs2_1pass.c: In function 'get_node_mem':
jffs2_1pass.c:423: warning: unused variable 'id'

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Tom <Tom.Rix@windriver.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 30 Mar 2010 20:22:47 +0000 (22:22 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 30 Mar 2010 20:21:24 +0000 (22:21 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

10 years agompc86xx: set the DDR BATs after calculating true DDR size
Timur Tabi [Mon, 29 Mar 2010 17:51:07 +0000 (12:51 -0500)]
mpc86xx: set the DDR BATs after calculating true DDR size

After determining how much DDR is actually in the system, set DBAT0 and
IBAT0 accordingly.  This ensures that the CPU won't attempt to access
(via speculation) addresses outside of actual memory.

On 86xx systems, DBAT0 and IBAT0 (the BATs for DDR) are initialized to 2GB
and kept that way.  If the system has less than 2GB of memory (typical for
an MPC8610 HPCD), the CPU may attempt to access this memory during
speculation.  The zlib code is notorious for generating such memory reads,
and indeed on the MPC8610, uncompressing the Linux kernel causes a machine
check (without this patch).

Currently we are limited to power of two sized DDR since we only use a
single bat.  If a non-power of two size is used that is less than
CONFIG_MAX_MEM_MAPPED u-boot will crash.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years ago85xx: Fix enabling of L1 cache parity on secondary cores
Kumar Gala [Fri, 26 Mar 2010 20:14:43 +0000 (15:14 -0500)]
85xx: Fix enabling of L1 cache parity on secondary cores

Use the same code between primary and secondary cores to init the
L1 cache.  We were not enabling cache parity on the secondary cores.

Also, reworked the L1 cache init code to match the e500mc L2 init code
that first invalidates the cache and locks.  Than enables the cache and
makes sure its enabled before continuing.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoppc4xx: Fix problem with I2C bus >= 1 initialization
Stefan Roese [Mon, 29 Mar 2010 13:30:46 +0000 (15:30 +0200)]
ppc4xx: Fix problem with I2C bus >= 1 initialization

This patch fixes a problem introduced with patch eb5eb2b0
[ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C
base address to the "i2c" pointer inside of the controller loop.
Otherwise controller 0 is initialized multiple times instead of
initializing each I2C controller sequentially.

Tested on Katmai.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
10 years agobootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"
Heiko Schocher [Mon, 29 Mar 2010 11:15:48 +0000 (13:15 +0200)]
bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"

Booting a "Multi-File Image" including a linux kernel, ramdisk and
fdt, generated with

mkimage -A ppc \
    -O linux \
    -T multi \
    -C gzip \
    -a 00000000 \
    -e 00000000 \
    -n "kernel-2.6+initrd+dtb" \
    -d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \

actually fails, because ramdisk start and end addresses
didn;t get initialized. This patch fixes this issue.

Tested on the KUP4K board.

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoPrepare 2010.03-rc3 v2010.03-rc3
Wolfgang Denk [Sat, 27 Mar 2010 23:25:14 +0000 (00:25 +0100)]
Prepare 2010.03-rc3


Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agocmd_usb.c: print debug messages only when DEBUG is defined
Wolfgang Denk [Thu, 25 Mar 2010 13:07:23 +0000 (14:07 +0100)]
cmd_usb.c: print debug messages only when DEBUG is defined

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoml300: remove support for broken, orphaned board
Wolfgang Denk [Wed, 24 Mar 2010 11:19:19 +0000 (12:19 +0100)]
ml300: remove support for broken, orphaned board

The ml300 board has a number of issues, but nobody cares about this
long-orphaned board any more.  Remove it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Michal Simek <monstr@monstr.eu>
10 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 27 Mar 2010 23:15:20 +0000 (00:15 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

10 years agomkimage: fix Segmentation Fault when run without "-n name" option
Wolfgang Denk [Sat, 27 Mar 2010 22:37:46 +0000 (23:37 +0100)]
mkimage: fix Segmentation Fault when run without "-n name" option

The restructuring of the mkimage command in commit 89a4d6b1 ("tools:
mkimage: split code into core, default and FIT image specific")
introduced a bug that caused mkimage to segfault when run without
"-n name" option.  Initialize the imagename entry to prevent that.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

10 years agocfi_flash: precision and underflow problem in tout calculation
Renato Andreola [Wed, 24 Mar 2010 15:00:47 +0000 (23:00 +0800)]
cfi_flash: precision and underflow problem in tout calculation

With old configuration it could happen tout=0 if CONFIG_SYS_HZ<1000.

Signed-off-by: Renato Andreola <renato.andreola@imagos.it>
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoppc4xx fix unstable 440EPx bootstrap options
Rupjyoti Sarmah [Wed, 24 Mar 2010 11:22:02 +0000 (16:52 +0530)]
ppc4xx fix unstable 440EPx bootstrap options

440EPx fixed bootstrap options A, B, D, and E sets PLL FWDVA to a value = 1.
This results in the PLLOUTB being greater than the CPU clock frequency
resulting unstable 440EPx operation resulting in various software hang

This patch reprograms the FWDVA satisfying the requirement of setting FWDVB
to a value greater than 1 while using one of the four deafult bootstrap options.

Signed-off-by: Rupjyoti Sarmah <rsarmah@amcc.com>
Acked-by : Victor Gallardo <vgallardo@appliedmicro.com>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Wed, 24 Mar 2010 13:11:53 +0000 (14:11 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-video

10 years agoat91: Get rid of some warnings when building for otc570
Matthias Fuchs [Wed, 24 Mar 2010 09:16:20 +0000 (10:16 +0100)]
at91: Get rid of some warnings when building for otc570

The soft-i2c code for AT91 defines I2C_SOFT_DECLARATIONS
for direct access by dereferencing a pio pointer.
The OTC570 platform uses the AT91 gpio API so it does not
need the pio variable.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agolcd: make 16bpp work
Alessandro Rubini [Sat, 13 Mar 2010 16:44:08 +0000 (17:44 +0100)]
lcd: make 16bpp work

Support for 16bpp was supposed to be in the code but was not working.
This makes it work and has been tested in the nhk8815 board.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoPrepare v2010.03-rc2 v2010.03-rc2
Wolfgang Denk [Mon, 22 Mar 2010 22:25:00 +0000 (23:25 +0100)]
Prepare v2010.03-rc2


Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoep93xx timer: Fix resolution of get_ticks()
Matthias Kaehlcke [Tue, 9 Mar 2010 21:13:33 +0000 (22:13 +0100)]
ep93xx timer: Fix resolution of get_ticks()

ep93xx timer: Make get_ticks() return a value in CONFIG_SYS_HZ resolution,
as announced by get_tbclk()

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
10 years agoep93xx timer: Fix possible overflow in usecs_to_ticks()
Matthias Kaehlcke [Tue, 9 Mar 2010 21:13:20 +0000 (22:13 +0100)]
ep93xx timer: Fix possible overflow in usecs_to_ticks()

ep93xx timer: Use 64-bit values in usecs_to_ticks() in order to avoid
overflows in intermediate values

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
10 years agocorrect a syntax typo in at91_matrix.h
Asen Dimov [Thu, 18 Mar 2010 11:41:47 +0000 (13:41 +0200)]
correct a syntax typo in at91_matrix.h

Signed-off-by: Asen Dimov <dimov@ronetix.at>
10 years agoenv: fix endian ordering in crc table
Jeff Angielski [Wed, 17 Mar 2010 19:09:26 +0000 (15:09 -0400)]
env: fix endian ordering in crc table

The crc table was being built as little endian for big endian
targets.  This would cause fw_printenv to always fail with
"Warning: Bad CRC, using default environment" messages.

Signed-off-by: Jeff Angielski <jeff@theptrgroup.com>
Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
10 years agompc5121: cpu/mpc512x/diu.c: fix warnings
Anatolij Gustschin [Tue, 16 Mar 2010 16:10:08 +0000 (17:10 +0100)]
mpc5121: cpu/mpc512x/diu.c: fix warnings

Fix warnings while compiling with CONFIG_VIDEO enabled:

diu.c: In function 'video_hw_init':
diu.c:158: warning: 'return' with no value, in function returning non-void
diu.c:162: warning: format '%ld' expects type 'long int', but argument 6 has type 'int'
diu.c:162: warning: format '%ld' expects type 'long int', but argument 7 has type 'int'

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoconsole.c: fix problem with splashimage
Anatolij Gustschin [Tue, 16 Mar 2010 14:29:33 +0000 (15:29 +0100)]
console.c: fix problem with splashimage

If a board uses cfb_console driver and splash image
and also defines CONFIG_SILENT_CONSOLE, the user is
locked out even if "silent" is not set. It is not
possible to get any output, neither on vga console
device nor on serial console after redirecting the
output to the serial console, since the GD_FLG_SILENT
flag remains set.

Fix the problem by redirecting the output from frame
buffer to serial console if splashimage is used.
Only suppress the output if "silent" environment
variable was set and don't set the GD_FLG_SILENT
flag arbitrarily.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agomod change 755 => 644 for multiple files
Thomas Weber [Sat, 13 Mar 2010 22:14:45 +0000 (23:14 +0100)]
mod change 755 => 644 for multiple files

I executed 'find . -name "*.[chS]" -perm 755 -exec chmod 644 {} \;'

Signed-off-by: Thomas Weber <swirl@gmx.li>
Add some more: neither Makefile nor config.mk need execute permissions.
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agomxcmmc: fix warnings due to access 32 bit registers with 16 bit accessors
Stefano Babic [Sat, 13 Mar 2010 20:09:00 +0000 (21:09 +0100)]
mxcmmc: fix warnings due to access 32 bit registers with 16 bit accessors

Some registers of the mxcmmc driver were accessed using
16 bit accessor functions, because only the LSB is
significant. This is not needed and generates

Signed-off-by: Stefano Babic <sbabic@denx.de>
10 years agoTFTP: allow for adjustable retransmission timout
Wolfgang Denk [Sun, 17 Jan 2010 22:55:53 +0000 (23:55 +0100)]
TFTP: allow for adjustable retransmission timout

So far, TFTP negotiated a fixed retransmission timeout of 5 seconds.
In some cases (busy networks, slow TFTP servers) this caused very
slow transfers. A new environment variable "tftptimeout" allows to
set this timeout. Lowering this value may make downloads succeed
faster in networks with high packet loss rates or with unreliable
TFTP servers.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoFix PCI_BASE_ADDRESS_5 handling in pci_hose_config_device()
Wolfgang Denk [Tue, 9 Mar 2010 13:27:25 +0000 (14:27 +0100)]
Fix PCI_BASE_ADDRESS_5 handling in pci_hose_config_device()

Signed-off-by: FUJITA Kazutoshi <fujita@soum.co.jp>
Signed-off-by: <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
10 years agocmd_mmc remove \n
Frans Meulenbroeks [Thu, 25 Feb 2010 13:03:08 +0000 (14:03 +0100)]
cmd_mmc remove \n

This patch removes the \n after the help message for mmcinfo.
This resulted in an empty line being displayed after the mmcinfo line
when the help command was given.

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
10 years agonios2: Added support to YANU UART
Renato Andreola [Tue, 16 Mar 2010 20:01:29 +0000 (16:01 -0400)]
nios2: Added support to YANU UART

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
10 years agonios2: use generic unaligned.h
Thomas Chou [Tue, 16 Mar 2010 16:12:48 +0000 (12:12 -0400)]
nios2: use generic unaligned.h

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Sat, 13 Mar 2010 23:58:30 +0000 (00:58 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-video

10 years agoasm-blackfin/unaligned.h: add for zlib code
Mike Frysinger [Thu, 21 Jan 2010 10:01:15 +0000 (05:01 -0500)]
asm-blackfin/unaligned.h: add for zlib code

The new zlib code wants asm/unaligned.h, so have the Blackfin version pull
in the asm-generic/unaligned.h.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoasm-generic/unaligned.h: dynamic default unaligned accesses
Mike Frysinger [Thu, 21 Jan 2010 10:01:14 +0000 (05:01 -0500)]
asm-generic/unaligned.h: dynamic default unaligned accesses

This is based on the asm-arm/unaligned.h, but made generic so all arches
that cannot do unaligned accesses can utilize it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agovideo: Fix console display when splashscreen is used
Matthias Weisser [Tue, 12 Jan 2010 11:06:31 +0000 (12:06 +0100)]
video: Fix console display when splashscreen is used

If a splashscreen is used the console scrolling used the
scroll size as needed when a logo was displayed. This
patch sets the scroll size to the whole screen if
a splashscreen is shown.

Signed-off-by: Matthias Weisser <matthias.weisser@graf-syteco.de>
10 years agoPrepare v2010.03-rc1 v2010.03-rc1
Wolfgang Denk [Fri, 12 Mar 2010 22:06:04 +0000 (23:06 +0100)]
Prepare v2010.03-rc1

Coding style cleanup, update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agostandalone eepro100_eeprom: fix build error
Wolfgang Denk [Fri, 12 Mar 2010 21:11:00 +0000 (22:11 +0100)]
standalone eepro100_eeprom: fix build error

Building examples/standalone/eepro100_eeprom triggers this error:

In file included from include/common.h:629,
                 from eepro100_eeprom.c:24:
include/net.h: In function 'NetReadIP':
include/net.h:430: warning: implicit declaration of function 'memcpy'
eepro100_eeprom.c: At top level:
eepro100_eeprom.c:81: error: conflicting types for 'memcpy'
include/net.h:430: error: previous implicit declaration of 'memcpy' was here

Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoUpdate .gitignore's: add some generated files
Wolfgang Denk [Fri, 12 Mar 2010 21:10:31 +0000 (22:10 +0100)]
Update .gitignore's: add some generated files

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agompc82xx: Remove SL8245 board and the now orpahned sk98lin network driver.
Detlev Zundel [Mon, 8 Mar 2010 13:02:57 +0000 (14:02 +0100)]
mpc82xx: Remove SL8245 board and the now orpahned sk98lin network driver.

This code has compile problems and the company does not even exist any
more.  So we take the liberty to drop support for it.

Signed-off-by: Detlev Zundel <dzu@denx.de>
CC: Wolfgang Denk <wd@denx.de>
CC: Ben Warren <biggerbadderben@gmail.com>
10 years ago85xx: Drop FIT support to allow u-boot image to fit in 512k
Kumar Gala [Wed, 10 Mar 2010 23:16:48 +0000 (17:16 -0600)]
85xx: Drop FIT support to allow u-boot image to fit in 512k

The 36-bit build exceeds the 512k size we have.  Removing FIT type image
support allows us to fit and we dont really use it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoCosmetic change - indentation correction.
Michael Zaidman [Sun, 28 Feb 2010 14:28:25 +0000 (16:28 +0200)]
Cosmetic change - indentation correction.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
10 years agocmd_mtdparts.c: prevent printbuffer overflows
Anatolij Gustschin [Tue, 23 Feb 2010 23:29:44 +0000 (00:29 +0100)]
cmd_mtdparts.c: prevent printbuffer overflows

The length of configured MTDPARTS_DEFAULT string
could be greater than console printbuffer size.
Replace printf() by puts() to avoid potential buffer

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoFix MPC8536DS documentation
Frans Meulenbroeks [Fri, 19 Feb 2010 10:59:04 +0000 (11:59 +0100)]
Fix MPC8536DS documentation

This patch corrects small mistake in the register list in
doc/README.mpc8536ds. These registers are 32 bits and this one starts
at ....c not ....e

When using the ...c address I can boot from sd, when using the ...e
address I cannot.

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Hu Mingkai <B21284@freescale.com>
10 years agodoc: add README for CONFIG_HWCONFIG option
Heiko Schocher [Wed, 10 Feb 2010 07:03:21 +0000 (08:03 +0100)]
doc: add README for CONFIG_HWCONFIG option

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoTQM8xx: enable device tree support on all TQM8xx based boards.
Heiko Schocher [Tue, 9 Feb 2010 14:50:27 +0000 (15:50 +0100)]
TQM8xx: enable device tree support on all TQM8xx based boards.

Also enable support for CONFIG_HWCONFIG because we use this for
configuring if this hardware has a FEC or not.


hwconfig=fec:on   if hardware has an 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>
10 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.


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>
10 years agoMove CONFIG_UPDATE_TFTP code after CONFIG_PREBOOT
Wolfgang Denk [Thu, 11 Mar 2010 22:56:03 +0000 (23:56 +0100)]

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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

Signed-off-by: Stefano Babic <sbabic@denx.de>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
10 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:


Signed-off-by: Achim Ehrlich <aehrlich@taskit.de>
10 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
../../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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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
../../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>
10 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>
10 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>
10 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

10 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

10 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

10 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

10 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

10 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>
10 years agoallow MCF532x to use CONFIG_MONITOR_IS_IN_RAM
Wolfgang Wegner [Tue, 2 Mar 2010 09:59:20 +0000 (10:59 +0100)]

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>