Merge with /home/wd/git/u-boot/work

Treat ppc64 host as ppc

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

Minor fix for bios emulator makefile

Add $(obj) to LIB avoiding objects be built in the source dir

Signed-off-by: Jason Jin <Jason.jin@freescale.com>

Add CONFIG_BIOSEMU define to guard all the bios emulator code

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
This patch fix the compile issue on the board that did not enable the bios emulator

tsec: fix multiple PHY support

The change entitled "Reduce CONFIG_MPC8YXX_TSECx to CONFIG_TSECx"
broke multiple PHY support in tsec.c.  This fixes it.

Signed-off-by: Zach Sadecki <Zach.Sadecki@ripcode.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Merge with /home/wd/git/u-boot/work

tsec: Allow Ten Bit Interface address to be configurable

Allow the address of the Ten Bit Interface (TBI) to be changed in the
event of a conflict with another device.

Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>

Merge with /home/tur/git/u-boot#cm5200-si

Fix missing brace error in fs/fat/fat.c
[pointed out by Roderik Wildenburg]

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

Fixed typo in README (pointed out by Martin Jost).

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

Merge ... /home/wd/git/u-boot/custodian/u-boot-testing

Coding style cleanup. Update CHANGELOG.

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

Remove the bios emulator from MAI board.

The bios emulator in the MAI board can not pass compile
and have a lot of crap in it. remove it and will have a
clean and small bios emulator in the drivers directory
which can be uesed for every board.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>

Fix some compile issues for MAI board.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>

Configurations for ATI video card BIOS emulator

This patch add definition of the BIOS emulator and the ATI framebuffer
driver for MPC8641HPCN board.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>

This is a BIOS emulator, porting from SciTech for u-boot, mainly for
ATI video card BIOS. and can be used for x86 code emulation by some
modifications.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>

This is a framebuffer driver for ATI video card, can work for PCI9200,
X300, X700, X800 ATI video cards.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Jason Jin <Jason.jin@freescale.com>

Merge ... /home/wd/git/u-boot/custodian/u-boot-testing

Coding style cleanup. Update CHANGELOG.

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

Merge ... /home/wd/git/u-boot/custodian/u-boot-mpc85xx

Add functions to list of exported functions

Additionally export the following fuctions (to make trab_config build again):
- simple_strtol()
- strcmp()

Also bump the ABI version to reflect this change

Signed-off-by: Martin Krause <martin.krause@tqs.de>

Make MPC8641's PCI/PCI-E driver a common driver for many FSL parts.

All of the PCI/PCI-Express driver and initialization code that
was in the MPC8641HPCN port has now been moved into the common
drivers/fsl_pci_init.c.  In a subsequent patch, this will be
utilized by the 85xx ports as well.

Common PCI-E IMMAP register blocks for FSL 85xx/86xx are added.

Also enable the second PCI-Express controller on 8641
by getting its BATS and CFG_ setup right.

Fixed a u16 vendor compiler warning in AHCI driver too.

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

cm1_qp1 -> cm5200: single U-Boot image for modules from the cm5200 family.

Add the ability for modules from the Schindler cm5200 family to use a
single U-Boot image:
- rename cm1_qp1 to cm5200
- add run-time module detection
- parametrize SDRAM configuration according to the module we are running on

Few minor, board-specific fixes included in this patch:
- better MAC address handling
- updated default environment ('update' command uses +{filesize} now)
- improved error messages in the auto-update code
- allow booting U-Boot from RAM (CFG_RAMBOOT)

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

Add Marvell 1149 PHY support to the TSEC

Merge branch 'testing' into working

Conflicts:

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

Coding style cleanup, update CHANGELOG

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

Minor cleanup of <board>_nand build rules.

Fix build errors and warnings / code cleanup.

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

[ADS5121] Support for the ADS5121 board

The following MPC5121e subsystems are supported:

- low-level CPU init
- NOR Boot Flash (common CFI driver)
- DDR SDRAM
- FEC
- I2C
- Watchdog

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Signed-off-by: Jan Wrobel <wrr@semihalf.com>

[PPC] Remove unused MSR_USER definition

Signed-off-by: Rafal Jaworowski <raj@semihalf.com>

Fix breakage of 8xx boards from recent commit.

This patch fixes the negative consequences for 8xx of the recent
"ppc4xx: Clean up 440 exceptions handling" commit.

Signed-off-by: Rafal Jaworowski <raj@semihalf.com>

Update CHANGELOG

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

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

[PCS440EP]  - fix compile error, if BUILD_DIR is used

make show_boot_progress () weak.

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

[PCS440EP] - The DIAG LEDs are now blinking, if an error occur
- fix compile error, if BUILD_DIR is used

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

Update CHANGELOG, minor coding style cleanup.

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

Merge with /home/tur/git/u-boot#cm1_qp1

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>

CM1.QP1: Support for the Schindler CM1.QP1 board.

Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

[PCS440EP]  - Show on the DIAG LEDs, if the SHA1 check failed
            - now the Flash ST M29W040B is supported (not tested)
            - fix the "led" command
            - fix compile error, if BUILD_DIR is used

Signed-off-by: Heiko Schocher <hs@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>