flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / common / flash.c

diff --git a/common/flash.c b/common/flash.c
index f1440c2c18ebd0fd025db45e4385f7eaee19203a..6d492c729f050a0dcd2a1f91d2513411c5c28247 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -10,7 +10,7 @@
 #include <common.h>
 #include <flash.h>
 
-#if !defined(CONFIG_SYS_NO_FLASH)
+#if defined(CONFIG_MTD_NOR_FLASH)
 #include <mtd/cfi_flash.h>
 
 extern flash_info_t  flash_info[]; /* info for FLASH chips */
@@ -88,7 +88,6 @@ flash_protect (int flag, ulong from, ulong to, flash_info_t *info)
 flash_info_t *
 addr2info (ulong addr)
 {
-#ifndef CONFIG_SPD823TS
        flash_info_t *info;
        int i;
 
@@ -104,7 +103,6 @@ addr2info (ulong addr)
                        return (info);
                }
        }
-#endif /* CONFIG_SPD823TS */
 
        return (NULL);
 }
@@ -125,9 +123,6 @@ addr2info (ulong addr)
 int
 flash_write (char *src, ulong addr, ulong cnt)
 {
-#ifdef CONFIG_SPD823TS
-       return (ERR_TIMOUT);    /* any other error codes are possible as well */
-#else
        int i;
        ulong         end        = addr + cnt - 1;
        flash_info_t *info_first = addr2info (addr);
@@ -181,7 +176,6 @@ flash_write (char *src, ulong addr, ulong cnt)
 #endif /* CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE */
 
        return (ERR_OK);
-#endif /* CONFIG_SPD823TS */
 }
 
 /*-----------------------------------------------------------------------
@@ -227,4 +221,4 @@ void flash_perror (int err)
 
 /*-----------------------------------------------------------------------
  */
-#endif /* !CONFIG_SYS_NO_FLASH */
+#endif /* !CONFIG_MTD_NOR_FLASH */