oweals/u-boot.git
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Mon, 13 Jul 2009 21:32:01 +0000 (23:32 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Mon, 13 Jul 2009 21:28:37 +0000 (23:28 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

15 years agousb: Fix compiler warning with gcc4.4
Kumar Gala [Tue, 7 Jul 2009 20:48:58 +0000 (15:48 -0500)]
usb: Fix compiler warning with gcc4.4

ehci-hcd.c: In function 'ehci_submit_root':
ehci-hcd.c:719: warning: value computed is not used
ehci-hcd.c:748: warning: value computed is not used

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: add Marvell Kirkwood ehci host controller driver
Prafulla Wadaskar [Mon, 29 Jun 2009 15:26:43 +0000 (20:56 +0530)]
usb: add Marvell Kirkwood ehci host controller driver

This driver is tested on Sheevaplug platform

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agompc83xx: USB: fix: access of ehci struct elements
Vivek Mahajan [Wed, 24 Jun 2009 04:38:40 +0000 (10:08 +0530)]
mpc83xx: USB: fix: access of ehci struct elements

It fixes the access to the 'ehci' struct elements for mpc83xx which
should have been taken care of in 4ef01010aa4799c759d75e67007fdd3a38c88c8a
Sorry about that.

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agompc8xxx: USB: fix: access of ehci struct elements
Vivek Mahajan [Fri, 19 Jun 2009 12:26:00 +0000 (17:56 +0530)]
mpc8xxx: USB: fix: access of ehci struct elements

This patch fixes the access to the 'ehci' struct elements which should
have been taken care off in 4ef01010aa4799c759d75e67007fdd3a38c88c8a
Sorry about that.

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: musb: add timeout via CONFIG_MUSB_TIMEOUT
Bryan Wu [Tue, 16 Jun 2009 09:26:27 +0000 (05:26 -0400)]
usb: musb: add timeout via CONFIG_MUSB_TIMEOUT

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: musb: drop old musb read/write prototypes
Mike Frysinger [Tue, 16 Jun 2009 09:26:25 +0000 (05:26 -0400)]
usb: musb: drop old musb read/write prototypes

These functions are no longer defined, so remove their prototypes.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agousb: fix CONFIG_SYS_MPC83xx_USB_ADDR not defined error
Kim Phillips [Mon, 15 Jun 2009 16:50:07 +0000 (11:50 -0500)]
usb: fix CONFIG_SYS_MPC83xx_USB_ADDR not defined error

fix a stray CONFIG_MPC83XX that escaped commit
0f898604945af4543c1525fc33b6bae621a3b805.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agoCommand improvements for ubifs
Simon Kagstrom [Tue, 7 Jul 2009 14:01:02 +0000 (16:01 +0200)]
Command improvements for ubifs

Check that an argument is passed to ubifsmount and that addresses and
sizes are actually numbers for ubifsload. Also improve the instructions
a bit.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoHandle VID header offset in ubi part command
Simon Kagstrom [Tue, 7 Jul 2009 14:59:46 +0000 (16:59 +0200)]
Handle VID header offset in ubi part command

The VID header offset is sometimes needed to initialize the UBI
partition. This patch adds it (optionally) to the command line
for the ubi part command.

(Lines have been properly wrapped since last version)

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoMAINTAINERS: fix sorting, remove duplicates.
Wolfgang Denk [Thu, 9 Jul 2009 07:56:16 +0000 (09:56 +0200)]
MAINTAINERS: fix sorting, remove duplicates.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 8 Jul 2009 20:01:54 +0000 (22:01 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 8 Jul 2009 20:01:50 +0000 (22:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Wed, 8 Jul 2009 19:51:17 +0000 (21:51 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoall platforms: make show_boot_progress() work again
Heiko Schocher [Wed, 10 Dec 2008 07:27:01 +0000 (08:27 +0100)]
all platforms: make show_boot_progress() work again

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoppc4xx: Make pll_write global
Matthias Fuchs [Mon, 6 Jul 2009 14:27:33 +0000 (16:27 +0200)]
ppc4xx: Make pll_write global

This patch makes pll_write on PPC405EP boards
global and callable from C code.

pll_write can be used to dynamically modify the PLB:PCI divider
as it is required for 33/66 MHz pci adapters based on the 405EP.

board_early_init_f() is a good place to do that (check M66EN signal
and call pll_write() when it is required).

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Remove compilation warning "pci_async_enabled defined but not used"
Stefan Roese [Mon, 6 Jul 2009 09:44:33 +0000 (11:44 +0200)]
ppc4xx: Remove compilation warning "pci_async_enabled defined but not used"

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Implement is_pci_host() for 405 CPUs
Matthias Fuchs [Fri, 3 Jul 2009 14:06:06 +0000 (16:06 +0200)]
ppc4xx: Implement is_pci_host() for 405 CPUs

This patch implements the is_pci_host() function in a similiar way
as it is used on 440 targets.

The former path with CONFIG_PCI_HOST == PCI_HOST_AUTO does not
build on 405EP targets because checking the PCI arbiter is different.
So putting the fixed code into a separate function makes the code
more readable.

Also using is_pci_host() on 405 brings 405 and 440 PCI code
a little bit closer.

In preparation for an upcoming 405EP based PMC module I made this
function weak so that it can be overwritten from board specific code.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fixed PPC4xx debug compilation error in uic.c
Alessio Centazzo [Thu, 2 Jul 2009 05:20:51 +0000 (22:20 -0700)]
ppc4xx: Fixed PPC4xx debug compilation error in uic.c

This patch fixes a debug compilation error for PPC4xx platforms, all
other architectures are not affected by this change.  The 'handler'
pointer was undefined.  The fix is exercised and has effect only if
DEBUG is defined.

Signed-off-by: Alessio Centazzo acpatin@yahoo.com
Signed-off-by: Stefan Roese <sr@denx.de>
15 years ago4xx: Fix compilation warnings and MQ registers dump in SPD DDR2 code
Felix Radensky [Wed, 1 Jul 2009 08:37:46 +0000 (11:37 +0300)]
4xx: Fix compilation warnings and MQ registers dump in SPD DDR2 code

This patch fixes printf format string compilation warnings in several
debug statements. It also fixes the dump of DDR controller MQ registers
found on some 44x and 46x platforms. The current register dump code
uses incorrect DCRs to access these registers.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fix FDT EBC mappings on Canyonlands
Felix Radensky [Mon, 22 Jun 2009 12:30:42 +0000 (15:30 +0300)]
ppc4xx: Fix FDT EBC mappings on Canyonlands

This patch fixes 2 problems with FDT EBC mappings on Canyonlands.
First, NAND EBC mapping was missing, making Linux NAND driver
unusable on this board. Second, NOR remapping code assumed that
NOR is always on CS0, however when booting from NAND NOR is on CS3.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoenv_onenand: change env_address type from unsigned long to loff_t
HeungJun Kim [Tue, 30 Jun 2009 05:42:22 +0000 (14:42 +0900)]
env_onenand: change env_address type from unsigned long to loff_t

If use the onenand boot, the env_relocate_spec() calls mtd->read(),
and the type of the argument #2 of mtd->read() was changed to loff_t.
But, the "env_addr" type is still unsigned long, thus this patch change
the type from unsigned long to loff_t.

Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: HeungJun, Kim <riverful.kim@samsung.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agofsl_elbc_nand: redirect the pointer of bbt pattern to RAM
Mingkai Hu [Thu, 18 Jun 2009 10:23:27 +0000 (18:23 +0800)]
fsl_elbc_nand: redirect the pointer of bbt pattern to RAM

The bbt descriptors contains the pointer to the bbt pattern which
are statically initialized memory struct. When relocated to RAM,
these pointers will continue point to NOR flash(or L2 SRAM, or
other boot device). If the contents of NOR flash changed or L2
SRAM disabled, it'll hang the system.

Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand_spl: Fix cmd_ctrl usage in nand_boot.c.
Scott Wood [Wed, 24 Jun 2009 22:23:49 +0000 (17:23 -0500)]
nand_spl: Fix cmd_ctrl usage in nand_boot.c.

When adding large page NAND support to this file, I had a misunderstanding
about the exact semantics of NAND_CTRL_CHANGE (which isn't documented
anywhere I can find) -- it is apparently just a hint to drivers,
which aren't required to preserve the old value for subsequent
non-"change" invocations.

This change makes nand_boot.c no longer assume this.  Note that this
happened to work by chance with some NAND drivers, which don't preserve
the value, but treat 0 equivalently to NAND_CTRL_ALE.

I don't have hardware to test this, so any testing is appreciated.

Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoBug-fix in drivers mtd nand Makefile
kevin.morfitt@fearnside-systems.co.uk [Thu, 18 Jun 2009 17:41:03 +0000 (18:41 +0100)]
Bug-fix in drivers mtd nand Makefile

The S3C2410 NAND driver source file is included in the makefile instead of
the object file.

Signed-off-by: Kevin Morfitt <kevin.morfitt@fearnside-systems.co.uk>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand_spl: read environment early, when booting from NAND using nand_spl
Guennadi Liakhovetski [Mon, 18 May 2009 14:07:22 +0000 (16:07 +0200)]
nand_spl: read environment early, when booting from NAND using nand_spl

Currently, when booting from NAND using nand_spl, in the beginning the default
environment is used until later in boot process the dynamic environment is read
out. This way environment variables that must be interpreted early, like the
baudrate or "silent", cannot be modified dynamically and remain at their
default values. Fix this problem by reading out main and redundand (if used)
copies of the environment in the nand_spl code.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agomtd: nand: use loff_t for offset
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 12:27:40 +0000 (14:27 +0200)]
mtd: nand: use loff_t for offset

nand_util currently uses size_t which is arch dependent and not always a
unsigned long.  Now use loff_t, as does the linux mtd layer.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agonand/onenand: Fix missing argument checking for "markbad" command
Wolfgang Denk [Sun, 24 May 2009 15:34:33 +0000 (17:34 +0200)]
nand/onenand: Fix missing argument checking for "markbad" command

The "nand markbad" and "onenand markbad" commands did not check if an
argument was passed; if this was forgotten, no error was raised but
block 0 was marked as bad.

While fixing this bug, clean up the code a bit and allow to pass more
than one block address, thus allowing to mark several blocks as bad
in a single command invocation.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agomtd: nand: new base driver for memory mapped nand devices
Mike Frysinger [Tue, 26 May 2009 02:42:28 +0000 (22:42 -0400)]
mtd: nand: new base driver for memory mapped nand devices

The BF537-STAMP Blackfin board had a driver for working with NAND devices
that are simply memory mapped.  Since there is nothing Blackfin specific
about this, generalize the driver a bit so that everyone can leverage it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoenv_nand: remove unused variable.
Guennadi Liakhovetski [Mon, 18 May 2009 14:06:45 +0000 (16:06 +0200)]
env_nand: remove unused variable.

Remove an unused "total" variable in multiple functions.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agodavinci_nand chipselect/init cleanup
David Brownell [Sun, 10 May 2009 22:43:01 +0000 (15:43 -0700)]
davinci_nand chipselect/init cleanup

Update chipselect handling in davinci_nand.c so that it can
handle 2 GByte chips the same way Linux does:  as one device,
even though it has two halves with independent chip selects.
For such chips the "nand info" command reports:

  Device 0: 2x nand0, sector size 128 KiB

Switch to use the default chipselect function unless the board
really needs its own.  The logic for the Sonata board moves out
of the driver into board-specific code.  (Which doesn't affect
current build breakage if its NAND support is enabled...)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoNAND DaVinci: Update to ALE/CLE Mask values
Sandeep Paulraj [Sat, 9 May 2009 16:35:20 +0000 (12:35 -0400)]
NAND DaVinci: Update to ALE/CLE Mask values

All DaVinci SOC's use a CLE mask of 0x10 and an ALE mask of 0x8
except the DM646x. This was decided by the design team driving the design.
This patch updates the CLE and ALE values for DM646x.
Updated patches for DM646x will be sent shortly.
This applies to u-boot-nand-flash git

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoARM DaVinci: Changing ALE Mask Value
Sandeep Paulraj [Wed, 29 Apr 2009 13:47:09 +0000 (09:47 -0400)]
ARM DaVinci: Changing ALE Mask Value

The ALE mask used by DaVinci SOCs is wrong. The patch changes the mask value
from '0xa' to '0x8'. This is the mask we use for all TI releases.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agodavinci_nand: cleanup II (CONFIG_SYS_DAVINCI_BROKEN_ECC)
David Brownell [Tue, 28 Apr 2009 20:19:53 +0000 (13:19 -0700)]
davinci_nand: cleanup II (CONFIG_SYS_DAVINCI_BROKEN_ECC)

Remove CONFIG_SYS_DAVINCI_BROKEN_ECC option.  It's not just nasty;
it's also unused by any current boards, and doesn't even match the
main U-Boot distributions from TI (which use soft ECC, or 4-bit ECC
on newer chips that support it).

DaVinci GIT kernels since 2.6.24, and mainline Linux since 2.6.30,
match non-BROKEN code paths for 1-bit HW ECC.  The BROKEN code paths
do seem to partially match what MontaVista/TI kernels (4.0/2.6.10,
and 5.0/2.6.18) do ... but only for small pages.  Large page support
is really broken (and it's unclear just what software it was trying
to match!), and the ECC layout was making three more bytes available
for use by filesystem (or whatever) code.

Since this option itself seems broken, remove it.  Add a comment
about the MV/TI compat issue, and the most straightforward way to
address it (should someone really need to solve it).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agodavinci_nand: cleanup I (minor)
David Brownell [Tue, 28 Apr 2009 20:19:50 +0000 (13:19 -0700)]
davinci_nand: cleanup I (minor)

Minor cleanup for DaVinci NAND code:

 - Use I/O addresses from nand_chip; CONFIG_SYS_NAND_BASE won't
   be defined when there are multiple chipselect lines in use
   (as with common 2 GByte chips).

 - Cleanup handling of EMIF control registers
    * Only need one pointer pointing to them
    * Remove incorrect and unused struct supersetting them

 - Use the standard waitfunc; we don't need a custom version

 - Partial legacy cleanup:
    * Don't initialize every board like it's a DM6446 EVM
    * #ifdef a bit more code for BROKEN_ECC

Sanity checked with small page NAND on dm355 and dm6446 EVMs;
and large page on dm355 EVM (packaged as two devices, not one).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Tue, 7 Jul 2009 21:18:03 +0000 (23:18 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

15 years agoCoding style cleanup; update CHANGELOG
Wolfgang Denk [Tue, 7 Jul 2009 20:35:02 +0000 (22:35 +0200)]
Coding style cleanup; update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 7 Jul 2009 20:22:05 +0000 (22:22 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
drivers/spi/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Wolfgang Denk [Tue, 7 Jul 2009 19:06:07 +0000 (21:06 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Tue, 7 Jul 2009 18:58:30 +0000 (20:58 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

15 years agoMerge branch 'sf' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Tue, 7 Jul 2009 18:56:56 +0000 (20:56 +0200)]
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 7 Jul 2009 18:54:12 +0000 (20:54 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

15 years agoUBI: Fix build problem noticed on Apollon (arm/testing repo)
Stefan Roese [Mon, 29 Jun 2009 11:30:50 +0000 (13:30 +0200)]
UBI: Fix build problem noticed on Apollon (arm/testing repo)

This patch fixes a build problem noticed on Apollon by using
mtd_dev_by_eb() instead of "/" as done in the Linux UBI version.
So this brings the U-Boot UBI version more in sync with the Linux
version again.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agosf: Macronix additional chips supported
Prafulla Wadaskar [Mon, 6 Jul 2009 14:59:15 +0000 (20:29 +0530)]
sf: Macronix additional chips supported

new chips supported:-
MX25L1605D, MX25L3205D, MX25L6405D, MX25L12855E
out of which MX25L6405D and MX25L12855E tested on Kirkwood platforms

Modified the Macronix flash support to use 2 bytes of device id instead of 1
This was required to support MX25L12855E

Signed-off-by: Piyush Shah <spiyush@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agosf: sst: add sst25vf###b ids
Mike Frysinger [Fri, 19 Jun 2009 07:27:28 +0000 (03:27 -0400)]
sf: sst: add sst25vf###b ids

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agosf: sst: fix sector size
Mike Frysinger [Fri, 19 Jun 2009 07:20:06 +0000 (03:20 -0400)]
sf: sst: fix sector size

Looks like when I was encoding the sector sizes, I forgot to divide by 8
(due to the stupid marketing driven process that declares all sizes in
useless megabits and not megabytes).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agonhk8815: fix MAKEALL
Jean-Christophe PLAGNIOL-VILLARD [Sat, 4 Jul 2009 23:06:06 +0000 (01:06 +0200)]
nhk8815: fix MAKEALL

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoMX31: Add NAND SPL boot support to i.MX31 PDK board.
Magnus Lilja [Sat, 4 Jul 2009 08:31:24 +0000 (10:31 +0200)]
MX31: Add NAND SPL boot support to i.MX31 PDK board.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
15 years agoarm: Kirkwood: arch specific updated for ehci-Kirkwood driver support
Prafulla Wadaskar [Mon, 29 Jun 2009 15:25:54 +0000 (20:55 +0530)]
arm: Kirkwood: arch specific updated for ehci-Kirkwood driver support

This patch abstracts Kirkwood arch specific changes to support ehci-kirkwood driver

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoarm nomadik: use 1000 as HZ value and rewrite timer code
Alessandro Rubini [Mon, 29 Jun 2009 08:52:37 +0000 (10:52 +0200)]
arm nomadik: use 1000 as HZ value and rewrite timer code

This sets CONFIG_SYS_HZ to 1000 as required, and completely rewrites
timer code, which is now both correct and much smaller.  Unused
functions like udelay_masked() have been removed as no driver uses
them, even the ones that are not currently active for this board.
mtu.h is copied literally from the kernel sources.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoarm nomadik: allow Nand and OneNand to coexists
Alessandro Rubini [Mon, 22 Jun 2009 07:18:57 +0000 (09:18 +0200)]
arm nomadik: allow Nand and OneNand to coexists

The evaluation kit has both Nand and OneNand, both drivers are there
and the two configurations only select a different default for the
jffs partition. This adds the OneNand driver and cleans up storage.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoarm nomadik: cleanup reset
Alessandro Rubini [Mon, 22 Jun 2009 07:18:47 +0000 (09:18 +0200)]
arm nomadik: cleanup reset

There is only one public release of the Nomadik chip, so the ifdef
in reset code as well as a define in the config file are not needed

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoarm nomadik: rename board to nhk8815
Alessandro Rubini [Mon, 22 Jun 2009 07:18:37 +0000 (09:18 +0200)]
arm nomadik: rename board to nhk8815

This is an error in my side in the initial submission: nobody
calls it ""nmdk8815", it's "nomadik hardware kit", nhk8815, instead.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoxscale: add support for the polaris board
Stefano Babic [Wed, 1 Jul 2009 18:40:41 +0000 (20:40 +0200)]
xscale: add support for the polaris board

The Polaris board is based on the TrizepsIV module of
Keith & Koep (http://www.keith-koep.com).

Signed-off-by: Stefano Babic <sbabic@denx.de>
15 years agoxscale: fix USB initialization for Trizepsiv module
Stefano Babic [Wed, 1 Jul 2009 02:33:56 +0000 (04:33 +0200)]
xscale: fix USB initialization for Trizepsiv module

Due to change in the usb_board_init() prototype, the USB for
the TrizepsIV was not correctly initialized.
Removed dummy print from usb_board_stop().

Signed-off-by: Stefano Babic <sbabic@denx.de>
15 years agonet: merge bugfix: Marvell Kirkwood gigabit ethernet driver
Prafulla Wadaskar [Wed, 1 Jul 2009 18:34:51 +0000 (20:34 +0200)]
net: merge bugfix: Marvell Kirkwood gigabit ethernet driver

This patch looks okay on u-boot-net.git/next branch
but when it was merged to u-boot.git/master the last line is missing

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoat91: Add esd gmbh MEESC board support
Daniel Gorsulowski [Tue, 30 Jun 2009 19:03:37 +0000 (21:03 +0200)]
at91: Add esd gmbh MEESC board support

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

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
15 years agoARM: Update mach-types
Jean-Christophe PLAGNIOL-VILLARD [Tue, 30 Jun 2009 19:03:35 +0000 (21:03 +0200)]
ARM: Update mach-types

update against linux v2.6.30

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91: Add CAN init function
Daniel Gorsulowski [Tue, 30 Jun 2009 21:03:33 +0000 (23:03 +0200)]
at91: Add CAN init function

To enable CAN init, CONFIG_CAN has to be defined in the board config file
and at91_can_hw_init() has to be called in the board specific code.

CAN is available on AT91SAM9263 and AT91CAP9 SoC.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
15 years agoarm: Kirkwood: Correct header define
Simon Kagstrom [Tue, 30 Jun 2009 21:03:31 +0000 (23:03 +0200)]
arm: Kirkwood: Correct header define

Correct define typo (. -> ,)

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
15 years agoMX31: Add basic support for Freescale i.MX31 PDK board.
Magnus Lilja [Tue, 30 Jun 2009 23:07:55 +0000 (01:07 +0200)]
MX31: Add basic support for Freescale i.MX31 PDK board.

Add support for Freescale's i.MX31 PDK board (a.k.a. 3 stack board).

This patch assumes that some other program performs the actual
NAND boot.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Acked-by: Fabio Estevam <fabioestevam@yahoo.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoS3C24x0: extract interrupts from timer
Jean-Christophe PLAGNIOL-VILLARD [Mon, 22 Jun 2009 22:12:01 +0000 (00:12 +0200)]
S3C24x0: extract interrupts from timer

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agodm355/pm9261: add missing CONFIG_NET_MULTI
Jean-Christophe PLAGNIOL-VILLARD [Sun, 28 Jun 2009 12:14:21 +0000 (14:14 +0200)]
dm355/pm9261: add missing CONFIG_NET_MULTI

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoarm920t/interrupts: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Mon, 22 Jun 2009 22:12:01 +0000 (00:12 +0200)]
arm920t/interrupts: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agomove L2 cache enable/disable function to cache.c in the omap3 SoC directory
Kim, Heung Jun [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
move L2 cache enable/disable function to cache.c in the omap3 SoC directory

Signed-off-by: HeungJun, Kim <riverful.kim@samsung.com>
CC: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoARM DaVinci: EMIF settings
Thomas Lange [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
ARM DaVinci: EMIF settings

NAND module should not modify EMIF registers unrelated to CS2
that is used for NAND, i.e. do not modify EWAIT config register
or registers for other Chip Selects.

Without this patch, EMIF configurations made in board_init()
will be invalidated.

Signed-off-by: Thomas Lange <thomas@corelatus.se>
15 years agoversatile: config coding style cleanup
Jean-Christophe PLAGNIOL-VILLARD [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
versatile: config coding style cleanup

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Peter Pearse <peter.pearse@arm.com>
15 years agoarm: Kirkwood: Basic SOCs support
Prafulla Wadaskar [Sat, 20 Jun 2009 09:01:53 +0000 (11:01 +0200)]
arm: Kirkwood: Basic SOCs support

Kirkwood family controllers are highly integrated SOCs
based on Feroceon-88FR131/Sheeva-88SV131/arm926ejs cpu core.

SOC versions supported:-
1) 88F6281-A0       define CONFIG_KW88F6281_A0
2) 88F6192-A0       define CONFIG_KW88F6192_A0

Other supported features:-
1) get_random_hex() fucntion
2) PCI Express port initialization
3) NS16550 driver support

Contributors:
Yotam Admon <yotam@marvell.com>
Michael Blostein <michaelbl@marvell.com

Reviewed-by: Ronen Shitrit <rshitrit@marvell.com>
Acked-by: Stefan Rose <sr@denx.de>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoarm: generic cache.h for ARM architectures
Prafulla Wadaskar [Sat, 20 Jun 2009 09:01:52 +0000 (11:01 +0200)]
arm: generic cache.h for ARM architectures

This patch is required for Kirkwood SoC support
may be used by other ARM architectures

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoOMAP3EVM: fix typo. replace CS6 by CS5, no functionality change
Matthias Ludwig [Sat, 20 Jun 2009 09:01:50 +0000 (11:01 +0200)]
OMAP3EVM: fix typo. replace CS6 by CS5, no functionality change

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
15 years agoat91sam9260/9263: add back up for the rst(reset controller).
Sedji Gaouaou [Wed, 24 Jun 2009 06:32:09 +0000 (08:32 +0200)]
at91sam9260/9263: add back up for the rst(reset controller).

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was
set to 0 after being set to 500 ms for the PHY reset.
Do backup the old reset length and restore it after the MACB initialisation.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Stelian Pop <stelian@popies.net>
15 years agofsl: Fix compiler warnings from gcc-4.4 in sys_eeprom code
Kumar Gala [Fri, 3 Jul 2009 17:45:44 +0000 (12:45 -0500)]
fsl: Fix compiler warnings from gcc-4.4 in sys_eeprom code

sys_eeprom.c: In function 'do_mac':
sys_eeprom.c:323: warning: dereferencing type-punned pointer will break strict-aliasing rules
sys_eeprom.c: In function 'mac_read_from_eeprom':
sys_eeprom.c:395: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago83xx: Add support for fsl_dma driver
Peter Tyser [Tue, 30 Jun 2009 22:15:51 +0000 (17:15 -0500)]
83xx: Add support for fsl_dma driver

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reviewed-by: Ira W. Snyder <iws@ovro.caltech.edu>
Tested-by: Ira W. Snyder <iws@ovro.caltech.edu>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago83xx: Replace CONFIG_ECC_INIT_VIA_DDRC references
Peter Tyser [Tue, 30 Jun 2009 22:15:50 +0000 (17:15 -0500)]
83xx: Replace CONFIG_ECC_INIT_VIA_DDRC references

Update 83xx architecture's CONFIG_ECC_INIT_VIA_DDRC references to
CONFIG_ECC_INIT_VIA_DDRCONTROLLER, which other Freescale architectures
use

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago8xxx: Second UART port added for MPC85xx, MPC83xx, MPC86xx processors
Poonam Aggrwal [Thu, 2 Jul 2009 10:45:01 +0000 (16:15 +0530)]
8xxx: Second UART port added for MPC85xx, MPC83xx, MPC86xx processors

Defining the next two configs allows to switch the serial port from the
console using the setenv stdin and stdout
  1. #define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */
  2. #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Adds GPIO registers to MPC85xx Memory Map.
Poonam Aggrwal [Thu, 2 Jul 2009 10:44:40 +0000 (16:14 +0530)]
85xx: Adds GPIO registers to MPC85xx Memory Map.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago86xx: XPedite5170 board support
Peter Tyser [Tue, 30 Jun 2009 22:26:01 +0000 (17:26 -0500)]
86xx: XPedite5170 board support

Initial support for Extreme Engineering Solutions XPedite5170 -
a MPC8640-based 3U VPX single board computer with a PMC/XMC
site.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_ddr: Fix DDR3 calculation of rank density with 8GB or more
Timur Tabi [Wed, 1 Jul 2009 21:51:59 +0000 (16:51 -0500)]
fsl_ddr: Fix DDR3 calculation of rank density with 8GB or more

The calculate for rank density in compute_ranksize() for DDR3 used all
integers for the expression, so the result was also a 32-bit integer, even
though the 'bsize' variable is a u64.  Fix the expression to calculate a
true 64-bit value.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Make DMA transactions snoopable
Peter Tyser [Tue, 30 Jun 2009 22:15:49 +0000 (17:15 -0500)]
fsl_dma: Make DMA transactions snoopable

Make DMA transactions snoopable so that CPUs can keep caches up-to-date.
This allows dma transactions to be used for operations such as memory
copies without any additional cache control operations.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Break out common memory initialization function
Peter Tyser [Tue, 30 Jun 2009 22:15:48 +0000 (17:15 -0500)]
fsl_dma: Break out common memory initialization function

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago8xxx: Move dma_init() call to common code
Peter Tyser [Tue, 30 Jun 2009 22:15:47 +0000 (17:15 -0500)]
8xxx: Move dma_init() call to common code

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Move dma function prototypes to common header file
Peter Tyser [Tue, 30 Jun 2009 22:15:46 +0000 (17:15 -0500)]
fsl_dma: Move dma function prototypes to common header file

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago8xxx: Rename dma_xfer() to dmacpy()
Peter Tyser [Tue, 30 Jun 2009 22:15:45 +0000 (17:15 -0500)]
8xxx: Rename dma_xfer() to dmacpy()

Also update dmacpy()'s argument order to match memcpy's and use
phys_addr_t/phy_size_t for address/size arguments

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Fix Channel Start bug in dma_check()
Peter Tyser [Tue, 30 Jun 2009 22:15:44 +0000 (17:15 -0500)]
fsl_dma: Fix Channel Start bug in dma_check()

The Channel Start (CS) bit in the Mode Register (MR) should actually be
cleared as the comment in the code suggests.  Previously, CS was being
set, not cleared.

Assuming normal operation of the DMA engine, this change shouldn't have
any real affect.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Add support for arbitrarily large transfers
Peter Tyser [Tue, 30 Jun 2009 22:15:43 +0000 (17:15 -0500)]
fsl_dma: Add support for arbitrarily large transfers

Support DMA transfers larger than the DMA controller's limit of
(2 ^ 26 - 1) bytes

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Use proper I/O access functions
Peter Tyser [Tue, 30 Jun 2009 22:15:42 +0000 (17:15 -0500)]
fsl_dma: Use proper I/O access functions

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl_dma: Add bitfield definitions for common registers
Peter Tyser [Tue, 30 Jun 2009 22:15:41 +0000 (17:15 -0500)]
fsl_dma: Add bitfield definitions for common registers

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago8xxx: Break out DMA code to a common file
Peter Tyser [Tue, 30 Jun 2009 22:15:40 +0000 (17:15 -0500)]
8xxx: Break out DMA code to a common file

DMA support is now enabled via the CONFIG_FSL_DMA define instead of the
previous CONFIG_DDR_ECC

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoAtmel LCD driver GUARDTIME fix
Mark Jackson [Mon, 29 Jun 2009 14:59:10 +0000 (15:59 +0100)]
Atmel LCD driver GUARDTIME fix

This patch allows the guard time parameter to be set in
the Atmel LCDC driver.

By default, the previous value of 1 is used, unless the
setting is defined elsewhere.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
15 years ago85xx: Add pci e1000 Ethernet support for P2020 board
Roy Zang [Tue, 30 Jun 2009 05:56:23 +0000 (13:56 +0800)]
85xx: Add pci e1000 Ethernet support for P2020 board

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago8xxx: Fix PCI bus address setup for 36-bit configs
Kumar Gala [Thu, 18 Jun 2009 13:39:42 +0000 (08:39 -0500)]
8xxx: Fix PCI bus address setup for 36-bit configs

We want the outbound PCI memory map to end at the 4G boundary so we
can maximize the amount of space available for inbound mappings if
we have large amounts of memory.

This matches the device tree setup in the kernel for the 36-bit physical
configs for the platforms that have one (MPC8641 HPCN & MPC8572 DS).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago86xx: Add CPU_TYPE_ENTRY support
Kumar Gala [Thu, 18 Jun 2009 13:23:01 +0000 (08:23 -0500)]
86xx: Add CPU_TYPE_ENTRY support

Unify with 83xx and 85xx and use CPU_TYPE_ENTRY.  We are going to use
this to convey the # of cores and DDR width in the near future so its
good to keep in sync.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoBlackfin: TWI/I2C: fix pure writes
Peter Meerwald [Mon, 29 Jun 2009 19:48:33 +0000 (15:48 -0400)]
Blackfin: TWI/I2C: fix pure writes

If doing a pure write with register address and data (not a read/write
combo transfer), we don't set the initial transfer length properly which
ends up causing only the register address to be transferred.

While we're here, fix the i2c_write() parameter description of the buffer.

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agospi: Add Marvell Kirkwood SPI driver
Prafulla Wadaskar [Fri, 29 May 2009 19:43:33 +0000 (01:13 +0530)]
spi: Add Marvell Kirkwood SPI driver

This patch adds a SPI driver for the Marvell Kirkwood SoC's.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agos3c64xx: move the reset_cpu function
Minkyu Kang [Thu, 25 Jun 2009 10:21:33 +0000 (19:21 +0900)]
s3c64xx: move the reset_cpu function

Because of the reset_cpu is soc specific, should be move to soc
And read reset value from SYS_ID register instead of hard code
this patch also supports s3c6410

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
15 years agointegrator: merge integratorap and integratorcp
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:37 +0000 (00:58 +0200)]
integrator: merge integratorap and integratorcp

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap/cp: use cfi driver
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap/cp: use cfi driver

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap/cp/versatile: remove non used functions
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap/cp/versatile: remove non used functions

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorcp: split timer support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorcp: split timer support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>