Merge with /home/sr/git/u-boot/denx-alpr-merge-test

diff --cc CHANGELOG
index e0766b77ce8f47abd3f5df558f30a46f10203b19,0c321c68df8d2e957ed825fc8718ea6db08598ee..4c9a7445e436dd7c58bbac1a0e58f0a206306079
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,100 -1,8 +1,106 @@@
 -<<<<<<< master
 -======================================================================
 -Changes since U-Boot 1.1.4:
 -======================================================================
 -=======
++commit 4f4b602ec7524a032bdf3c6d28c7f525a4a67eaa
++Author: Wolfgang Denk <wd@pollux.denx.de>
++Date: Mon Nov 27 22:53:53 2006 +0100
++
++    Update CHANGELOG
++
 +commit f6e495f54cdb8fe340b9c03deab40ad746d52fae
 +Author: Stefan Roese <sr@denx.de>
 +Date: Mon Nov 27 17:43:25 2006 +0100
 +
 +    [PATCH] 4xx_enet.c: Correct the setting of zmiifer register
 +
 +    Patch below corrects the setting of the zmiifer register, it was
 +    overwritting the register rather than ORing the settings.
 +
 +    Signed-off-by: Neil Wilson <NWilson@airspan.com>
 +    Signed-off-by: Stefan Roese <sr@denx.de>
 +
 +commit d1a72545296800b7e219f93104ad5836f0003d66
 +Author: Stefan Roese <sr@denx.de>
 +Date: Mon Nov 27 17:34:10 2006 +0100
 +
 +    [PATCH] Select NAND embedded environment from board configuration
 +
 +    The current NAND Bootloader setup forces the environment
 +    variables to be in line with the bootloader. This change
 +    enables the configuration to be made in the board include
 +    file instead so that it can be individually enabled.
 +
 +    Signed-off-by: Nick Spence <nick.spence@freescale.com>
 +    Signed-off-by: Stefan Roese <sr@denx.de>
 +
 +commit 15784862857c3c2214498defcfed84ff137fb81e
 +Author: Stefan Roese <sr@denx.de>
 +Date: Mon Nov 27 17:22:19 2006 +0100
 +
 +    [PATCH] nand_wait() timeout fixes
 +
 +    Two fixes for the nand_wait() function in
 +    drivers/nand/nand_base.c:
 +
 +    1. Use correct timeouts. The original timeouts in Linux
 +    source are 400ms and 20ms not 40s and 20s
 +
 +    2. Return correct error value in case of timeout. 0 is
 +    interpreted as OK.
 +
 +    Signed-off-by: Rui Sousa <rui.sousa@laposte.net>
 +    Signed-off-by: Stefan Roese <sr@denx.de>
 +
 +commit da5553b095bf04f4f109ad7e565dae3aba47b230
 +Author: Stefan Roese <sr@denx.de>
 +Date: Mon Nov 27 17:04:06 2006 +0100
 +
 +    [PATCH] Allow CONFIG_OF_FLAT_TREE to boot a non-arch/powerpc kernel
 +
 +    This patch allows an arch/ppc kernel to be booted by just passing 1 or 2
 +    arguments to bootm.        It removes the getenv("disable_of") test that used
 +    to be used for this purpose.
 +
 +    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
 +    Acked-by: Jon Loeliger <jdl@freescale.com>
 +
 +commit a9398e018593782c5fa7d0741955fc1256b34c1e
 +Author: Wolfgang Denk <wd@pollux.denx.de>
 +Date: Mon Nov 27 15:32:42 2006 +0100
 +
 +    Minor code cleanup. Update CHANGELOG.
 +
 +commit 78d620ebb5871d252270dedfad60c6568993b780
 +Author: Wolfgang Denk <wd@atlas.denx.de>
 +Date: Thu Nov 23 22:58:58 2006 +0100
 +
 +    Updates for TQM5200 modules:
 +    - fix off-by-one error in board/tqm5200/cam5200_flash.c error message
 +    - simplify "udate" definitions
 +
 +commit 2053283304eeddf250d109e6791eb6fa4cad14f7
 +Author: Stefan Roese <sr@denx.de>
 +Date: Wed Nov 22 13:20:50 2006 +0100
 +
 +    [PATCH] PPC4xx start.S: Fix for processor errata
 +
 +    Fixed cpu/ppc4xx/start.S for 440EPx Errata: further corrects PPC440EPx
 +    errata 1.12: 440_33 by moving patch up in code.
 +
 +    Signed-off-by: Jeff Mann <mannj@embeddedplanet.com>
 +    Signed-off-by: Stefan Roese <sr@denx.de>
 +
 +commit 4ef6251403f637841000e0fef9e832aa01339822
 +Author: Stefan Roese <sr@denx.de>
 +Date: Mon Nov 20 20:39:52 2006 +0100
 +
 +    [PATCH] Update AMCC Sequoia config file to support 64MByte NOR FLASH
 +
 +    Signed-off-by: Stefan Roese <sr@denx.de>
 +
 +commit e4bbd8da164b976d38616bd9c69c5e86e193cdf0
 +Author: Wolfgang Denk <wd@pollux.denx.de>
 +Date: Mon Nov 20 10:28:30 2006 +0100
 +
 +    Update CHANGELOG
 +
  commit 260421a21e934a68d31fb6125b0fbd2631a8ca20
  Author: Stefan Roese <sr@denx.de>
  Date: Mon Nov 13 13:55:24 2006 +0100

diff --cc cpu/ppc4xx/4xx_enet.c
Simple merge

diff --cc drivers/nand/nand_base.c
Simple merge