Merge branch 'arm/master' into arm/next

[oweals/u-boot.git] / board / amcc / yucca / flash.c

diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c
index eda49eb1746b81bce157c7efb9cf035f3bc3ac32..5fab7bb1db245adbe9ff786a0a48891b4fa6df40 100644 (file)
--- a/board/amcc/yucca/flash.c
+++ b/board/amcc/yucca/flash.c
@@ -914,9 +914,10 @@ static int flash_erase_2(flash_info_t * info, int s_first, int s_last)
 
 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;
 
@@ -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;