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

diff --cc CHANGELOG
index f8a04e6207eb921ba7e228ae76c74320ae518c90,58ef66ecdc4c2e0caba7dc343f6aaa5775050457..f00510bf7e16d9d8b03042cb35d0a260e04b34b4
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,143 -1,216 +1,151 @@@
 -commit 8092fef4c29b395958bb649647da7e3775731517
 -Author: Martin Krause <Martin.Krause@tqs.de>
 -Date: Tue Dec 12 14:26:01 2006 +0100
 -
 -    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>
 -
 -commit 63cec5814fab5d2b1c86982327433807a5ac0249
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Thu Aug 2 14:09:49 2007 -0500
 -
 -    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>
 -
 -commit c7e717ebc2b044d7a71062552c9dc0f54ea9b779
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Fri Aug 3 04:05:25 2007 -0500
 -
 -    Add Marvell 1149 PHY support to the TSEC
 -
 -commit 63e22764d2f8653f68888c667eb65b3996b52680
 -Author: Wolfgang Denk <wd@denx.de>
 -Date: Thu Aug 2 10:11:18 2007 +0200
 -
 -    Minor cleanup of <board>_nand build rules.
 -
 -commit cdd917a43da6fa7fc8f54a3cc9f420ce5ecf3197
++commit b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86
+ Author: Wolfgang Denk <wd@denx.de>
 -Date: Thu Aug 2 00:48:45 2007 +0200
++Date: Thu Aug 2 21:27:46 2007 +0200
+ 
 -    Fix build errors and warnings / code cleanup.
++    Coding style cleanup, update CHANGELOG
+ 
+     Signed-off-by: Wolfgang Denk <wd@denx.de>
+ 
 -commit 5a56af3b522ba47fb33a3fee84d23bf1e5429654
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Fri Jun 8 16:41:18 2007 -0500
 -
 -    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>
 -
 -commit 982efcf23fd03647e01e2fbe28a7a36239156cc0
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Tue Jun 5 16:38:44 2007 -0500
 -
 -    From: eran liberty <eran.liberty@gmail.com>
 -
 -    adds the reset register to 85xx immap
 +commit 8993e54b6f397973794f3d6f47d3b3c0c98dd4f6
 +Author: Rafal Jaworowski <raj@semihalf.com>
 +Date: Fri Jul 27 14:43:59 2007 +0200
  
 -    Signed-off-by: Eran Liberty <eran.liberty@gmail.com>
 -    Signed-off-by: Andy Fleming <afleming@freescale.com>
 +    [ADS5121] Support for the ADS5121 board
  
 -commit d3ec0d943a045bdb99e159e7bbc77430e09f11d7
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Thu May 10 17:50:01 2007 -0500
 +    The following MPC5121e subsystems are supported:
  
 -    Polished the 85xx ADS config files
 +    - low-level CPU init
 +    - NOR Boot Flash (common CFI driver)
 +    - DDR SDRAM
 +    - FEC
 +    - I2C
 +    - Watchdog
  
 -    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: Grzegorz Bernacki <gjb@semihalf.com>
 +    Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
 +    Signed-off-by: Jan Wrobel <wrr@semihalf.com>
  
 -    Signed-off-by: Andy Fleming <afleming@freescale.com>
 +commit 1863cfb7b100ba0ee3401799457a01dc058745f8
 +Author: Rafal Jaworowski <raj@semihalf.com>
 +Date: Fri Jul 27 14:22:04 2007 +0200
  
 -commit bfb37b32d1b0b03f18077dba49cc66a6e76fa038
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed May 9 11:03:32 2007 -0500
 +    [PPC] Remove unused MSR_USER definition
  
 -    8544ds: Fix Makefile after moving pixis to board/freescale.
 +    Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
  
 -    The OBJTREE != SRCTREE build scenario was broken.
 -    This fixes it.
 +commit cc3023b9f95d7ac959a764471a65001062aecf41
 +Author: Rafal Jaworowski <raj@semihalf.com>
 +Date: Thu Jul 19 17:12:28 2007 +0200
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 -    Signed-off-by: Jon Loeliger <jdl@freescale.com>
 +    Fix breakage of 8xx boards from recent commit.
  
 -commit 2a3cee43c3b71fa5b8d91db19f05067865290f3e
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Wed May 9 00:54:20 2007 -0500
 +    This patch fixes the negative consequences for 8xx of the recent
 +    "ppc4xx: Clean up 440 exceptions handling" commit.
  
 -    tsec: Fix PHY code to match first driver
 +    Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
  
 -    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
 +commit 3a6cab844cf74f76639d795e0be8717e02c86af7
 +Author: Wolfgang Denk <wd@denx.de>
 +Date: Sat Jul 14 22:51:02 2007 +0200
  
 -    Signed-off-by: Andy Fleming <afleming@freescale.com>
 +    Update CHANGELOG
  
 -commit ccc091aac61a38cd998d575d92f7232e256d6312
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Tue May 8 17:27:43 2007 -0500
 +    Signed-off-by: Wolfgang Denk <wd@denx.de>
  
 -    Add support for CPM device tree configuration to 8560 ADS
 +commit 011595307731a7a67a7445d107c279d031e8ab97
 +Author: Heiko Schocher <hs@pollux.denx.de>
 +Date: Sat Jul 14 01:06:58 2007 +0200
  
 -    * 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
 +    [PCS440EP]        - fix compile error, if BUILD_DIR is used
  
 -    Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
 -    Signed-off-by: Andy Fleming <afleming@freescale.com>
 +commit fad63407154f46246ce80d53a9c669a44362ac67
 +Author: Heiko Schocher <hs@pollux.denx.de>
 +Date: Fri Jul 13 09:54:17 2007 +0200
  
 -commit 7507d56ccaf7aae1c474342a9a5540165cd7e9d9
 -Author: Andy Fleming <afleming@freescale.com>
 -Date: Tue May 8 17:23:02 2007 -0500
 +    make show_boot_progress () weak.
  
 -    Fix Marvell 88e1145 PHY init code
 +    Signed-off-by: Heiko Schocher <hs@denx.de>
  
 -    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.
 +commit 907902472391b6ca1876ec300687562ecaf459b1
 +Author: Heiko Schocher <hs@pollux.denx.de>
 +Date: Fri Jul 13 08:26:05 2007 +0200
  
 -    Signed-off-by: Haiying Wang <haiying.wang@freescale.com>
 -    Signed-off-by: Andy Fleming <afleming@freescale.com>
 +    [PCS440EP]        - The DIAG LEDs are now blinking, if an error occur
 +              - fix compile error, if BUILD_DIR is used
  
 -commit 5dc210dec5bace98a50b6ba905347890091a9bb0
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed Jul 11 14:52:16 2007 -0500
 +    Signed-off-by: Heiko Schocher <hs@denx.de>
  
 -    Add simple agent/end-point configuration in PCI AutoConfig for PCI_CLASS_PROCESSOR_POWERPC.
 +commit 239f05ee4dd4cfe0b50f251b533dcebe9e67c360
 +Author: Wolfgang Denk <wd@denx.de>
 +Date: Thu Jul 12 01:45:34 2007 +0200
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 +    Update CHANGELOG, minor coding style cleanup.
  
 -commit e8b85f3ba4cd8930e0a2fea2100c815d64201765
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed Jul 11 14:52:08 2007 -0500
 +    Signed-off-by: Wolfgang Denk <wd@denx.de>
  
 -    pciauto setup bridge
 +commit fa1df308926a6f70e3504c57514ef27ac31fd13a
 +Author: Bartlomiej Sieka <tur@semihalf.com>
 +Date: Wed Jul 11 20:11:07 2007 +0200
  
 -    The P2P bridge bus numbers programmed into the device are relative to
 -    hose->first_busno.
 +    CM1.QP1: Support for the Schindler CM1.QP1 board.
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 +    Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
 +    Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
  
 -commit 571f49fa717004ca4268b4e24057efc7bf9f987b
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed Jul 11 14:52:01 2007 -0500
 +commit 96e1d75be8193ca79e4215a368bf9d7f2362450f
 +Author: Heiko Schocher <hs@pollux.denx.de>
 +Date: Wed Jul 11 18:39:11 2007 +0200
  
 -    Support PCIe extended config registers
 +    [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
  
 -    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: Heiko Schocher <hs@denx.de>
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 +commit 4ef218f6fdf8d747f4589da5252b004e7d2c2876
 +Author: Wolfgang Denk <wd@denx.de>
 +Date: Tue Jul 10 00:01:28 2007 +0200
  
 -commit ba5feb12581bb2912ce301e4866b71f846e9fc07
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed Jul 11 14:51:48 2007 -0500
 +    Coding style cleanup; update CHANGELOG.
  
 -    Minor improvements to drivers/pci_auto.c
 +    Signed-off-by: Wolfgang Denk <wd@denx.de>
  
 -    - Make pciauto_{pre,post}scan_setup_bridge non-static
 -    - Added physical address display in debug messages.
 +commit f1152f8c28db4a22087c21c618a3f7baa48e9a4f
 +Author: Wolfgang Denk <wd@denx.de>
 +Date: Fri Jul 6 02:50:19 2007 +0200
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 +    Code cleanup and default config update for STC GP3 SSA board.
  
 -commit 40e81addab7bb74d20ddf681ce9babc880a828ee
 -Author: Ed Swarthout <Ed.Swarthout@freescale.com>
 -Date: Wed Jul 11 14:51:35 2007 -0500
 +    Signed-off-by: Wolfgang Denk <wd@denx.de>
  
 -    Start pci hose scan from hose->current_busno.
 +commit b44896215a09c60fa40cae906f7ed207bbc2c492
 +Author: Sergei Poselenov <sposelenov@emcraft.com>
 +Date: Thu Jul 5 08:17:37 2007 +0200
  
 -    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.
 +    Merged POST framework with the current TOT.
  
 -    Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
 +    Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
  
 -commit 3865b1fb7843a08ad49a6319a36415752276ff48
 -Author: Stefan Roese <sr@denx.de>
 -Date: Wed Jul 11 12:13:53 2007 +0200
 +commit f780b83316d9af1f61d71cc88b1917b387b9b995
 +Author: Niklaus Giger <niklausgiger@gmx.ch>
 +Date: Wed Jun 27 18:11:38 2007 +0200
  
 -    Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup
 +    resubmit: ppc4xx: Remove sequoia/sequioa.h. Cleanup ppc440.h for PPC440EPX
  
 -    Signed-off-by: Stefan Roese <sr@denx.de>
 +    Signed-off-by: Niklaus Giger <niklaus.giger@nestal.com>
  
 -commit e9514751cfa5cce61ea699fa0d3eb37898a5eeb5
 +commit 04e6c38b766eaa2f3287561563c9e215e0c3a0d4
  Author: Stefan Roese <sr@denx.de>
 -Date: Sun Jul 8 13:44:27 2007 +0200
 +Date: Wed Jul 4 10:06:30 2007 +0200
  
 -    Fix malloc problem introduced with the relocation fixup for the PPC platform
 +    ppc4xx: Update lwmon5 board
  
 -    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.
 +    - Add optional ECC generation routine to preserve existing
 +      RAM values. This is needed for the Linux log-buffer support
 +    - Add optional DDR2 setup with CL=4
 +    - GPIO50 not used anymore
 +    - Lime register setup added
  
      Signed-off-by: Stefan Roese <sr@denx.de>
  

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc common/cmd_bootm.c
Simple merge

diff --cc common/cmd_doc.c
index 9814d754fb7adf5ab8d07cd1b071656e26a04c45,a172b3b68ccff3fff5902db96d9104b9552d2daa..d6d3aff8c875757e62067455643a94ad01a40194
--- 1/common/cmd_doc.c
--- 2/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@@ -12,7 -12,14 +12,7 @@@
  #include <malloc.h>
  #include <asm/io.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_DOC)
 -#ifdef CONFIG_SHOW_BOOT_PROGRESS
 -# include <status_led.h>
 -# define SHOW_BOOT_PROGRESS(arg)      show_boot_progress(arg)
 -#else
 -# define SHOW_BOOT_PROGRESS(arg)
 -#endif
 -
+ #if defined(CONFIG_CMD_DOC)
  
  #include <linux/mtd/nftl.h>
  #include <linux/mtd/doc2000.h>

diff --cc common/cmd_ide.c
Simple merge

diff --cc common/cmd_nand.c
index cb62661ec2703375099409ffaf71f3826d07bafa,8832db9606ab49bcfd4aa72e7c12976ba7e4f694..c72612d0d6f3c828271d48ab5b4a053cb121576f
--- 1/common/cmd_nand.c
--- 2/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@@ -619,14 -627,14 +619,14 @@@ U_BOOT_CMD(nboot, 4, 1, do_nandboot
  #include <asm/io.h>
  #include <watchdog.h>
  
 -#ifdef CONFIG_SHOW_BOOT_PROGRESS
 +#ifdef CONFIG_show_boot_progress
  # include <status_led.h>
 -# define SHOW_BOOT_PROGRESS(arg)      show_boot_progress(arg)
 +# define show_boot_progress(arg)      show_boot_progress(arg)
  #else
 -# define SHOW_BOOT_PROGRESS(arg)
 +# define show_boot_progress(arg)
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_NAND)
+ #if defined(CONFIG_CMD_NAND)
  #include <linux/mtd/nand_legacy.h>
  #if 0
  #include <linux/mtd/nand_ids.h>

diff --cc common/cmd_net.c
index f1097a9951d368b9e1e5ac44cb6dba275405574c,fa4f968a0d42ba79547f60362e4d741529622214..0715fbc203ce06fc8fa2c61af5db240ec9de50b3
--- 1/common/cmd_net.c
--- 2/common/cmd_net.c
+++ b/common/cmd_net.c
@@@ -28,8 -28,16 +28,8 @@@
  #include <command.h>
  #include <net.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_NET)
+ #if defined(CONFIG_CMD_NET)
  
 -#ifdef CONFIG_SHOW_BOOT_PROGRESS
 -# include <status_led.h>
 -extern void show_boot_progress (int val);
 -# define SHOW_BOOT_PROGRESS(arg)      show_boot_progress (arg)
 -#else
 -# define SHOW_BOOT_PROGRESS(arg)
 -#endif
 -
  extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
  
  static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);

diff --cc common/main.c
Simple merge

diff --cc cpu/mpc5xxx/fec.c
Simple merge

diff --cc drivers/nand_legacy/nand_legacy.c
index 753f5412953c1635b9be192556023f0745b230ac,fcb6d2b5334e199a4da046cd919df1052cfe6998..49d2ebb67d3fd8392c6d2b0e75c5788830a933ee
--- 1/drivers/nand_legacy/nand_legacy.c
--- 2/drivers/nand_legacy/nand_legacy.c
+++ b/drivers/nand_legacy/nand_legacy.c
@@@ -15,7 -15,14 +15,7 @@@
  #include <asm/io.h>
  #include <watchdog.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
 -#ifdef CONFIG_SHOW_BOOT_PROGRESS
 -# include <status_led.h>
 -# define SHOW_BOOT_PROGRESS(arg)      show_boot_progress(arg)
 -#else
 -# define SHOW_BOOT_PROGRESS(arg)
 -#endif
 -
+ #if defined(CONFIG_CMD_NAND) && defined(CFG_NAND_LEGACY)
  
  #include <linux/mtd/nand_legacy.h>
  #include <linux/mtd/nand_ids.h>

diff --cc include/common.h
index d823733b67fd4d65f4a30e14f242fad81990e4d3,d89617ae2c9d39f2d2702a5ffb56b26a07476369..ac29d3aac6cce3d628381f3f904e2d56b4342393
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -63,13 -63,15 +63,19 @@@ typedef volatile unsigned char     vu_char
  #endif
  #elif defined(CONFIG_5xx)
  #include <asm/5xx_immap.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_MPC5xxx)
  #include <mpc5xxx.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
 +#elif defined(CONFIG_MPC512X)
 +#include <mpc512x.h>
 +#include <asm/immap_512x.h>
++#define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_MPC8220)
  #include <asm/immap_8220.h>
+ #define CONFIG_RELOC_FIXUP_WORKS
+ #elif defined(CONFIG_824X)
+ #define CONFIG_RELOC_FIXUP_WORKS
  #elif defined(CONFIG_8260)
  #if   defined(CONFIG_MPC8247) \
     || defined(CONFIG_MPC8248) \

diff --cc include/configs/pcs440ep.h
Simple merge

diff --cc lib_ppc/board.c
Simple merge

diff --cc net/eth.c
index 68e2c54b2ea53a8eb1081c26b0f3f38e3466dd50,233032059c79eb254dc6218d35ef75b397cbe57f..6576ee405bb19a065a920b8db043d35ee113a8be
--- 1/net/eth.c
--- 2/net/eth.c
+++ b/net/eth.c
@@@ -26,8 -26,16 +26,8 @@@
  #include <net.h>
  #include <miiphy.h>
  
- #if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
  
 -#if defined(CONFIG_SHOW_BOOT_PROGRESS)
 -# include <status_led.h>
 -extern void show_ethcfg_progress (int arg);
 -# define SHOW_BOOT_PROGRESS(arg)      show_boot_progress (arg)
 -#else
 -# define SHOW_BOOT_PROGRESS(arg)
 -#endif
 -
  #ifdef CFG_GT_6426x
  extern int gt6426x_eth_initialize(bd_t *bis);
  #endif
@@@ -143,8 -150,7 +143,8 @@@ int eth_initialize(bd_t *bis
        eth_devices = NULL;
        eth_current = NULL;
  
- #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
 +      show_boot_progress (64);
+ #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
        miiphy_init();
  #endif