Convert CONFIG_ENV_IS_IN_SPI_FLASH to Kconfig

[u-boot] / include / configs / ea20.h

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 3a5b5c7285d547ecaa1cd7daea704b4d630184d6..16f65f3480933ac73a1fd3f361abf93f79dd0914 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -87,9 +87,6 @@
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH
-#undef CONFIG_ENV_IS_IN_FLASH
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                        (8 << 10)
 #define CONFIG_ENV_OFFSET              0x80000
 #define CONFIG_ENV_SECT_SIZE           (64 << 10)
@@ -115,7 +112,6 @@
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
 #define CONFIG_MX_CYCLIC
 
 /*
@@ -128,7 +124,6 @@
 /*
  * U-Boot commands
  */
-#define CONFIG_CMD_ENV
 #define CONFIG_CMD_SAVES
 
 #ifdef CONFIG_CMD_BDI
@@ -142,12 +137,8 @@
 #ifdef CONFIG_SYS_USE_NAND
 #define CONFIG_CMD_NAND
 
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBIFS
 
 #define CONFIG_NAND_DAVINCI
 #define        CONFIG_SYS_NAND_PAGE_2K
@@ -167,9 +158,7 @@
 #if !defined(CONFIG_SYS_USE_NAND) && \
        !defined(CONFIG_USE_NOR) && \
        !defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                (16 << 10)
-#undef CONFIG_CMD_ENV
 #endif
 
 /* additions for new relocation code, must added to all boards */
@@ -273,4 +262,6 @@
        "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0"    \
        "bootcmd=run net_testrfs\0"
 
+#include <asm/arch/hardware.h>
+
 #endif /* __CONFIG_H */