Merge branch 'testing' into working

Conflicts:

CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c

Remove erroneous errata code from Marvel 88E1111S driver

The Marvel 88E1111S driver for the TSEC was copied from the
88E1101 driver, and included a fix for an erratum which does not
exist on that part.  Now it is removed

Signed-off-by: Andy Fleming <afleming@freescale.com>

From: eran liberty <eran.liberty@gmail.com>

adds the reset register to 85xx immap

Signed-off-by: Eran Liberty <eran.liberty@gmail.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>

Polished the 85xx ADS config files

Made the boot commands use device trees by default.
Also moved the ramdisk to 1000000 (I think the previous address
was getting overridden during boot).

Signed-off-by: Andy Fleming <afleming@freescale.com>

8544ds: Fix Makefile after moving pixis to board/freescale.

The OBJTREE != SRCTREE build scenario was broken.
This fixes it.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>

tsec: Fix PHY code to match first driver

Jarrold Wen noticed that the generic PHY code always matches
under the current implementation.  Change it so the first match
wins, and *only* unknown PHYs trigger the generic driver

Signed-off-by: Andy Fleming <afleming@freescale.com>

Add support for CPM device tree configuration to 8560 ADS

* Adds code to modify CPM frequencies
* Cleans up the config file to #define TSEC and (for now) #undef FCC
* Adds the MII command for all 8560 ADS configurations
* Updates config file to provide convenience commands for booting
  with a device tree

Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>

Fix Marvell 88e1145 PHY init code

Fix a bug in the Marvell 88e1145 PHY init code in the TSEC driver
where the reset was being done after the errata code instead of
before.

Signed-off-by: Haiying Wang <haiying.wang@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>

Add simple agent/end-point configuration in PCI AutoConfig for PCI_CLASS_PROCESSOR_POWERPC.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

pciauto setup bridge

The P2P bridge bus numbers programmed into the device are relative to
hose->first_busno.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

Support PCIe extended config registers

FSL PCIe block has extended cfg registers in the 100 and 400 range.
For example, to read the LTSSM register: pci display <busn>.0 404 1

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

Minor improvements to drivers/pci_auto.c

- Make pciauto_{pre,post}scan_setup_bridge non-static
- Added physical address display in debug messages.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

Start pci hose scan from hose->current_busno.

Ensure hose->current_busno is not less than first_busno.  This fixes
broken board code which leaves current_busno=0 when first_busno is
greater than 0 for the cases with multiple controllers.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup

Signed-off-by: Stefan Roese <sr@denx.de>

Fix malloc problem introduced with the relocation fixup for the PPC platform

The relocation fixup didn't handle the malloc pointer initialization
correctly. This patch fixes this problem. Tested successfully on 4xx.
The relocation fixup patches for 4xx will follow soon.

Signed-off-by: Stefan Roese <sr@denx.de>

disk/ doc/ lib_*/ and tools/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

drivers/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

fs/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

net/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

common/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[j-z]*: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[A-Za-i]*: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

cpu/ rtc/ include/: Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[p-z]* + misc: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[g-o]*: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[a-e]*: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[P-Z]*: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[J-O]*: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[A-I]*: Cleanup BOOTP and lingering CFG_CMD_*.

Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.

Remove lingering references to CFG_CMD_* symbols.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Finally retire cmd_confdefs.h and CONFIG_BOOTP_MASK!

All of the choices for CONFIG_BOOTP_ are now documented in
the README file.  You must now individually select exactly
the set that you want using a series of
    #define CONFIG_BOOTP_<x>
statements in the board port config files now.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[m-z]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[a-m]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[T-Z]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[P-S]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[H-N]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs/[A-G]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Retire CONFIG_COMMANDS finally.
Strip old CFG_CMD_* symbols out.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Update README.* to reference new CONFIG_CMD_* names now.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

cpu/m*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

cpu/[7a-ln-z]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[q-z]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[m-p]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[f-l]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[d-e]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

board/[A-Za-c]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

rtc/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

lib_{arm,avr32,blackfin,generic,i386}/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

lib_{m68k,microblaze,mips,ppc}/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

fs/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

tools/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

net/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

drivers/[n-z]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

drivers/[a-m]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

disk/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/: Remove obsolete references to CONFIG_COMMANDS
Mostly removed from comments here.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Coding style cleanup; update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Merge with /home/hs/Atronic/u-boot

common/* non-cmd*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>

common/cmd_[p-x]*: Remove obsolete references to CONFIG_COMMANDS.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

common/cmd_[i-n]*: Remove obsolete references to CONFIG_COMMANDS.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

common/cmd_[af]*: Remove obsolete references to CONFIG_COMMANDS.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Clear up confusion over the CMD_POST and POST_DIAG mess.

For some reason, CONFIG_POST permeated as CONFIG_CMD_POST_DIAG
when it really means just CONFIG_CMD_DIAG.  There is no CMD_POST.
Clear this mess up some.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Remove references to the old cmd_confdefs.h include file.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Catch some CONFIG_CMD_* conversion stragglers.

Use new CONFIG_CMD_* in lwmon5.h board config file.
Fix CONFIG_CMD_* typo braindamage in omap1510inn.h

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various [TUVWZYZ]* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various S* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various R* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various Q* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various P* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various [NO]* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various M* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various [IJKL]* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various H* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various F* and G* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various E* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various D* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various C* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various B* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various A* named board config files.

Since ADS860.h includes "board/fads/fads.h" with ramifications
on the CONFIG_COMMAND treatment, it too has to be adjusted to
exclude already configured commands in this same commit.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

Merge with git://www.denx.de/git/u-boot-testing

Fix problem with get/setdcr commands introduced by cfg patches

Signed-off-by: Stefan Roese <sr@denx.de>

Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx

Code cleanup and default config update for STC GP3 SSA board.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Fixing some typos etc. introduced mainly by cfg patches.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Minor coding style cleanup. Update CHANGELOG.

include/configs: Use new CONFIG_CMD_* in various [v-z]* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various t* and u* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various s* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various q* and r* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various p* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various o* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various n* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various m* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various l* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various j* and k* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various i* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various h* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various g* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various e* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>

include/configs: Use new CONFIG_CMD_* in various d* named board config files.

Signed-off-by: Jon Loeliger <jdl@freescale.com>