flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / board / atmel / at91sam9263ek / at91sam9263ek.c

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 04e5812db3d0fb0646bcf57dd27c774e38f76808..e4e32f60aef89e2a990af408b470835c8d5ceefe 100644 (file)
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -166,14 +166,14 @@ static void at91sam9263ek_lcd_hw_init(void)
 #include <nand.h>
 #include <version.h>
 
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
 extern flash_info_t flash_info[];
 #endif
 
 void lcd_show_board_info(void)
 {
        ulong dram_size, nand_size;
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
        ulong flash_size;
 #endif
        int i;
@@ -192,7 +192,7 @@ void lcd_show_board_info(void)
        nand_size = 0;
        for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
                nand_size += nand_info[i]->size;
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
        flash_size = 0;
        for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
                flash_size += flash_info[i].size;
@@ -200,7 +200,7 @@ void lcd_show_board_info(void)
        lcd_printf ("  %ld MB SDRAM, %ld MB NAND",
                dram_size >> 20,
                nand_size >> 20 );
-#ifndef CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_MTD_NOR_FLASH
        lcd_printf (",\n  %ld MB NOR",
                flash_size >> 20);
 #endif