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

diff --combined board/amcc/yucca/flash.c
index d8c3b32cc803dc298c91de998c73eb3f370cac80,33b97a504074372f752c427d347f360bf5458a2f..5fab7bb1db245adbe9ff786a0a48891b4fa6df40
--- 1/board/amcc/yucca/flash.c
--- 2/board/amcc/yucca/flash.c
+++ b/board/amcc/yucca/flash.c
@@@ -914,10 -914,9 +914,10 @@@ static int flash_erase_2(flash_info_t 
  
  static int write_word_2(flash_info_t * info, ulong dest, ulong data)
  {
 -      volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2 = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]);
 -      volatile CONFIG_SYS_FLASH_WORD_SIZE *dest2 = (CONFIG_SYS_FLASH_WORD_SIZE *) dest;
 -      volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 = (CONFIG_SYS_FLASH_WORD_SIZE *) & data;
 +      ulong *data_ptr = &data;
 +      volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2 = (CONFIG_SYS_FLASH_WORD_SIZE *)(info->start[0]);
 +      volatile CONFIG_SYS_FLASH_WORD_SIZE *dest2 = (CONFIG_SYS_FLASH_WORD_SIZE *)dest;
 +      volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 = (CONFIG_SYS_FLASH_WORD_SIZE *)data_ptr;
        ulong start;
        int i;
  
@@@ -982,7 -981,7 +982,7 @@@ unsigned long flash_init(void
                 * Boot Settings in IIC EEprom address 0xA8 or 0xA0
                 * Read Serial Device Strap Register1 in PPC440SPe
                 */
-               mfsdr(sdr_sdstp1, val);
+               mfsdr(SDR0_SDSTP1, val);
                boot_selection  = val & SDR0_SDSTP1_BOOT_SEL_MASK;
                ebc_boot_size   = val & SDR0_SDSTP1_EBC_ROM_BS_MASK;