Merge branch 'master' of git://git.denx.de/u-boot-samsung

[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 5a043d5..be7f4f2 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -14,13 +14,8 @@
 
 #define CONFIG_QEMU_MIPS
 
 
 #define CONFIG_QEMU_MIPS
 

-#define CONFIG_DISPLAY_BOARDINFO

 #define CONFIG_MISC_INIT_R
 
 #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
 
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 #undef CONFIG_BOOTARGS
 


@@ -45,9 +40,6 @@
 /*
  * Command line configuration.
  */
 /*
  * Command line configuration.
  */

-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_DHCP

 
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE      0xb4000300
 
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE      0xb4000300


@@ -59,7 +51,10 @@
 #define CONFIG_CONS_INDEX              1
 
 #define CONFIG_CMD_IDE
 #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
 
 #define CONFIG_SYS_IDE_MAXBUS          2
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0x1f0


@@ -75,17 +70,8 @@
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 

-/* Monitor Command Prompt */
-#undef CONFIG_SYS_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_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING

-#define CONFIG_SYS_HUSH_PARSER

 
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              256
 
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              256


@@ -115,7 +101,6 @@
  * FLASH and environment organization
  */
 /* The following #defines are needed to get flash environment right */
  * 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_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 


@@ -141,11 +126,4 @@
 
 #define CONFIG_LZMA
 
 
 #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 */
 #endif /* __CONFIG_H */