Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

diff --combined README
index a664607b524e155644d91e35755027b8f9d3601b,4dad1594eb17a8678e4db4d5c31f6782fa5825a3..69da2b86ba14219d735fe401af34d46a54ab0433
--- 1/README
--- 2/README
+++ b/README
@@@ -363,6 -363,12 +363,12 @@@ The following options need to be config
                ICache only when Code runs from RAM.
  
  - 85xx CPU Options:
+               CONFIG_SYS_PPC64
+ 
+               Specifies that the core is a 64-bit PowerPC implementation (implements
+               the "64" category of the Power ISA). This is necessary for ePAPR
+               compliance, among other possible reasons.
+ 
                CONFIG_SYS_FSL_TBCLK_DIV
  
                Defines the core time base clock divider ratio compared to the
@@@ -1084,7 -1090,7 +1090,7 @@@
                CONFIG_CALXEDA_XGMAC
                Support for the Calxeda XGMAC device
  
 -              CONFIG_DRIVER_LAN91C96
 +              CONFIG_LAN91C96
                Support for SMSC's LAN91C96 chips.
  
                        CONFIG_LAN91C96_BASE
@@@ -1094,7 -1100,7 +1100,7 @@@
                        CONFIG_LAN91C96_USE_32_BIT
                        Define this to enable 32 bit addressing
  
 -              CONFIG_DRIVER_SMC91111
 +              CONFIG_SMC91111
                Support for SMSC's LAN91C111 chip
  
                        CONFIG_SMC91111_BASE
@@@ -1316,13 -1322,6 +1322,13 @@@
                This will also enable the command "fatwrite" enabling the
                user to write files to FAT.
  
 +CBFS (Coreboot Filesystem) support
 +              CONFIG_CMD_CBFS
 +
 +              Define this to enable support for reading from a Coreboot
 +              filesystem. Available commands are cbfsinit, cbfsinfo, cbfsls
 +              and cbfsload.
 +
  - Keyboard Support:
                CONFIG_ISA_KEYBOARD