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

[oweals/u-boot.git] / board / earthlcd / favr-32-ezkit / flash.c

diff --git a/board/earthlcd/favr-32-ezkit/flash.c b/board/earthlcd/favr-32-ezkit/flash.c
index 49a715a2994b976b5a854812eff665041800236b..0a2614667a2443a25a42b343bae8df6cea3aed22 100644 (file)
--- a/board/earthlcd/favr-32-ezkit/flash.c
+++ b/board/earthlcd/favr-32-ezkit/flash.c
@@ -20,7 +20,7 @@
 #include <common.h>
 
 #ifdef CONFIG_FAVR32_EZKIT_EXT_FLASH
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 
@@ -53,22 +53,22 @@ unsigned long flash_init(void)
        unsigned long addr;
        unsigned int i;
 
-       flash_info[0].size = CFG_FLASH_SIZE;
+       flash_info[0].size = CONFIG_SYS_FLASH_SIZE;
        flash_info[0].sector_count = 135;
 
-       flash_identify(uncached((void *)CFG_FLASH_BASE), &flash_info[0]);
+       flash_identify(uncached((void *)CONFIG_SYS_FLASH_BASE), &flash_info[0]);
 
        for (i = 0, addr = 0; i < 8; i++, addr += 0x2000)
                flash_info[0].start[i] = addr;
        for (; i < flash_info[0].sector_count; i++, addr += 0x10000)
                flash_info[0].start[i] = addr;
 
-       return CFG_FLASH_SIZE;
+       return CONFIG_SYS_FLASH_SIZE;
 }
 
 void flash_print_info(flash_info_t *info)
 {
-       printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n",
+       printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n",
               info->flash_id >> 16, info->flash_id & 0xffff);
        printf("Size: %ld MB in %d sectors\n",
               info->size >> 10, info->sector_count);