platform/kernel/u-boot.git
14 years agomxc_nand: Update driver to work with i.MX31.
Magnus Lilja [Wed, 11 Nov 2009 19:18:43 +0000 (20:18 +0100)]
mxc_nand: Update driver to work with i.MX31.

Tested on i.MX31 Litekit.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agoMX31: Add struct definition for clock control module in i.MX31.
Magnus Lilja [Wed, 11 Nov 2009 19:18:42 +0000 (20:18 +0100)]
MX31: Add struct definition for clock control module in i.MX31.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agomicroblaze: zlib needs asm/unaligned.h
Michal Simek [Tue, 19 Jan 2010 11:03:25 +0000 (12:03 +0100)]
microblaze: zlib needs asm/unaligned.h

Microblaze has own hw unaligned handler if is available.
Use big endian version.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agomicroblaze: Remove getenv_IPaddr prototype
Michal Simek [Tue, 19 Jan 2010 11:03:24 +0000 (12:03 +0100)]
microblaze: Remove getenv_IPaddr prototype

Commit 6a45e384955262882375a2785426dc65aeb636c4
should remove reference from Microblaze too.

Signed-off-by: Michal Simek <monstr@monstr.eu>
14 years agoMAINTAINERS: fix nhk8815 board name
Alessandro Rubini [Mon, 18 Jan 2010 21:38:38 +0000 (22:38 +0100)]
MAINTAINERS: fix nhk8815 board name

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
14 years agoFix breakage in SMC EEPROM standalone applications
Ben Warren [Mon, 18 Jan 2010 19:35:31 +0000 (11:35 -0800)]
Fix breakage in SMC EEPROM standalone applications

Commit 6a45e384955262882375a2785426dc65aeb636c4 (Make getenv_IPaddr() global)
inadvertently added ' #include "net.h" ' to the standalone programs, creating
duplicate definitions of 'struct eth_device'.  This patch removes the local
definitions and removes other code that breaks due to the change in definition.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMakefile: fix parallel build
Daniel Hobi [Mon, 18 Jan 2010 17:13:39 +0000 (18:13 +0100)]
Makefile: fix parallel build

During parallel build, the top Makefile spawns multiple sub-makes for
targets in cpu/$(CPU) and $(dir $(LDSCRIPT)). If the .depend files are
not present in these directories, the sub-makes may end up generating
these files simultaneously which leads to corrupted content.

A typical error message is:

.depend:39: *** multiple target patterns.  Stop.

This patch serializes the creation of .depend in cpu/$(CPU) and
$(dir $(LDSCRIPT)) by adding these directories to the depend target
in the top Makefile.

Other directories in $(LIBS) are not affected since they contain only
one Make target and thus only one sub-make is spawned per directory.

Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoCRAMFS: support cramfs in RAM
Heiko Schocher [Thu, 7 Jan 2010 07:55:54 +0000 (08:55 +0100)]
CRAMFS: support cramfs in RAM

cramfsls and cramfsload are added to the command list.
A cramfs placed at 'cramfs_addr' can the be listed with 'cramfsls' and files
can be loaded with 'cramfsload'. 'cramfs_addr' is an environment variable
specifying the address the cramfs is located.
This works for powerpc and for ARM.

Use CONFIG_CMD_CRAMFS.

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agopowerpc: keymile boards updates
Heiko Schocher [Thu, 7 Jan 2010 07:55:50 +0000 (08:55 +0100)]
powerpc: keymile boards updates

- malloc size 4 MB for all keymile boards
- use generic FDT code for fixing up the DTS
- enable unit-led at startup for keymile boards
- remove some dts updates for keymile boards
- ppc_83xx, kmeter1: take FE/GbE PHYs out of reset
- ppc_83xx, kmeter1: change from Intel Strata to Spansion 64MB flash
  changed from Intel Strata to Spansion 64MB flash and changed flash layout.
+---------+----------+-----------------------+-----------------------------+
| name    | size     | range                 | description                 |
+---------+----------+-----------------------+-----------------------------+
| u-boot  |   768 KB | 0xf0000000-0xf00bffff | for u-boot                  |
| env     |   128 KB | 0xf00c0000-0xf00dffff | for environment             |
| envred  |   128 KB | 0xf00e0000-0xf00fffff | for environment (redundant) |
| ubi0    | 64512 KB | 0xf0100000-0xf3ffffff | ubi0 for ubi volumes        |
+---------+----------+-----------------------+-----------------------------+

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agoenv, eeprom: add redundant environment support
Heiko Schocher [Thu, 7 Jan 2010 07:55:44 +0000 (08:55 +0100)]
env, eeprom: add redundant environment support

Add redundant environment support for environment lying on a EEPROM.

Tested on uppcoming suen3 support

Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
14 years agocmd_eeprom: I2C updates
Heiko Schocher [Thu, 7 Jan 2010 07:55:40 +0000 (08:55 +0100)]
cmd_eeprom: I2C updates

- CONFIG_ENV_EEPROM_IS_ON_I2C
  define this, if you have I2C and SPI activated, and your
  EEPROM, which holds the environment, is on the I2C bus.

- CONFIG_I2C_ENV_EEPROM_BUS
  if you have an Environment on an EEPROM reached over
  I2C muxes, you can now define, how to reach this
  EEPROM.

Signed-off-by: Heiko Schocher <hs@denx.de>
14 years agomove definition of macros likely and unlikely to compiler.h
Matthias Kaehlcke [Tue, 22 Dec 2009 22:05:45 +0000 (23:05 +0100)]
move definition of macros likely and unlikely to compiler.h

the macros likely and unlikely were defined in include/linux/mtd/compat.h,
but used in code not related to MTD. moved the macro definitions to compiler.h

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agocmd_bootm.c: Change interpretation of standalone image parameters.
Detlev Zundel [Tue, 22 Dec 2009 11:43:02 +0000 (12:43 +0100)]
cmd_bootm.c: Change interpretation of standalone image parameters.

Current code uses the second argument to bootm for standalone images to
override the load address specified in the image instead of passing all
parameters as is to the application.  This behaviour is not documented
and not in line with how the go command works for standalone applications,
so we simply drop it.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agocmd_bootm.c: Do not load a ramdisk when not booting a kernel.
Detlev Zundel [Tue, 22 Dec 2009 11:43:01 +0000 (12:43 +0100)]
cmd_bootm.c: Do not load a ramdisk when not booting a kernel.

In case we boot an image marked as 'standalone' and 'linux', the current
code erroneously tried to load a ramdisk.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agokgdb: update mem2hex/hex2mem funcs
Robin Getz [Mon, 21 Dec 2009 23:40:44 +0000 (18:40 -0500)]
kgdb: update mem2hex/hex2mem funcs

Convert the funcs to do the conversion inline so that we can do the copy
all at once with memcpy.  This let's us push out an weird arch-specific
issue with accessing different regions of memory to the memcpy function
like the MMRs on Blackfin systems, and it should be a bit faster.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agokgdb: drop duplicate debugger_exception_handler
Mike Frysinger [Mon, 21 Dec 2009 23:40:43 +0000 (18:40 -0500)]
kgdb: drop duplicate debugger_exception_handler

The debugger_exception_handler definition is the same for everyone, so use
the common one now.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agokgdb: add default generic stubs
Robin Getz [Mon, 21 Dec 2009 23:40:42 +0000 (18:40 -0500)]
kgdb: add default generic stubs

The default kgdb functions can be implemented with common U-Boot functions,
so rather than force everyone to copy & paste these things, create a set of
weak stubs.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agonetconsole: mark local funcs with static
Mike Frysinger [Mon, 21 Dec 2009 19:19:12 +0000 (14:19 -0500)]
netconsole: mark local funcs with static

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoeasylogo: add support for 16-bit RGB565
Michael Hennerich [Sat, 19 Dec 2009 13:19:09 +0000 (08:19 -0500)]
easylogo: add support for 16-bit RGB565

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agompc5xxx/cpu_init.c: Convert to IO accessors.
Detlev Zundel [Fri, 18 Dec 2009 16:35:57 +0000 (17:35 +0100)]
mpc5xxx/cpu_init.c: Convert to IO accessors.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agompc5xxx.h: Add structure definition for XLB arbiter block.
Detlev Zundel [Fri, 18 Dec 2009 16:35:56 +0000 (17:35 +0100)]
mpc5xxx.h: Add structure definition for XLB arbiter block.

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agoconfig_defaults.h: new header for common u-boot config defaults
Mike Frysinger [Thu, 3 Dec 2009 02:15:03 +0000 (21:15 -0500)]
config_defaults.h: new header for common u-boot config defaults

There are a bunch of features in U-Boot that we want to enable by default,
and it's best if we centralize them in one place rather than updating all
the board files out there.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sun, 17 Jan 2010 22:08:42 +0000 (23:08 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

14 years agoPCIe, USB: Replace 'end point' references with 'endpoint'
Peter Tyser [Sun, 17 Jan 2010 21:38:26 +0000 (15:38 -0600)]
PCIe, USB: Replace 'end point' references with 'endpoint'

When referring to PCIe and USB 'endpoint' is the standard naming
convention.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Remy Bohmer <linux@bohmer.net>
14 years agoMake getenv_IPaddr() global
Dirk Behme [Sun, 3 Jan 2010 07:33:58 +0000 (08:33 +0100)]
Make getenv_IPaddr() global

There are boards out there that do not have network support in
U-Boot (CONFIG_CMD_NET not set), but they do so in Linux. This
makes it desirable to be able to port network configuration (like
the IP address) to the Linux kernel.

We should not make the passing of the IP configuration to Linux
dependent on U-Boot features / settings.

For this, make getenv_IPaddr() global. This fixes build error

u-boot/lib_xxx/board.c:360: undefined reference to `getenv_IPaddr'

on various architectures.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoBlackfin: drop .eh_frame from linker script
Mike Frysinger [Fri, 15 Jan 2010 09:50:40 +0000 (04:50 -0500)]
Blackfin: drop .eh_frame from linker script

Nothing in U-Boot uses runtime C++ exceptions/unwinding, so there is no
need to list this section.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: use sort funcs in the linker script
Mike Frysinger [Fri, 15 Jan 2010 09:47:06 +0000 (04:47 -0500)]
Blackfin: use sort funcs in the linker script

This is just Blackfin catching up with every one else.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: tcm-bf518: new board port
Harald Krapfenbauer [Wed, 13 Jan 2010 14:04:53 +0000 (09:04 -0500)]
Blackfin: tcm-bf518: new board port

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: enable JFFS summary support for ADI boards
Mike Frysinger [Fri, 8 Jan 2010 12:56:17 +0000 (07:56 -0500)]
Blackfin: enable JFFS summary support for ADI boards

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf518f-ezbrd: increase monitor length
Mike Frysinger [Fri, 8 Jan 2010 11:14:13 +0000 (06:14 -0500)]
Blackfin: bf518f-ezbrd: increase monitor length

The addition of KGDB overflowed the current linker section.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: handle anomaly 05000257
Robin Getz [Mon, 21 Dec 2009 22:02:48 +0000 (17:02 -0500)]
Blackfin: handle anomaly 05000257

Need to reload the loop counters to keep from corrupting hardware loops.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: keep hwtrace on CPLB miss
Robin Getz [Mon, 21 Dec 2009 21:59:21 +0000 (16:59 -0500)]
Blackfin: keep hwtrace on CPLB miss

Crashes rarely happen in the CPLB miss handler compared to the rest of
U-Boot code, so disable hardware tracing when processing misses.  This
way a crash due to other functions will be shown properly.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add a netconsole helper
Robin Getz [Mon, 21 Dec 2009 20:31:08 +0000 (15:31 -0500)]
Blackfin: add a netconsole helper

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: add support for BF527-EZKIT v2.1
Michael Hennerich [Thu, 10 Dec 2009 09:19:21 +0000 (09:19 +0000)]
Blackfin: add support for BF527-EZKIT v2.1

The new board revision has a different LCD.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf527-ezkit/bf548-ezkit: add musb board specific initialization
Cliff Cai [Tue, 8 Dec 2009 07:25:57 +0000 (07:25 +0000)]
Blackfin: bf527-ezkit/bf548-ezkit: add musb board specific initialization

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bfin_spi: round up clock divider
Cliff Cai [Mon, 7 Dec 2009 08:03:06 +0000 (08:03 +0000)]
Blackfin: bfin_spi: round up clock divider

If the requested clock cannot be exactly obtained, round it up so that we
err on the side of slightly slower rather than slightly faster.

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: pull io funcs from linux
Mike Frysinger [Mon, 30 Nov 2009 18:51:24 +0000 (13:51 -0500)]
Blackfin: pull io funcs from linux

Some common code uses more of the io.h funcs than we currently provide, so
pull in all of the ones from the linux kernel.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: section off the CF/IDE io.h hacks
Mike Frysinger [Mon, 30 Nov 2009 18:34:07 +0000 (13:34 -0500)]
Blackfin: section off the CF/IDE io.h hacks

These need to be rethought, but until that happens, isolate the hack so
that we can extend the common code without breaking things.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: drop unused funcs from io.h
Mike Frysinger [Mon, 30 Nov 2009 18:30:18 +0000 (13:30 -0500)]
Blackfin: drop unused funcs from io.h

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf533-stamp: split and cleanup CF/IDE code
Mike Frysinger [Mon, 30 Nov 2009 18:08:39 +0000 (13:08 -0500)]
Blackfin: bf533-stamp: split and cleanup CF/IDE code

Give the CF/IDE code its own file to keep things cleanly separated.  While
we're here, clean up the code to use common functions.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: convert bfin_sdh to generic mmc
Cliff Cai [Fri, 20 Nov 2009 08:24:43 +0000 (08:24 +0000)]
Blackfin: convert bfin_sdh to generic mmc

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bfin_spi: let boards control idle value
Cliff Cai [Tue, 17 Nov 2009 09:36:21 +0000 (09:36 +0000)]
Blackfin: bfin_spi: let boards control idle value

Some SPI devices like to see high idle values rather than low.

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: asm/string.h: drop useless includes
Mike Frysinger [Sat, 14 Nov 2009 18:53:00 +0000 (13:53 -0500)]
Blackfin: asm/string.h: drop useless includes

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: use new bfin read/write mmr helper funcs
Mike Frysinger [Thu, 12 Nov 2009 23:42:53 +0000 (18:42 -0500)]
Blackfin: use new bfin read/write mmr helper funcs

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: move watchdog config check to Makefile
Mike Frysinger [Thu, 12 Nov 2009 23:42:07 +0000 (18:42 -0500)]
Blackfin: move watchdog config check to Makefile

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: fix L1 Instruction sizes on BF52x/BF54x
Mike Frysinger [Thu, 12 Nov 2009 00:08:33 +0000 (19:08 -0500)]
Blackfin: fix L1 Instruction sizes on BF52x/BF54x

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf527-ezkit: auto-select NAND settings
Mike Frysinger [Wed, 11 Nov 2009 22:29:35 +0000 (17:29 -0500)]
Blackfin: bf527-ezkit: auto-select NAND settings

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: support boards with no external memory
Mike Frysinger [Tue, 10 Nov 2009 00:38:23 +0000 (19:38 -0500)]
Blackfin: support boards with no external memory

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: re-architect initcode
Mike Frysinger [Tue, 10 Nov 2009 00:44:04 +0000 (19:44 -0500)]
Blackfin: re-architect initcode

The single initcode function was growing unwieldy, so split it up the
distinct steps into their own function.  This should making digesting the
result much easier on people.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: global_data.h: make pull in needed headers
Mike Frysinger [Mon, 9 Nov 2009 23:08:09 +0000 (18:08 -0500)]
Blackfin: global_data.h: make pull in needed headers

We need the definition of bd_t in this header, so pull in asm/u-boot.h.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: kill off useless initdram() usage
Mike Frysinger [Tue, 3 Nov 2009 11:28:22 +0000 (06:28 -0500)]
Blackfin: kill off useless initdram() usage

While the initdram() function makes sense on some arches, it doesn't for
Blackfin systems as it's always implemented the same way.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: move section length calculation to linker script
Mike Frysinger [Tue, 3 Nov 2009 11:11:31 +0000 (06:11 -0500)]
Blackfin: move section length calculation to linker script

The length of the sections is fixed at link time, so let the linker do the
calculation rather than doing it ourselves at runtime.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf561-acvilon: new board port
Valentin Yakovenkov [Mon, 26 Oct 2009 22:43:04 +0000 (18:43 -0400)]
Blackfin: bf561-acvilon: new board port

Signed-off-by: Valentin Yakovenkov <yakovenkov@niistt.ru>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: ADI settings: enable silent console support
Mike Frysinger [Thu, 15 Oct 2009 18:59:46 +0000 (14:59 -0400)]
Blackfin: ADI settings: enable silent console support

Very little additional code overhead, and only works when the user sets an
env var ahead of time, so default to on makes sense.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: rename SPI/MMC define
Mike Frysinger [Thu, 15 Oct 2009 18:55:21 +0000 (14:55 -0400)]
Blackfin: bf537-stamp: rename SPI/MMC define

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: update tiny board settings (voltage/default env)
Harald Krapfenbauer [Wed, 14 Oct 2009 12:37:32 +0000 (08:37 -0400)]
Blackfin: update tiny board settings (voltage/default env)

The tinyboards like to run at a little lower voltage than the default, and
they prefer to boot over the network.  For the latter, extend the common
code a little to make this easier.

Also fix the cm-bf527 env sector size while we're in here to reflect the
flash that is actually in use.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: tweak embedded LDR env config option
Mike Frysinger [Wed, 22 Jul 2009 02:17:36 +0000 (22:17 -0400)]
Blackfin: tweak embedded LDR env config option

Use the common config option for extracting the environment for embedding
into LDR files and clarify the LDR-specific option.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agomalloc: return NULL if not initialized yet
Wolfgang Denk [Fri, 15 Jan 2010 10:20:10 +0000 (11:20 +0100)]
malloc: return NULL if not initialized yet

When malloc() was called before it was properly initialized
(as would happen if when used before relocation to RAM) it returned
random, non-NULL values, which called all kinds of difficult to debug
subsequent errors.

Make sure to return NULL when initialization was not done yet.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoJFFS2: drop support for LZARI compression mode
Wolfgang Denk [Fri, 15 Jan 2010 10:10:33 +0000 (11:10 +0100)]
JFFS2: drop support for LZARI compression mode

Support for LZARI compression mode was added based on a MTD CVS
snapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c contains
contradictory licensing terms: the original copyright clause says "All
rights reserved. Permission granted for non-commercial use.", but
later reference to the file 'LICENCE' in the jffs2 directory was added
which says GPL v2 or later.

As no boards ever used LZARI compression, and this file is also not
present in recent MTD code, we resolve this conflict by removing the
conflicting file and references to it.

Also copy the referenced but missing file 'LICENCE' from the current
MTD source tree.

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 12 Jan 2010 22:47:03 +0000 (23:47 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Tue, 12 Jan 2010 22:42:32 +0000 (23:42 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Tue, 12 Jan 2010 22:39:08 +0000 (23:39 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 12 Jan 2010 22:30:40 +0000 (23:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agousb: musb: add virtual root hub control support
Bryan Wu [Sat, 9 Jan 2010 21:53:54 +0000 (16:53 -0500)]
usb: musb: add virtual root hub control support

For MUSB devices that do not support multipoint (hubs), we have to emulate
a root hub so that we can support core operations like resetting ports.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoAdds EHCI definitions to sequoia board configuration file.
Chris Zhang [Wed, 6 Jan 2010 21:34:06 +0000 (13:34 -0800)]
Adds EHCI definitions to sequoia board configuration file.

Adds required definitions for EHCI support in sequoia configuration file.
But still keeps the OHCI as default driver.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoAdd ppc440epx USB ehci support.
Chris Zhang [Wed, 6 Jan 2010 21:34:05 +0000 (13:34 -0800)]
Add ppc440epx USB ehci support.

Currently ppc440epx uses OHCI for USB full-speed support. This change adds
support for EHCI.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoFix EHCI port reset.
Chris Zhang [Wed, 6 Jan 2010 21:34:04 +0000 (13:34 -0800)]
Fix EHCI port reset.

In USB ehci driver, the port reset is not terminated. EHCI spec says "A host
 controller must terminate the reset and stabilize the state of the port within
 2 milliseconds". Without termination, a port stays at reset state. This is
 observed on ppc4xx(sequoia) boards.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoomap3: fix compile warning
Sanjeev Premi [Thu, 24 Dec 2009 08:50:41 +0000 (14:20 +0530)]
omap3: fix compile warning

This patch fixes this warning during compile:

omap3.c: In function 'musb_platform_init':
omap3.c:126: warning: label 'end' defined but not used

Problem reported by: Dirk Behme[dirk.behme@googlemail.com]

Signed-off-by: Sanjeev Premi <premi@ti.com>
14 years agousb: musb: add support for Blackfin MUSB
Bryan Wu [Thu, 17 Dec 2009 03:04:02 +0000 (22:04 -0500)]
usb: musb: add support for Blackfin MUSB

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: change rxcsr register from write to read/modify/write
Bryan Wu [Thu, 17 Dec 2009 03:04:01 +0000 (22:04 -0500)]
usb: musb: change rxcsr register from write to read/modify/write

The RX Control/Status register has bits that we want to preserve, so don't
just write out a single bit.  Preserve the others bits in the process.

The original code posted to the u-boot list had this behavior, but looks
like it was lost somewhere along the way to merging.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make multipoint optional
Bryan Wu [Thu, 17 Dec 2009 03:04:00 +0000 (22:04 -0500)]
usb: musb: make multipoint optional

The multipoint handling under MUSB is optional, and some parts (like the
Blackfin processor) do not implement support for it.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make fifo support configurable
Bryan Wu [Thu, 17 Dec 2009 03:03:59 +0000 (22:03 -0500)]
usb: musb: make fifo support configurable

The dynamic FIFO handling under MUSB is optional, and some parts (like
the Blackfin processor) do not implement support for it.

Due to this, the FIFO reading/writing steps need special handling, so
mark the common versions weak so drivers can override.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make sure the register layout is packed
Mike Frysinger [Thu, 17 Dec 2009 03:03:58 +0000 (22:03 -0500)]
usb: musb: make sure the register layout is packed

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agoDA830: Add usb config
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:14 +0000 (10:56 +0530)]
DA830: Add usb config

Adding USB configuration. Default is set for USB MSC host.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA8xx: Add MUSB host support
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:13 +0000 (10:56 +0530)]
DA8xx: Add MUSB host support

Tested USB host functionality on DA830 EVM.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA8xx: Add GPIO register definitions
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:12 +0000 (10:56 +0530)]
DA8xx: Add GPIO register definitions

Added DA8xx GPIO base addresses in gpio_defs.h and pointers
to different BANKs which can be used to program GPIOs.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA830: Add pinmux for USB0_DRVVBUS
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:11 +0000 (10:56 +0530)]
DA830: Add pinmux for USB0_DRVVBUS

USB0_DRVVBUS pinmux configuration is required for USB functinality
in uboot.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agompc83xx: add support configure bus parking
Heiko Schocher [Thu, 7 Jan 2010 07:56:00 +0000 (08:56 +0100)]
mpc83xx: add support configure bus parking

Add support to configure bus parking mode and master in bus arbitration
configuration (ACR). Add this for the kmeter1 port:

Configure bus arbiter with recommended values from Freescale
to improve bus latency/throughput for application with
intensive QuiccEngine activity.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: vme8349: Fix power up reset sequence for tsi148
Reinhard Arlt [Tue, 8 Dec 2009 08:21:41 +0000 (09:21 +0100)]
mpc83xx: vme8349: Fix power up reset sequence for tsi148

Remove PCI reset, if there is a monarch PMC module.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
convert clrbits_be32 + setbits_be32 to clrsetbits_be32, use out_be32 to set gcr.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add support for MPC8349 esd caddy2
Reinhard Arlt [Tue, 8 Dec 2009 08:13:08 +0000 (09:13 +0100)]
mpc83xx: Add support for MPC8349 esd caddy2

The caddy2 is a variant of the already supported vme8349. So we just
add the differences to this board port. To better support those two
boards we switched from fixed SDRAM configuration to usage of
spd_sdram(). This is done by providing a board specific SPD EEPROM
routine with different values for both boards.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
changed to use mkconfig -t option instead, plus misc codingstyle fixes.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: spd_sdram.c: Disable memory controller before initializing
Stefan Roese [Tue, 8 Dec 2009 08:10:04 +0000 (09:10 +0100)]
mpc83xx: spd_sdram.c: Disable memory controller before initializing

The memory controller could already be enabled, when spd_sdram() is
called. This could be the case for example, when the SDRAM is initialized
by the JTAG debugger.

The "sync" after the register access via the accessor function is
still needed, because the macro uses the sync before the real write
is done. So until not all accesses are converted to using accessor
functions, this sync still needs to be made "manually" here.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd.eu>
Acked-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add NAND boot support for MPC8315E-RDB boards
Anton Vorontsov [Tue, 24 Nov 2009 17:12:12 +0000 (20:12 +0300)]
mpc83xx: Add NAND boot support for MPC8315E-RDB boards

The core support for NAND booting is there already, so this patch
is pretty straightforward.

There is one trick though: top level Makefile expects nand_spl to
be in nand_spl/board/$(BOARDDIR), but we can fully reuse the code
from mpc8313erdb boards, and so to not duplicate the code we just
symlink nand_spl/board/freescale/mpc8315erdb to mpc8313erdb.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
o silence make during ln echo
o update documentation
o and avoid:

$ ./MAKEALL MPC8315ERDB_NAND
Configuring for MPC8315ERDB board...
sdram.o: In function `fixed_sdram':
/home/r1aaha/git/u-boot/nand_spl/board/freescale/mpc8313erdb/sdram.c:72: undefined reference to `udelay'

by renaming udelay -> __udelay in the spirit of commit
3eb90bad651fab39cffba750ec4421a9c01d60e7 "Generic udelay() with watchdog
support".

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoonenand: Fix compile errors due to FlexOneNAND
Sanjeev Premi [Fri, 18 Dec 2009 09:25:24 +0000 (14:55 +0530)]
onenand: Fix compile errors due to FlexOneNAND

This patch fixes the compile error while trying to
compile for omap3evm.

env_onenand.c: In function 'env_relocate_spec':
env_onenand.c:70: error: 'CONFIG_ENV_ADDR_FLEX' undeclared
 (first use in this function)
env_onenand.c:70: error: (Each undeclared identifier is re
ported only once
env_onenand.c:70: error: for each function it appears in.)
env_onenand.c: In function 'saveenv':
env_onenand.c:106: error: 'CONFIG_ENV_ADDR_FLEX' undeclare
d (first use in this function)
env_onenand.c:107: error: 'CONFIG_ENV_SIZE_FLEX' undeclare
d (first use in this function)

Signed-off-by: Sanjeev Premi <premi@ti.com>
Acked-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoDavinci: davinci_nand.c performance enhancments
Nick Thompson [Wed, 16 Dec 2009 11:15:58 +0000 (11:15 +0000)]
Davinci: davinci_nand.c performance enhancments

Introduces various optimisations that approximately triple the
read data rate from NAND when run on da830evm.

Most of these optimisations depend on the endianess of the machine
and most of them are very similar to optimisations already present
in the Linux Kernel.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
14 years agoARM Update mach-types
Tom Rix [Wed, 6 Jan 2010 15:36:24 +0000 (09:36 -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 c9f937e4a3f4ebf9924ec21d80632e5eb61d949c

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoppc/p4080: Add Corenet Platform Cache (CPC) registers
Becky Bruce [Wed, 18 Nov 2009 03:10:21 +0000 (21:10 -0600)]
ppc/p4080: Add Corenet Platform Cache (CPC) registers

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: setup ODT_RD_CFG & ODT_WR_CFG when we interleave
Dave Liu [Wed, 16 Dec 2009 16:24:39 +0000 (10:24 -0600)]
fsl-ddr: setup ODT_RD_CFG & ODT_WR_CFG when we interleave

In chip-select interleaving case, we also need set the ODT_RD_CFG
and ODT_WR_CFG in cs1_config register.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: add override for the Rtt_Wr
Dave Liu [Wed, 16 Dec 2009 16:24:38 +0000 (10:24 -0600)]
fsl-ddr: add override for the Rtt_Wr

Different boards may require different settings of Dynamic ODT (Rtt_Wr).
We provide a means to allow the board specific code to provide its own
value of Rtt_Wr.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: add the override for write leveling
Dave Liu [Wed, 16 Dec 2009 16:24:37 +0000 (10:24 -0600)]
fsl-ddr: add the override for write leveling

add the override for write leveling sampling and
start time according to specific board.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: Fix power-down timing settings
Dave Liu [Wed, 16 Dec 2009 16:24:36 +0000 (10:24 -0600)]
fsl-ddr: Fix power-down timing settings

1. TIMING_CFG_0[ACT_PD_EXIT] was set to 6 clocks, but
   It should be set to tXP parameter, tXP=max(3CK, 7.5ns)
2. TIMING_CFG_0[PRE_PD_EXIT] was set to 6 clocks, but
   It should be set to tXP (if MR0[A12]=1) else to tXPDLL parameter
   We are setting the mode register MR0[A12]='1'

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agompc85xx: Add 4-bits eSDHC support for MPC8569E-MDS boards
Anton Vorontsov [Tue, 15 Dec 2009 22:14:31 +0000 (01:14 +0300)]
mpc85xx: Add 4-bits eSDHC support for MPC8569E-MDS boards

Thanks to "Errata to MPC8569E PowerQUICC III Integrated Host Processor
Family Reference Manual, Rev. 0" document, which describes all eSDHC
pins, we can add 4-bits eSDHC support for MPC8569E-MDS boards.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Fix reporting of PME & FM clock frequencies
Kumar Gala [Wed, 9 Dec 2009 23:28:17 +0000 (17:28 -0600)]
ppc/p4080: Fix reporting of PME & FM clock frequencies

We incorrectly had the sense of PME_CLK_SEL, FM1_CLK_SEL, FM2_CLK_SEL
backwards so we report the wrong frequency.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl_law: add SRIO2 target id and law_size_bits() macro
Li Yang [Wed, 9 Dec 2009 06:26:08 +0000 (14:26 +0800)]
fsl_law: add SRIO2 target id and law_size_bits() macro

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Map boot page guarded for MP boot
Kumar Gala [Wed, 18 Nov 2009 02:21:20 +0000 (20:21 -0600)]
ppc/85xx: Map boot page guarded for MP boot

We already map the page cache-inhibited.  There is no reason we
shouldn't also be marking it guarded to prevent speculative accesses.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc: Added macro to test for specific SVR revision
Kumar Gala [Wed, 18 Nov 2009 04:44:52 +0000 (22:44 -0600)]
ppc: Added macro to test for specific SVR revision

Various SoC errata are specific to a given revision of silicon. This
patch gives us a simple macro to use when doing such tests.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agop4080: add readback to bootpage translation window
Dave Liu [Wed, 18 Nov 2009 02:01:24 +0000 (20:01 -0600)]
p4080: add readback to bootpage translation window

We need to add the readback to bootpage translation LAW
to make it effect.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Make flash TLB entry determined at runtime on FSL boards
Kumar Gala [Fri, 13 Nov 2009 15:25:07 +0000 (09:25 -0600)]
ppc/85xx: Make flash TLB entry determined at runtime on FSL boards

Rather than hard coding which TLB entry the FLASH is mapped with we can
use find_tlb_idx to determine the entry.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Remove CONFIG_SYS_DDR_TLB_START
Kumar Gala [Fri, 13 Nov 2009 15:09:10 +0000 (09:09 -0600)]
ppc/85xx: Remove CONFIG_SYS_DDR_TLB_START

Now that we dynamically determine TLB CAM entries to use we dont need
CONFIG_SYS_DDR_TLB_START anymore.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Make SPD DDR TLB setup code use dynamic entry allocation
Kumar Gala [Fri, 13 Nov 2009 15:04:19 +0000 (09:04 -0600)]
ppc/85xx: Make SPD DDR TLB setup code use dynamic entry allocation

Now that we track which TLB CAM entries are used we can allocate
entries on the fly.  Change the SPD DDR TLB setup code to assume
we use at most 8 TLBs (or the number free, which ever is fewer).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Add tracking of TLB CAM usage
Kumar Gala [Thu, 12 Nov 2009 16:26:16 +0000 (10:26 -0600)]
ppc/85xx: Add tracking of TLB CAM usage

We need to track which TLB CAM entries are used to allow us to
"dynamically" allocate entries later in the code.  For example the SPD
DDR code today hard codes which TLB entries it uses.  We can now make
that pick entries that are free.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>