Merge git://git.denx.de/u-boot-nand-flash

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

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index e646c0035da8ddc678d89547032748cc84856e0b..0e4067a3a922d36455b5c93599360a77efed913c 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #endif /* #ifndef CONFIG_TQM5200S */
 
-
 /* Partitions */
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -129,8 +128,6 @@
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_OHCI_BE_CONTROLLER
 #define CONFIG_USB_STORAGE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_USB
 
 #undef CONFIG_SYS_USB_OHCI_BOARD_INIT
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
@@ -152,7 +149,6 @@
 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
 #endif
 
-
 /*
  * BOOTP options
  */
@@ -161,20 +157,13 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SNTP
 #define CONFIG_CMD_BSP
 
 #ifdef CONFIG_VIDEO
@@ -189,8 +178,6 @@
 #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \
        defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX)
     #define CONFIG_CMD_IDE
-    #define CONFIG_CMD_FAT
-    #define CONFIG_CMD_EXT2
 #endif
 
 #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \
@@ -203,7 +190,6 @@
     #define CONFIG_CMD_DIAG
 #endif
 
-
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
 #if (CONFIG_SYS_TEXT_BASE != 0xFFF00000)
@@ -213,7 +199,6 @@
 /*
  * Autobooting
  */
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
@@ -490,7 +475,6 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       MPC5XXX_SRAM_SIZE
 #endif
 
-
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
@@ -604,7 +588,6 @@
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory     */
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
-#define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
 
 #define CONFIG_SYS_CACHELINE_SIZE      32      /* For MPC5xxx CPUs */
 #if defined(CONFIG_CMD_KGDB)
@@ -628,11 +611,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x100000        /* default load address */
 
-/*
- * Enable loopw command.
- */
-#define CONFIG_LOOPW
-
 /*
  * Various low-level settings
  */