Merge git://git.denx.de/u-boot-mpc85xx

diff --combined README
index bfefa21b3bfd568bee43322e6210ff39dc151257,0c892d8a43e7fbb51ae10601d970a5ce44b6bd61..4ca04d0489ed3dcd3f04f403cc527f633746f1c2
--- 1/README
--- 2/README
+++ b/README
@@@ -409,6 -409,10 +409,10 @@@ The following options need to be config
                Enables a workaround for IFC erratum A003399. It is only
                requred during NOR boot.
  
+               CONFIG_A008044_WORKAROUND
+               Enables a workaround for T1040/T1042 erratum A008044. It is only
+               requred during NAND boot and valid for Rev 1.0 SoC revision
+ 
                CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY
  
                This is the value to write into CCSR offset 0x18600
@@@ -3657,13 -3661,10 +3661,13 @@@ FIT uImage format
  
                CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR,
                CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS,
 -              CONFIG_SYS_MMC_SD_FS_BOOT_PARTITION
 -              Address, size and partition on the MMC to load U-Boot from
 +              Address and partition on the MMC to load U-Boot from
                when the MMC is being used in raw mode.
  
 +              CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
 +              Partition on the MMC to load U-Boot from when the MMC is being
 +              used in raw mode
 +
                CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR
                Sector to load kernel uImage from when MMC is being
                used in raw mode (for Falcon mode)
@@@ -3674,10 -3675,6 +3678,10 @@@
                parameters from when MMC is being used in raw mode
                (for falcon mode)
  
 +              CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
 +              Partition on the MMC to load U-Boot from when the MMC is being
 +              used in fs mode
 +
                CONFIG_SPL_FAT_SUPPORT
                Support for fs/fat/libfat.o in SPL binary