Merge git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / include / configs / qemu-mips.h

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index c3a69c5..6fdf50b 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -12,11 +12,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MIPS32                  /* MIPS32 CPU core */
 #define CONFIG_QEMU_MIPS
+
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_BOOTDELAY       10      /* autoboot after 10 seconds */
 
 #define CONFIG_BAUDRATE                115200
 
@@ -44,19 +43,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#define CONFIG_CMD_DHCP
 
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE      0xb4000300
 
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         115200
@@ -64,7 +54,10 @@
 #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
@@ -80,16 +73,8 @@
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
-/* Monitor Command Prompt */
-#if defined(CONFIG_SYS_LITTLE_ENDIAN)
-#define CONFIG_SYS_PROMPT              "qemu-mipsel # "
-#else
-#define CONFIG_SYS_PROMPT              "qemu-mips # "
-#endif
-
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_HUSH_PARSER
 
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              256
@@ -106,8 +91,6 @@
 
 #define CONFIG_SYS_MIPS_TIMER_FREQ     (CONFIG_SYS_MHZ * 1000000)
 
-#define CONFIG_SYS_HZ                  1000
-
 /* Cached addr */
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
@@ -121,7 +104,6 @@
  * 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)
 
@@ -147,11 +129,4 @@
 
 #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 */