env: Rename setenv() to env_set()

[u-boot] / include / dataflash.h

diff --git a/include/dataflash.h b/include/dataflash.h
index 142b55546f3efc21c8cc4235c6e1d2a95eb05616..c9f22200cfd721421017042ee356b5b2713cd47e 100644 (file)
--- a/include/dataflash.h
+++ b/include/dataflash.h
@@ -23,7 +23,7 @@
 /*number of protected area*/
 #define NB_DATAFLASH_AREA              5
 
-#ifdef CONFIG_SYS_NO_FLASH
+#ifndef CONFIG_MTD_NOR_FLASH
 
 /*-----------------------------------------------------------------------
  * return codes from flash_write():
@@ -49,7 +49,7 @@
  * Set Environment according to label:
  */
 # define       FLAG_SETENV             0x80
-#endif /* CONFIG_SYS_NO_FLASH */
+#endif /* CONFIG_MTD_NOR_FLASH */
 
 /*define the area structure*/
 typedef struct {
@@ -197,7 +197,7 @@ extern int AT91F_DataflashInit(void);
 
 extern void dataflash_print_info (void);
 extern void dataflash_perror (int err);
-extern void AT91F_DataflashSetEnv (void);
+extern void AT91F_Dataflashenv_set(void);
 
 extern struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS];
 extern dataflash_protect_t area_list[NB_DATAFLASH_AREA];