8 years agoOMAP3: beagle: prettify expansionboard message a bit
Koen Kooi [Tue, 27 Apr 2010 11:45:28 +0000 (13:45 +0200)]
OMAP3: beagle: prettify expansionboard message a bit

8 years agoOMAP3: beagle: set mpurate to 600 for revB and revC1-3
Koen Kooi [Tue, 27 Apr 2010 11:44:16 +0000 (13:44 +0200)]
OMAP3: beagle: set mpurate to 600 for revB and revC1-3

8 years agoOMAP3: beagle: add more expansionboards, based on
Koen Kooi [Fri, 23 Apr 2010 08:50:43 +0000 (10:50 +0200)]
OMAP3: beagle: add more expansionboards, based on

8 years agobeagleboardXM: don't set mpurate on xM in bootargs
Koen Kooi [Tue, 13 Apr 2010 20:04:07 +0000 (22:04 +0200)]
beagleboardXM: don't set mpurate on xM in bootargs

8 years agoEnable DSS driver for Beagle
Syed Mohammed Khasim [Sun, 11 Apr 2010 15:44:39 +0000 (17:44 +0200)]
Enable DSS driver for Beagle

Configures DSS to display color bar on Svideo
Configures DSS to display background color on DVID

Signed-off-by: Syed Mohammed Khasim <>
8 years agoAdd DSS driver for OMAP3
Syed Mohammed Khasim [Tue, 12 Jan 2010 18:27:28 +0000 (23:57 +0530)]
Add DSS driver for OMAP3

Supports dynamic panel configuration
Supports dynamic tv standard selection
Adds support for DSS register access through generic APIs

Incorporated DSS register access using structures.

Previous discussions are here

Signed-off-by: Syed Mohammed Khasim <>
8 years agobeagleboard: fix TCT expansionboard IDs
Koen Kooi [Sun, 11 Apr 2010 10:14:43 +0000 (12:14 +0200)]
beagleboard: fix TCT expansionboard IDs

8 years agobeagleboard: display message about I2C errors being expected when no expansion boards...
Koen Kooi [Wed, 31 Mar 2010 12:24:25 +0000 (14:24 +0200)]
beagleboard: display message about I2C errors being expected when no expansion boards are present

8 years agoOMAP3: apply Cortex-A8 errata workarounds only on affected revisions
Mans Rullgard [Wed, 14 Apr 2010 16:10:28 +0000 (17:10 +0100)]
OMAP3: apply Cortex-A8 errata workarounds only on affected revisions

The workarounds for errata 621766 and 725233 should only be applied
on affected Cortex-A8 revisions.  Recent chips use r3px cores where
these have been fixed.

Signed-off-by: Mans Rullgard <>
8 years agoOMAP3: convert setup_auxcr() to pure asm
Mans Rullgard [Wed, 14 Apr 2010 15:49:57 +0000 (16:49 +0100)]
OMAP3: convert setup_auxcr() to pure asm

This function consists entirely of inline asm statements, so writing
it directly in a .S file is simpler. Additionally, the inline asm is
not safe as is, since registers are not guaranteed to be preserved
between asm() statements.

Signed-off-by: Mans Rullgard <>
8 years agoOMAP3: fix and clean up L2 cache enable/disable functions
Mans Rullgard [Wed, 14 Apr 2010 11:08:00 +0000 (12:08 +0100)]
OMAP3: fix and clean up L2 cache enable/disable functions

On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode,
so an SMC call to the ROM monitor is required.  On later versions,
and on newer devices, this bit is banked and we can set it directly.

The code checked only the ES revision of the chip, and hence incorrectly
used the ROM call on ES1.0 versions of other devices.

This patch adds a check for chip family as well as revision, and also
removes some code duplication between the enable and disable functions.

Signed-off-by: Mans Rullgard <>
8 years agoOMAP: Overo: set pinmux to enable input mode for the GPMC clock
Steve Sakoman [Fri, 30 Apr 2010 03:38:47 +0000 (20:38 -0700)]
OMAP: Overo: set pinmux to enable input mode for the GPMC clock

This change is required to support boards using synchronous data transfers

8 years agoOMAP3: Beagle: enable support for second and third mmc channels
Steve Sakoman [Fri, 7 May 2010 14:40:26 +0000 (07:40 -0700)]
OMAP3: Beagle: enable support for second and third mmc channels

8 years agoOMAP3: Overo: enable support for second and third mmc channels
Steve Sakoman [Fri, 30 Apr 2010 03:32:04 +0000 (20:32 -0700)]
OMAP3: Overo: enable support for second and third mmc channels

8 years agoOMAP: mmc: add support for second and third mmc channels
Steve Sakoman [Thu, 29 Apr 2010 17:28:14 +0000 (10:28 -0700)]
OMAP: mmc: add support for second and third mmc channels

Boards wishing to use this feature should define CONFIG_SYS_MMC_SET_DEV

8 years agoOMAP3: beagle: implement expansionboard detection based on board/overo.c code
Koen Kooi [Thu, 25 Mar 2010 15:07:23 +0000 (16:07 +0100)]
OMAP3: beagle: implement expansionboard detection based on board/overo.c code

8 years agoOMAP3: Beagle, Overo: remove omapfb.debug=y from default env
Steve Sakoman [Thu, 25 Mar 2010 13:54:47 +0000 (06:54 -0700)]
OMAP3: Beagle, Overo: remove omapfb.debug=y from default env

8 years agoOMAP3: beagle: add support for Beagle xM
Steve Sakoman [Tue, 23 Mar 2010 16:21:49 +0000 (09:21 -0700)]
OMAP3: beagle: add support for Beagle xM

8 years agoOMAP3: clocks: update clock setup for 36XX/37XX
Steve Sakoman [Tue, 23 Mar 2010 16:20:56 +0000 (09:20 -0700)]
OMAP3: clocks: update clock setup for 36XX/37XX

8 years agoOMAP3 sys_info: update cpu detection for 36XX/37XX
Steve Sakoman [Tue, 23 Mar 2010 16:17:59 +0000 (09:17 -0700)]
OMAP3 sys_info: update cpu detection for 36XX/37XX

8 years agoOMAP3: add definitions to support sysinfo cpu and cpu family detection
Steve Sakoman [Tue, 23 Mar 2010 16:15:29 +0000 (09:15 -0700)]
OMAP3: add definitions to support sysinfo cpu and cpu family detection

8 years agoenv_nand.c: fail gracefully if no nand is present
Steve Sakoman [Tue, 23 Mar 2010 16:12:16 +0000 (09:12 -0700)]
env_nand.c: fail gracefully if no nand is present

8 years agoOMAP3: mem.c: enhance the RAM test
Steve Sakoman [Tue, 23 Mar 2010 16:06:49 +0000 (09:06 -0700)]
OMAP3: mem.c: enhance the RAM test

8 years agoOMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already...
Steve Sakoman [Tue, 23 Mar 2010 16:04:50 +0000 (09:04 -0700)]
OMAP3: board.c: don't attempt to set up second RAM bank, assume x-load has already done this

8 years agoOMAP3: trim excessively long delays in i2c driver
Steve Sakoman [Tue, 16 Feb 2010 18:04:30 +0000 (10:04 -0800)]
OMAP3: trim excessively long delays in i2c driver

8 years agoOMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz
Steve Sakoman [Tue, 16 Feb 2010 18:03:14 +0000 (10:03 -0800)]
OMAP3: Overo: set CONFIG_SYS_I2C_SPEED to 400Khz

8 years agoOMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux
Steve Sakoman [Tue, 16 Feb 2010 18:00:45 +0000 (10:00 -0800)]
OMAP3: Overo: enable input on MMC1_CLK and MMC3_CLK pinmux

8 years agoOMAP3: Overo: detect/configure expansion boards using eeprom contents
Steve Sakoman [Fri, 12 Feb 2010 20:17:48 +0000 (12:17 -0800)]
OMAP3: Overo: detect/configure expansion boards using eeprom contents

8 years agoOMAP3: add mpurate boot arg for overo and beagle
Steve Sakoman [Wed, 3 Feb 2010 22:39:14 +0000 (14:39 -0800)]
OMAP3: add mpurate boot arg for overo and beagle

allows one to set the omap clock rate via "setenv mpurate 720" for example

8 years agoOMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0
Steve Sakoman [Wed, 3 Feb 2010 20:26:30 +0000 (12:26 -0800)]
OMAP3: add entry for rev 3.1.2, check and display max cpu clock for rev > 3.0

8 years agoOMAP3: update Beagle revision detection to recognize C4 boards
Steve Sakoman [Wed, 10 Feb 2010 22:51:48 +0000 (14:51 -0800)]
OMAP3: update Beagle revision detection to recognize C4 boards

8 years agoOMAP3: add board revision detection for Overo
Steve Sakoman [Wed, 10 Feb 2010 22:40:56 +0000 (14:40 -0800)]
OMAP3: add board revision detection for Overo

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

Signed-off-by: Wolfgang Denk <>
8 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 <>
Text changed slightly, adding input from Mike Frysinger.

Signed-off-by: Wolfgang Denk <>
8 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 <>
Acked-by: Ben Warren <>
8 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 <>
8 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 <>
Tested-by: Tom <>
8 years agoMerge branch 'master' of git://
Wolfgang Denk [Tue, 30 Mar 2010 20:22:47 +0000 (22:22 +0200)]
Merge branch 'master' of git://

8 years agoMerge branch 'master' of git://
Wolfgang Denk [Tue, 30 Mar 2010 20:21:24 +0000 (22:21 +0200)]
Merge branch 'master' of git://

8 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 <>
Signed-off-by: Kumar Gala <>
8 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 <>
8 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 <>
Acked-by: Heiko Schocher <>
8 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 <>
8 years agoPrepare 2010.03-rc3
Wolfgang Denk [Sat, 27 Mar 2010 23:25:14 +0000 (00:25 +0100)]
Prepare 2010.03-rc3


Signed-off-by: Wolfgang Denk <>
8 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 <>
8 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 <>
Acked-by: Michal Simek <>
8 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

8 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 <>
8 years agoMerge branch 'master' of git://
Wolfgang Denk [Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)]
Merge branch 'master' of git://

8 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 <>
Signed-off-by: Alessandro Rubini <>
Signed-off-by: Thomas Chou <>
Signed-off-by: Stefan Roese <>
8 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 <>
Acked-by : Victor Gallardo <>
Signed-off-by: Stefan Roese <>
8 years agoMerge branch 'master' of git://
Wolfgang Denk [Wed, 24 Mar 2010 13:11:53 +0000 (14:11 +0100)]
Merge branch 'master' of git://

8 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 <>
8 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 <>
Acked-by: Andrea Gallo <>
Signed-off-by: Anatolij Gustschin <>
8 years agoPrepare 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 <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
Acked-by: Joakim Tjernlund <>
8 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 <>
8 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 <>
8 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 <>
Add some more: neither Makefile nor need execute permissions.
Signed-off-by: Wolfgang Denk <>
8 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 <>
8 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 <>
Cc: Ben Warren <>
Signed-off-by: Ben Warren <>
8 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 <>
Signed-off-by: <>
Acked-by: Stefan Roese <>
8 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 <>
8 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 <>
8 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 <>
8 years agoMerge branch 'master' of git://
Wolfgang Denk [Sat, 13 Mar 2010 23:58:30 +0000 (00:58 +0100)]
Merge branch 'master' of git://

8 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 <>
8 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 <>
8 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 <>
8 years agoPrepare 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 <>
8 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 <>
8 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 <>
8 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 <>
CC: Wolfgang Denk <>
CC: Ben Warren <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
Acked-by: Hu Mingkai <>
8 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 <>
8 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 <>
Signed-off-by: Wolfgang Denk <>
8 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 <>
Signed-off-by: Wolfgang Denk <>
8 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 <>
8 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 <>
8 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 <>
Tested-by: Detlev Zundel <>
8 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 <>
Signed-off-by: Wolfgang Denk <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
8 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 <>
Signed-off-by: Stefan Roese <>
Signed-off-by: Heiko Schocher <>
8 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 <>
Tune configuration, add support for (redundant) environment in NAND.
Signed-off-by: Wolfgang Denk <>
Acked-by: Wolfgang Denk <>
CC: Fred Fan <>
CC: Tom <>
8 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 <>
CC: Ben Warren <>
8 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 <>
CC: Ben Warren <>
CC: Fred Fan <>
CC: Tom <>
8 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 <>
Earlier Version Signed-off-by: Wolfgang Denk <>
CC: Fred Fan <>
CC: Tom <>
8 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 <>
8 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 <>
Signed-off-by: Fred Fan <>