Convert CONFIG_ENV_IS_IN_FLASH to Kconfig

[people/ms/u-boot.git] / include / configs / qemu-mips.h

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index a7cd00350d4daa8ee2cd70524d5053597935a841..89d1ad91e0ec8fb531297ae70a24ba29c77002d6 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -14,13 +14,8 @@
 
 #define CONFIG_QEMU_MIPS
 
-#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_BOOTDELAY       10      /* autoboot after 10 seconds */
-
-#define CONFIG_BAUDRATE                115200
-
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 #undef CONFIG_BOOTARGS
 
@@ -55,8 +50,9 @@
 #define CONFIG_SYS_NS16550_COM1                0xb40003f8
 #define CONFIG_CONS_INDEX              1
 
-#define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
+#ifdef CONFIG_SYS_BIG_ENDIAN
+#define CONFIG_IDE_SWAP_IO
+#endif
 
 #define CONFIG_SYS_IDE_MAXBUS          2
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0x1f0
@@ -82,7 +78,7 @@
 /* max number of command args */
 #define CONFIG_SYS_MAXARGS             16
 
-#define CONFIG_SYS_MALLOC_LEN          128*1024
+#define CONFIG_SYS_MALLOC_LEN          (256 << 10)
 
 #define CONFIG_SYS_BOOTPARAMS_LEN      128*1024
 
@@ -103,9 +99,7 @@
  * FLASH and environment organization
  */
 /* The following #defines are needed to get flash environment right */
-#define CONFIG_SYS_TEXT_BASE           0xbfc00000 /* Rom version */
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
 
@@ -117,23 +111,12 @@
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
-#define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
-
 /* Address and size of Primary Environment Sector */
 #define CONFIG_ENV_SIZE                0x8000
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
 
 #define CONFIG_ENV_OVERWRITE   1
 
 #define MEM_SIZE               128
 
-#define CONFIG_LZMA
-
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CONFIG_SYS_DCACHE_SIZE         16384
-#define CONFIG_SYS_ICACHE_SIZE         16384
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
 #endif /* __CONFIG_H */