ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

[karo-tx-uboot.git] / include / dataflash.h

diff --git a/include/dataflash.h b/include/dataflash.h
index 80f0633aa944a4096b89fe4297795baa27003451..63b3bf9634334e7ccd7c7ead82a0e095fed9afb2 100644 (file)
--- a/include/dataflash.h
+++ b/include/dataflash.h
@@ -40,7 +40,7 @@
 /*number of protected area*/
 #define NB_DATAFLASH_AREA              5
 
-#ifdef CFG_NO_FLASH
+#ifdef CONFIG_SYS_NO_FLASH
 
 /*-----------------------------------------------------------------------
  * return codes from flash_write():
@@ -66,7 +66,7 @@
  * Set Environment according to label:
  */
 # define       FLAG_SETENV             0x80
-#endif /* CFG_NO_FLASH */
+#endif /* CONFIG_SYS_NO_FLASH */
 
 /*define the area structure*/
 typedef struct {
@@ -135,9 +135,9 @@ struct dataflash_addr {
        int cs;
 };
 /*-------------------------------------------------------------------------------------------------*/
-
 #define AT45DB161      0x2c
 #define AT45DB021      0x14
+#define AT45DB081      0x24
 #define AT45DB321      0x34
 #define AT45DB642      0x3c
 #define AT45DB128      0x10
@@ -213,7 +213,7 @@ extern void dataflash_print_info (void);
 extern void dataflash_perror (int err);
 extern void AT91F_DataflashSetEnv (void);
 
-extern struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS];
+extern struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS];
 extern dataflash_protect_t area_list[NB_DATAFLASH_AREA];
 extern AT91S_DATAFLASH_INFO dataflash_info[];
 #endif