]> git.sur5r.net Git - u-boot/log
u-boot
13 years agopowerpc/85xx: Rework MPC8572DS pci_init_board to use common FSL PCIe code
Kumar Gala [Fri, 17 Dec 2010 12:53:52 +0000 (06:53 -0600)]
powerpc/85xx: Rework MPC8572DS pci_init_board to use common FSL PCIe code

Remove duplicated code in MPC8572DS board and utilize the common
fsl_pcie_init_board().  We also now dynamically setup the LAWs for PCI
controllers based on which PCIe controllers are enabled.

Signed-off-by: Chenhui Zhao <b26998@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/fsl-pci: Add generic code to setup PCIe controllers
Kumar Gala [Wed, 15 Dec 2010 20:21:41 +0000 (14:21 -0600)]
powerpc/fsl-pci: Add generic code to setup PCIe controllers

Since all the PCIe controllers are connected over SERDES on the SoCs we
can utilize is_serdes_configured() to determine if a controller is
enabled.  After which we can setup the ATMUs and LAWs for the controller
in a common fashion and allow board code to specify what the controller
is connected to for reporting reasons.

We also provide a per controller (rather than all) for some systems that
may have special requirements.

Finally, we refactor the code used by the P1022DS to utilize the new
generic code.

Based on patch by: Li Yang <leoli@freescale.com>

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/fsl-pci: Determine pci_controller based on cfg addr for dts fixup
Kumar Gala [Fri, 17 Dec 2010 11:57:25 +0000 (05:57 -0600)]
powerpc/fsl-pci: Determine pci_controller based on cfg addr for dts fixup

Previously we passed in a specifically named struct pci_controller to
determine if we had setup the particular PCI bus.  Now we can search for
the struct so we dont have to depend on the name or the struct being
statically allocated.

Introduced new find_hose_by_cfg_addr() to get back a pci_controller struct
back by searching for it means we can do things like dynamically allocate
them or not have to expose the static structures to all users.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Wolfgang Denk <wd@denx.de>
13 years agopowerpc/85xx: Fix bug in dcache_disable
Kumar Gala [Wed, 5 Jan 2011 16:33:46 +0000 (10:33 -0600)]
powerpc/85xx: Fix bug in dcache_disable

We set the L1 dache register with a bogus register value.  Need to be
using 'r3' instead of 'r0'.

Reported-by: John Traill <john.traill@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMPC8xxx DDR: align informational prints
Becky Bruce [Fri, 17 Dec 2010 23:17:59 +0000 (17:17 -0600)]
MPC8xxx DDR: align informational prints

Add spaces to cause the informational prints to line up with
the ones from init_func_ram() in board.c.  Output now looks like
this:

....
DRAM:  Detected 4096 MB of memory
       This U-Boot only supports < 4G of DDR
       You could rebuild it with CONFIG_PHYS_64BIT
       DDR: 2 GiB (DDR2, 64-bit, CL=5, ECC off)
....

The prints from lbc_sdram_init() have also been modified to line
line up and changed to start with "LBC SDRAM" instead of the
confusing "SDRAM".

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years ago85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN
Becky Bruce [Fri, 17 Dec 2010 23:17:58 +0000 (17:17 -0600)]
85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN

This config option is for an erratum workaround; rename it to be more
clear.  Also, drop it from config files don't need it and were
undefining it.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agompc85xx: rename sdram_init() lbc_sdram_init()
Becky Bruce [Fri, 17 Dec 2010 23:17:57 +0000 (17:17 -0600)]
mpc85xx: rename sdram_init() lbc_sdram_init()

sdram_init() is used to initialize sdram on the lbc.  Rename it
accordingly.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agompc85xx boards: initdram() cleanup/bugfix
Becky Bruce [Fri, 17 Dec 2010 23:17:56 +0000 (17:17 -0600)]
mpc85xx boards: initdram() cleanup/bugfix

Correct initdram to use phys_size_t to represent the size of
dram; instead of changing this all over the place, and correcting
all the other random errors I've noticed, create a
common initdram that is used by all non-corenet 85xx parts.  Most
of the initdram() functions were identical, with 2 common differences:

1) DDR tlbs for the fixed_sdram case were set up in initdram() on
some boards, and were part of the tlb_table on others.  I have
changed them all over to the initdram() method - we shouldn't
be accessing dram before this point so they don't need to be
done sooner, and this seems cleaner.

2) Parts that require the DDR11 erratum workaround had different
implementations - I have adopted the version from the Freescale
errata document.  It also looks like some of the versions were
buggy, and, depending on timing, could have resulted in the
DDR controller being disabled.  This seems bad.

The xpedite boards had a common/fsl_8xxx_ddr.c; with this
change only the 517 board uses this so I have moved the ddr code
into that board's directory in xpedite517x.c

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Tested-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agompc85xx/tlb.c: Allow platforms to specify wimge bits
Becky Bruce [Fri, 17 Dec 2010 23:17:55 +0000 (17:17 -0600)]
mpc85xx/tlb.c: Allow platforms to specify wimge bits

Some platforms might want to override the default wimge=0 for
DDR.  Add CONFIG_SYS_PPC_DDR_WIMGE for those platforms to use.
This will initially only be used by TQM85xx, but could be
useful for other boards or testing going forward.  Note that
the name of this define is not 85xx-specific.  WIMGE is a
fairly universal concept, so any ppc platforms that require
different WIMGE settings for DDR can use the same #define.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agotqm85xx: create fixed_sdram() to do sdram setup
Becky Bruce [Fri, 17 Dec 2010 23:17:54 +0000 (17:17 -0600)]
tqm85xx: create fixed_sdram() to do sdram setup

Also, change this code to use phys_size_t instead of long int.
Using common naming for this function will enable us to use the common
initdram() for 85xx going forward.  Other than the type change,
this is just a code rearrange.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Cleanup SGMII detection and reporting
Kumar Gala [Thu, 16 Dec 2010 20:28:06 +0000 (14:28 -0600)]
powerpc/85xx: Cleanup SGMII detection and reporting

Use new is_serdes_configured to determine if TSECs are in SGMII mode and
report that on the various boards that use or can be configured in SGMII
mode in board_eth_init() instead of in the PCI init code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/8xxx: Replace is_fsl_pci_cfg with is_serdes_configured
Kumar Gala [Wed, 15 Dec 2010 10:55:20 +0000 (04:55 -0600)]
powerpc/8xxx: Replace is_fsl_pci_cfg with is_serdes_configured

Now that we have serdes support for all 85xx/86xx/Pxxx chips we can
replace the is_fsl_pci_cfg() code with the is_serdes_configured().

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Fix esdhc disabled problem on some platforms
Chenhui Zhao [Tue, 4 Jan 2011 09:23:05 +0000 (17:23 +0800)]
fsl_esdhc: Fix esdhc disabled problem on some platforms

Some new platform's esdhc pins don't share with other function.
The eSDHC shouldn't be disabled, even if "esdhc" isn't defined
in hwconfig env variable.

Use CONFIG_FSL_ESDHC_PIN_MUX to fix this problem.

Signed-off-by: Chenhui Zhao <b26998@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Fix wrong SVR value for MPC8567 and MPC8567E processors
Piergiorgio Beruto [Tue, 4 Jan 2011 13:32:15 +0000 (14:32 +0100)]
powerpc/85xx: Fix wrong SVR value for MPC8567 and MPC8567E processors

Signed-off-by: Piergiorgio Beruto <piergiorgio.beruto@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for P1021 SERDES
Kumar Gala [Wed, 15 Dec 2010 10:04:56 +0000 (04:04 -0600)]
powerpc/85xx: Add is_serdes_configured() support for P1021 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for MPC8544 SERDES
Kumar Gala [Tue, 27 Apr 2010 14:20:20 +0000 (09:20 -0500)]
powerpc/85xx: Add is_serdes_configured() support for MPC8544 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for MPC8569 SERDES
Kumar Gala [Tue, 27 Apr 2010 05:05:41 +0000 (00:05 -0500)]
powerpc/85xx: Add is_serdes_configured() support for MPC8569 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for MPC8568 SERDES
Kumar Gala [Tue, 27 Apr 2010 04:44:10 +0000 (23:44 -0500)]
powerpc/85xx: Add is_serdes_configured() support for MPC8568 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for MPC8548 SERDES
Kumar Gala [Tue, 27 Apr 2010 04:25:33 +0000 (23:25 -0500)]
powerpc/85xx: Add is_serdes_configured() support for MPC8548 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for MPC8572 SERDES
Kumar Gala [Tue, 27 Apr 2010 04:09:23 +0000 (23:09 -0500)]
powerpc/85xx: Add is_serdes_configured() support for MPC8572 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Chenhui Zhao <b26998@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add is_serdes_configured() support for P2020 SERDES
Kumar Gala [Wed, 15 Dec 2010 08:49:03 +0000 (02:49 -0600)]
powerpc/85xx: Add is_serdes_configured() support for P2020 SERDES

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/86xx: Add SERDES support on MPC8641 & MPC8610
Kumar Gala [Wed, 15 Dec 2010 10:52:48 +0000 (04:52 -0600)]
powerpc/86xx: Add SERDES support on MPC8641 & MPC8610

Add the ability to determine if a given IP block connected on SERDES is
configured.  This is useful for things like PCIe and SRIO since they are
only ever connected on SERDES.  This mimics the code we have in place
for the 85xx platforms.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Create a SERDES section in Makefile
Kumar Gala [Wed, 15 Dec 2010 10:07:55 +0000 (04:07 -0600)]
powerpc/85xx: Create a SERDES section in Makefile

Created a section in the Makefile for SoC specific SERDES code.  Also
added P1013 SERDES (use P1022 SERDES code).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Replace CONFIG_SYS_HAS_SERDES with a weak function
Kumar Gala [Wed, 15 Dec 2010 09:50:47 +0000 (03:50 -0600)]
powerpc/85xx: Replace CONFIG_SYS_HAS_SERDES with a weak function

Instead of a #define use a null weak function for fsl_serdes_init

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Add support for booting from NAND on MPC8572DS
Kumar Gala [Fri, 12 Nov 2010 14:22:01 +0000 (08:22 -0600)]
powerpc/85xx: Add support for booting from NAND on MPC8572DS

Mimic support that exists on MPC8536DS on the MPC8572DS to allow booting
from NAND.

Signed-off-by: Jin Qing <b24347@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMPC8568/MPC8569: Remove CONFIG_DDR_DLL define
Becky Bruce [Mon, 13 Dec 2010 21:06:48 +0000 (15:06 -0600)]
MPC8568/MPC8569: Remove CONFIG_DDR_DLL define

Neither of these parts should have the erratum this is meant to
work around.  Delete it.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agompc8569mds: Remove unnecessary CONFIG_SYS_LBC_SDRAM_BASE definition
Becky Bruce [Mon, 13 Dec 2010 21:06:45 +0000 (15:06 -0600)]
mpc8569mds: Remove unnecessary CONFIG_SYS_LBC_SDRAM_BASE definition

This isn't used - delete it.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agosocrates: rename sdram_setup fixed_sdram()
Becky Bruce [Mon, 13 Dec 2010 21:06:44 +0000 (15:06 -0600)]
socrates: rename sdram_setup fixed_sdram()

This will help us go to a fixed initdram() for all 85xx boards going
forward.  sdram_setup() had an argument that it didn't need, since the
value was #defined.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMPC8xxx: Update maintainer entry for Wind River sbc8xxx boards
Paul Gortmaker [Mon, 13 Dec 2010 19:46:43 +0000 (14:46 -0500)]
MPC8xxx: Update maintainer entry for Wind River sbc8xxx boards

I've probably got the best chance of getting access to these
boards in order to test things, and since Joe's e-mail is
bouncing, update the MAINTAINERS entry to reflect this.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Remove support for PM854/PM856 boards
Kumar Gala [Tue, 14 Dec 2010 04:02:08 +0000 (22:02 -0600)]
powerpc/85xx: Remove support for PM854/PM856 boards

The PM854/PM856 boards are no longer maintained and thus we are removing
support for them.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Wolfgang Denk <wd@denx.de>
13 years agopowerpc/85xx: Removed support for MPC8540EVAL board
Kumar Gala [Tue, 14 Dec 2010 04:01:01 +0000 (22:01 -0600)]
powerpc/85xx: Removed support for MPC8540EVAL board

The MPC8540EVAL board is no longer maintained and thus we are removing
support for it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agopowerpc/85xx: Removed support for ATUM8548 board
Kumar Gala [Tue, 14 Dec 2010 03:53:09 +0000 (21:53 -0600)]
powerpc/85xx: Removed support for ATUM8548 board

The ATUM8548 board is no longer maintained and thus we are removing
support for it.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Wed, 12 Jan 2011 22:59:53 +0000 (23:59 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ubi
Wolfgang Denk [Wed, 12 Jan 2011 22:57:05 +0000 (23:57 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ubi

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 12 Jan 2011 22:55:41 +0000 (23:55 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 12 Jan 2011 22:54:32 +0000 (23:54 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

13 years agoMerge branch 'master' of git://git.denx.de/u-boot-microblaze
Wolfgang Denk [Wed, 12 Jan 2011 22:46:37 +0000 (23:46 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-microblaze

13 years agoRevert "boot cmds: convert to getenv_yesno() with autostart"
Wolfgang Denk [Tue, 11 Jan 2011 19:56:34 +0000 (20:56 +0100)]
Revert "boot cmds: convert to getenv_yesno() with autostart"

This reverts commit 5a442c0addc69d0c4b58e98e5aec1cf07576debb.

This commit changed the behaviour of getenv_yesno() (both the default
behaviour and the documented behaviour for abbreviated arguments)
which resulted in problems in several areas.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoUBIFS: Fix dereferencing type-punned pointer compiler warning
Dirk Behme [Sat, 25 Dec 2010 09:58:46 +0000 (10:58 +0100)]
UBIFS: Fix dereferencing type-punned pointer compiler warning

Fix compiler warning

In file included from ubifs.h:2137:0,
                 from ubifs.c:26:
misc.h: In function 'ubifs_idx_key':
misc.h:263:26: warning: dereferencing type-punned pointer will break strict-aliasing rules

seen with gcc version 4.5.1 (Sourcery G++ Lite 2010.09-50).

No functional change.

CC: Stefan Roese <sr@denx.de>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoxilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL
Ricardo Ribalda Delgado [Fri, 24 Dec 2010 00:38:10 +0000 (01:38 +0100)]
xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL

config.mk only mkdirs $(obj), but we have objects shared with other
boards located on other dirs.

This patch mkdirs the needed dirs for the xlnx-generic boards.

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoadd AM29F400BB to table of supported legacy flashs
David Müller [Tue, 21 Dec 2010 09:09:56 +0000 (10:09 +0100)]
add AM29F400BB to table of supported legacy flashs

Signed-off-by: David Mueller <d.mueller@elsoft.ch>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx: Fix compilation breakage in miiphy.c
Stefan Roese [Mon, 10 Jan 2011 11:56:13 +0000 (12:56 +0100)]
ppc4xx: Fix compilation breakage in miiphy.c

Patch 8ef583a0 [miiphy: convert to linux/mii.h] introduced a small
problem in the ppc4xx miiphy.c version. This patch fixes this problem.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agoLAN91C*: Change chip names to fit the eth_device struct size
Yanjun Yang [Sun, 26 Dec 2010 02:40:54 +0000 (10:40 +0800)]
LAN91C*: Change chip names to fit the eth_device struct size

The eth_device.name field length is limited by NAMESIZE,
which is 16 defined in include/net.h. Unfortunately, two
of the names in lan91c96.c are beyond that.

Signed-off-by: YanJun Yang <yangyj.ee@gmail.com>
13 years agoPPC4xx: Reduce NAND TLB window size on Canyonlands
Felix Radensky [Sun, 2 Jan 2011 09:07:34 +0000 (11:07 +0200)]
PPC4xx: Reduce NAND TLB window size on Canyonlands

16MiB NAND TLB window is way too big. Reduce it to 1KiB.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoppc4xx: Remove PCI support from lwmon5
Stefan Roese [Tue, 21 Dec 2010 18:03:44 +0000 (19:03 +0100)]
ppc4xx: Remove PCI support from lwmon5

PCI is not used at all on lwmon5. So lets remove it. It saves space and
reduces boot time a bit (approx. 50ms).

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agomicroblaze: Fix bd_info pointer
Michal Simek [Tue, 21 Dec 2010 08:32:44 +0000 (09:32 +0100)]
microblaze: Fix bd_info pointer

Patch "Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value"
(sha1: 25ddd1fb0a2281b182529afbc8fda5de2dc16d96)
introduce GENERATED_GBL_DATA_SIZE which is sizeof aligned gd_t
(currently 0x40).
Microblaze configs used 0x40(128) because this place also contained
board info structure which lies on the top of ram.

U-Boot is placed to the top of the ram (for example 0xd7ffffff)
and bd structure was moved out of ram.

This patch is fixing this scheme with GENERATED_BD_INFO_SIZE
which swap global data and board info structures.

For example:
Current: gd 0xd7ffffc0, bd 0xd8000000
Fixed:   gd 0xd7ffffc0, bd 0xd7ffff90

Signed-off-by: Michal Simek <monstr@monstr.eu>
13 years agomicroblaze: Disabling interrupt should return 1 if was enabled
Michal Simek [Tue, 21 Dec 2010 07:30:39 +0000 (08:30 +0100)]
microblaze: Disabling interrupt should return 1 if was enabled

Microblaze implement enable/disable interrupts through MSR
that's why disable_interrupts function should return 1 when interrupt
was enabled. Return 0 when interrupt was disabled.

Signed-off-by: John Linn <john.linn@xilinx.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Wolfgang Denk <wd@denx.de>
13 years agoftgmac100: support of gigabit eth ftgmac100
Macpaul Lin [Tue, 21 Dec 2010 08:59:46 +0000 (16:59 +0800)]
ftgmac100: support of gigabit eth ftgmac100

Add Faraday's ftgmac100 (gigabit ethernet)
MAC controller's driver.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
13 years agoMAINTAINERS: sort Blackfin entries
Mike Frysinger [Sun, 19 Dec 2010 22:14:14 +0000 (17:14 -0500)]
MAINTAINERS: sort Blackfin entries

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoasm-offsets: generate bd_t size
Mike Frysinger [Fri, 24 Dec 2010 17:57:23 +0000 (12:57 -0500)]
asm-offsets: generate bd_t size

Some ports set up the board info structure at the same time as the global
data structure, and largely keep them together.  So generate a define for
the board info struct too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agomiiphy: convert to linux/mii.h
Mike Frysinger [Thu, 23 Dec 2010 20:40:12 +0000 (15:40 -0500)]
miiphy: convert to linux/mii.h

The include/miiphy.h header duplicates a lot of things from linux/mii.h.
So punt all the things that overlap to keep the API simple and to make
merging between U-Boot and Linux simpler.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agocfi_flash: avoid flash_verbose when possible
Mike Frysinger [Wed, 22 Dec 2010 14:41:13 +0000 (09:41 -0500)]
cfi_flash: avoid flash_verbose when possible

The flash_verbose logic is only used by the CFI MTD layer, so if we aren't
using that, disable the logic completely.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agocmd editing: mark erase/tab seqs constant
Mike Frysinger [Wed, 22 Dec 2010 14:40:45 +0000 (09:40 -0500)]
cmd editing: mark erase/tab seqs constant

These strings are only read, so no need to have them be writable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agocmd_mem: localize state variables
Mike Frysinger [Wed, 22 Dec 2010 14:40:29 +0000 (09:40 -0500)]
cmd_mem: localize state variables

These "last" variables aren't used outside of this file, so add static.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoload_addr: move to common env code
Mike Frysinger [Tue, 21 Dec 2010 19:08:27 +0000 (14:08 -0500)]
load_addr: move to common env code

Rather than keep the load_addr definition with the bootm code (which
just happens to use this), move it to the common env code.  This way
we can disable bootm support completely while retaining load_addr
usage with many other commands.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoconfig_cmd_defaults.h: new header for common u-boot command defaults
Mike Frysinger [Mon, 20 Dec 2010 23:57:09 +0000 (18:57 -0500)]
config_cmd_defaults.h: new header for common u-boot command defaults

We have config_defaults.h which are random configuration settings that
everyone gets by default.  We also have config_cmd_default.h which is a
recommended list of defaults but boards have to opt into.  Now we have
config_cmd_defaults.h which is a list of defaults that everyone gets
and has to actively opt out of.

For now, we populate it with the bootm command which previously was
unable to be disabled.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoClarify applicable licensing terms in COPYING file.
Wolfgang Denk [Sat, 18 Dec 2010 21:00:41 +0000 (22:00 +0100)]
Clarify applicable licensing terms in COPYING file.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoenv: re-add support for auto-completion
Mike Frysinger [Fri, 17 Dec 2010 21:51:59 +0000 (16:51 -0500)]
env: re-add support for auto-completion

Currently, only basic completion is supported (no globs), but this is
what we had previously.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agotqm5200.c: fix warning: 'edid_buf' defined but not used
Wolfgang Denk [Thu, 23 Dec 2010 18:57:31 +0000 (19:57 +0100)]
tqm5200.c: fix warning: 'edid_buf' defined but not used

Commit 98e6956 "mpc52xx: add support for tqm52xx based board charon"
caused build warnings on some systems.  Fix these.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Heiko Schocher <hs@denx.de>
13 years agoexamples: update do_reset prototype
Mike Frysinger [Sun, 19 Dec 2010 22:16:53 +0000 (17:16 -0500)]
examples: update do_reset prototype

One more place that was missed during the do_reset() unification.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agosh: Add support T-SH7706LSR board
Nobuhiro Iwamatsu [Thu, 6 Jan 2011 03:38:01 +0000 (12:38 +0900)]
sh: Add support T-SH7706LSR board

This patch supports T-SH7706LSR board.
This is constitution almost same as shmin (T-SH7706LAN).
Therefore, most functions work by a change of the setting of config.

http://web.kyoto-inet.or.jp/people/takagaki/T-SH7706/T-SH7706LSR.htm

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Fix build of shmin board
Nobuhiro Iwamatsu [Thu, 6 Jan 2011 03:20:46 +0000 (12:20 +0900)]
sh: Fix build of shmin board

Change lib$(BOARD).a to lib$(BOARD).o

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: r2dplus: Add support zimageboot
Nobuhiro Iwamatsu [Wed, 8 Dec 2010 05:01:12 +0000 (14:01 +0900)]
sh: r2dplus: Add support zimageboot

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: sh7785lcr: Add support zimageboot
Nobuhiro Iwamatsu [Wed, 8 Dec 2010 05:00:24 +0000 (14:00 +0900)]
sh: sh7785lcr: Add support zimageboot

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Add support zimageboot command for Renesas SH
Nobuhiro Iwamatsu [Wed, 8 Dec 2010 04:49:12 +0000 (13:49 +0900)]
sh: Add support zimageboot command for Renesas SH

Curent U-Boot can boot zImage by use the "go" command.
But this is not right method. And this method can not set command-line
to linux kernel.
zimageboot sets command-line in environment of u-boot in linux kernel,
and provides function to boot it.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agosh: Divided macro for zImage and add asm/zimage.h
Nobuhiro Iwamatsu [Wed, 8 Dec 2010 04:46:36 +0000 (13:46 +0900)]
sh: Divided macro for zImage and add asm/zimage.h

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agosh: Delete the function that was not necessary
Nobuhiro Iwamatsu [Wed, 8 Dec 2010 04:42:18 +0000 (13:42 +0900)]
sh: Delete the function that was not necessary

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agosh: serial_sh: Fix build in serial_sh
Nobuhiro Iwamatsu [Wed, 24 Nov 2010 04:42:13 +0000 (13:42 +0900)]
sh: serial_sh: Fix build in serial_sh

The serial of ap325rxa has it of two kinds, and the setting of
the clock is different.
Because there was a problem by function to judge serial kind,
this revised it.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agosh: sh7722: Fix multiple definition of PSDR in serial_sh
Nobuhiro Iwamatsu [Wed, 24 Nov 2010 04:24:33 +0000 (13:24 +0900)]
sh: sh7722: Fix multiple definition of PSDR in serial_sh

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
13 years agosh: Remove SCIF/SCI register infomation
Nobuhiro Iwamatsu [Mon, 22 Nov 2010 06:56:43 +0000 (15:56 +0900)]
sh: Remove SCIF/SCI register infomation

The register information of SCIF/SCI was compiled
by drivers/serial/serial_sh.h.
Therefore, these are not necessary.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Add support showing KByte of flash memory size
Nobuhiro Iwamatsu [Tue, 26 Oct 2010 11:23:53 +0000 (20:23 +0900)]
sh: Add support showing KByte of flash memory size

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Add support shmin board
Nobuhiro Iwamatsu [Sun, 24 Oct 2010 18:12:24 +0000 (03:12 +0900)]
sh: Add support shmin board

This adds support for the SHMIN SH7706 board(T-SH7706LAN).
The CPU of this board is SH7706.
There are SDRAM of 32M byte, Flash memory of 512K byte, Serial,
10Base Ether and MMC.

http://web.kyoto-inet.or.jp/people/takagaki/T-SH7706/T-SH7706.htm

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: Add support SH7706
Nobuhiro Iwamatsu [Sun, 24 Oct 2010 17:58:21 +0000 (02:58 +0900)]
sh: Add support SH7706

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agosh: serial: Update serial driver for SH
Nobuhiro Iwamatsu [Mon, 25 Oct 2010 18:55:15 +0000 (03:55 +0900)]
sh: serial: Update serial driver for SH

I copied the setting of CPU from Linux kernel and commonized it.
By this, we can communalize a kernel and information.
And added the serial setting of many CPU's.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
13 years agocmd_net.c: fix build breakage
Wolfgang Denk [Thu, 23 Dec 2010 16:02:18 +0000 (17:02 +0100)]
cmd_net.c: fix build breakage

Commit 722b061 "autocomplete: remove runtime handler install" caused
some boards (like NETTA2_V2) to break with errors like these:

cmd_net.c:296: error: expected expression before ',' token

Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
13 years agoMerge branch 'next' of ../next
Wolfgang Denk [Wed, 22 Dec 2010 20:16:17 +0000 (21:16 +0100)]
Merge branch 'next' of ../next

13 years agoPrepare v2010.12 v2010.12
Wolfgang Denk [Wed, 22 Dec 2010 19:22:14 +0000 (20:22 +0100)]
Prepare v2010.12

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMove DECLARE_GLOBAL_DATA_PTR to file scope
John Rigby [Tue, 21 Dec 2010 01:27:51 +0000 (18:27 -0700)]
Move DECLARE_GLOBAL_DATA_PTR to file scope

It can be optimised out by the compiler otherwise resulting
in obscure errors like a board not booting.

This has been documented in README since 2006 when these were
first fixed up for GCC 4.x.

Signed-off-by: John Rigby <john.rigby@linaro.org>
Fix some additional places.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-By: Albert ARIBAUD <albert.aribaud@free.fr>
13 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 18 Dec 2010 22:15:40 +0000 (23:15 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

13 years agoOMAP3: EVM: Convert omap3_evm_version to u32
Dirk Behme [Sat, 18 Dec 2010 06:40:28 +0000 (07:40 +0100)]
OMAP3: EVM: Convert omap3_evm_version to u32

Convert the variable omap3_evm_version to u32 to work around
some broken linkers from older tool chains. E.g. CodeSourcery's
2009q1-203 ld 2.19.51.20090205. Without this, these linkers
stop linking 'omap3_evm' or at least issue a warning. Like

arm-none-linux-gnueabi-ld: section .bss [8003f5e0 -> 8007e337] overlaps section .rel.dyn [8003f5e0 -> 80044e57]
arm-none-linux-gnueabi-ld: section .dynsym [80044e58 -> 80044ef7] overlaps section.bss [8003f5e0 -> 8007e337]
arm-none-linux-gnueabi-ld: u-boot: section .bss vma 0x8003f5e0 overlaps previous sections

CC: Sanjeev Premi <premi@ti.com>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
13 years agofsl_esdhc: Fix the voltage validation process
Li Yang [Thu, 25 Nov 2010 17:06:09 +0000 (17:06 +0000)]
fsl_esdhc: Fix the voltage validation process

The current code use all the voltage range support by the host
controller to do the validation.  This will cause problem when
the host supports Low Voltage Range.  Change the validation
voltage to be based on board setup.

Signed-off-by: Li Yang <leoli@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Fix max clock frequency
Jerry Huang [Thu, 25 Nov 2010 17:06:10 +0000 (17:06 +0000)]
fsl_esdhc: Fix max clock frequency

The max clock of MMC is 52MHz

Signed-off-by: Jerry Huang <Changm-Ming.Huang@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Use mmc_set_clock to set initial speed
Jerry Huang [Thu, 25 Nov 2010 17:06:07 +0000 (17:06 +0000)]
fsl_esdhc: Use mmc_set_clock to set initial speed

After booting the u-boot, and first using some SD card (such as Sandisk 2G SD
card), because the field 'clock' of struct mmc is zero, this will cause
the read transfer is always active and SDHC DATA line is always active,
therefore, driver can't handle the next command.

Therefore, we use mmc_set_clock to setup both the data structure and HW
to the initial clock speed of 400000Hz.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agop1022ds: enable reginfo command
Matthew McClintock [Fri, 17 Dec 2010 23:26:41 +0000 (17:26 -0600)]
p1022ds: enable reginfo command

Add reginfo as a default command for p1022ds boards

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Fix the voltage validation process
Li Yang [Thu, 25 Nov 2010 17:06:09 +0000 (17:06 +0000)]
fsl_esdhc: Fix the voltage validation process

The current code use all the voltage range support by the host
controller to do the validation.  This will cause problem when
the host supports Low Voltage Range.  Change the validation
voltage to be based on board setup.

Signed-off-by: Li Yang <leoli@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Fix max clock frequency
Jerry Huang [Thu, 25 Nov 2010 17:06:10 +0000 (17:06 +0000)]
fsl_esdhc: Fix max clock frequency

The max clock of MMC is 52MHz

Signed-off-by: Jerry Huang <Changm-Ming.Huang@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agofsl_esdhc: Use mmc_set_clock to set initial speed
Jerry Huang [Thu, 25 Nov 2010 17:06:07 +0000 (17:06 +0000)]
fsl_esdhc: Use mmc_set_clock to set initial speed

After booting the u-boot, and first using some SD card (such as Sandisk 2G SD
card), because the field 'clock' of struct mmc is zero, this will cause
the read transfer is always active and SDHC DATA line is always active,
therefore, driver can't handle the next command.

Therefore, we use mmc_set_clock to setup both the data structure and HW
to the initial clock speed of 400000Hz.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Tested-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
13 years agoNAND: add NAND_CMD_PARAM (0xec) definition
Florian Fainelli [Fri, 10 Dec 2010 12:16:41 +0000 (12:16 +0000)]
NAND: add NAND_CMD_PARAM (0xec) definition

This command is used to read the device ONFI parameters page.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
13 years agoonenand: add yaffs write command
Lei Wen [Thu, 2 Dec 2010 05:17:55 +0000 (05:17 +0000)]
onenand: add yaffs write command

Yaffs image require to use the oob to store some info, so when we
burn the yaffs image, we need to also write the image's oob part
into flash.

This patch add addition suffix to onenand write to give the uboot
the power to directly burn the yaffs image to onenand.

Signed-off-by: Lei Wen <leiwen@marvell.com>
13 years agoMTD/NAND: fix nand_base.c to use get_timer() correctly
Reinhard Meyer [Thu, 18 Nov 2010 03:14:26 +0000 (03:14 +0000)]
MTD/NAND: fix nand_base.c to use get_timer() correctly

This is part of the timer cleanup effort.
In the future we only use get_timer() in its intended way to
program timeout loops.
reset_timer() shall not be used anymore.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
13 years agonand: constify id/manu tables
Mike Frysinger [Wed, 20 Oct 2010 01:15:21 +0000 (01:15 +0000)]
nand: constify id/manu tables

These id tables need not be writable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agovideo/mx3fb: fix clock divider
Stefano Babic [Thu, 16 Dec 2010 11:41:47 +0000 (12:41 +0100)]
video/mx3fb: fix clock divider

Fix clock divider for COM57H5M10XRC display.
The previous setting caused flicker.

Tested on Qong (EVBLite with COM57H5M10XRC).

Signed-off-by: Stefano Babic <sbabic@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
13 years agoconfig.mk: unify duplicated flag setting
Mike Frysinger [Wed, 15 Dec 2010 12:17:31 +0000 (07:17 -0500)]
config.mk: unify duplicated flag setting

Multiple rules are using the expanded AFLAGS/CFLAGS settings and some are
getting so long that the rules need to be line wrapped.  So unify them in
one variable, use that variable in the rule, and then unwrap things.  This
makes the actual `make` output nicer as it doesn't have line continuations
in it anymore.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agopowerpc: fix register usage in some inline assembly code
Timur Tabi [Tue, 14 Dec 2010 23:18:51 +0000 (17:18 -0600)]
powerpc: fix register usage in some inline assembly code

In some usages of inline assembly, hard-coded registers were
specified when a scratch register should have been used instead.

Signed-off-by: Timur Tabi <timur@freescale.com>
13 years agohashtable: drop all non-reentrant versions
Mike Frysinger [Wed, 8 Dec 2010 11:26:04 +0000 (06:26 -0500)]
hashtable: drop all non-reentrant versions

The non-reentrant versions of the hashtable functions operate on a single
shared hashtable.  So if two different people try using these funcs for
two different purposes, they'll cause problems for the other.

Avoid this by converting all existing hashtable consumers over to the
reentrant versions and then punting the non-reentrant ones.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years ago74xx_7xx/mpc86xx/ppmc7xx: Fix do_reset() declaration
Peter Tyser [Fri, 3 Dec 2010 16:28:47 +0000 (10:28 -0600)]
74xx_7xx/mpc86xx/ppmc7xx: Fix do_reset() declaration

The following commit:

commit 882b7d726febe65579d6502c271412ecb05821d7
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed Oct 20 03:41:17 2010 -0400

    do_reset: unify duplicate prototypes

missed the 74xx_7xx and mpc86xx arches and the ppmc7xx board do_reset()
functions which resulted in build errors such as:
  cpu.c:128: error: conflicting types for 'do_reset'
  include/command.h:102: error: previous declaration of 'do_reset' was here

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
13 years agoPowerPC, nand_spl: Add relocation support for -fpic
Joakim Tjernlund [Fri, 3 Dec 2010 16:30:38 +0000 (17:30 +0100)]
PowerPC, nand_spl: Add relocation support for -fpic

By rearranging the linker script we get support for
relocation of -fpic for free.
Move __got2_entries outside _GOT2_TABLE_ defining scope
matching the rest of PowerPC

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Scott Wood <scottwood@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
13 years agoPowerPC: Add relocation support for -fpic
Joakim Tjernlund [Fri, 3 Dec 2010 16:30:37 +0000 (17:30 +0100)]
PowerPC: Add relocation support for -fpic

By rearranging the linker script we get support for
relocation of -fpic for free.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Acked-by: Scott Wood <scottwood@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
13 years agoRTC driver for PT7C4338 chip.
Priyanka Jain [Tue, 26 Oct 2010 09:22:19 +0000 (14:52 +0530)]
RTC driver for PT7C4338 chip.

PT7C4338 chip is being manufactured by Pericom Technology Inc.
It is a serial real-time clock which provides:
1)Low-power clock/calendar.
2)Programmable square-wave output.
It has 56 bytes of nonvolatile RAM.

Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
13 years agompc52xx, charon: change mtd default partitions
Heiko Schocher [Fri, 17 Dec 2010 09:11:27 +0000 (10:11 +0100)]
mpc52xx, charon: change mtd default partitions

New default partitions on nor flash:

640k   (firmware)
1408k  (kernel)
2m     (initrd)
4m     (small-fs)
24320k (big-fs)
256k   (dts)

Signed-off-by: Heiko Schocher <hs@denx.de>