Merge git://www.denx.de/git/u-boot-marvell

[oweals/u-boot.git] / include / configs / dbau1x00.h

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 182e8abedd405f47999aab0c84d966142e4fc36d..970e214e0746b17e204d2bff3144e4f8b56921cd 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -35,9 +35,6 @@
 #endif
 #endif
 
-
-#define CONFIG_BAUDRATE                115200
-
 /* valid baudrates */
 
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
@@ -69,17 +66,10 @@
 /*
  * Command line configuration.
  */
-#undef CONFIG_CMD_BEDBUG
 
 #ifdef CONFIG_DBAU1550
 
-#undef CONFIG_CMD_IDE
 #undef CONFIG_CMD_PCMCIA
-
-#else
-
-#define CONFIG_CMD_IDE
-
 #endif
 
 /*
@@ -148,8 +138,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Timeout for Flash Erase */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    (2 * CONFIG_SYS_HZ) /* Timeout for Flash Write */
 
-#define        CONFIG_ENV_IS_NOWHERE   1
-
 /* Address and size of Primary Environment Sector      */
 #define CONFIG_ENV_ADDR                0xB0030000
 #define CONFIG_ENV_SIZE                0x10000
@@ -173,7 +161,6 @@
 #define CONFIG_PCMCIA_SLOT_A
 
 #define CONFIG_ATAPI 1
-#define CONFIG_MAC_PARTITION 1
 
 /* We run CF in "true ide" mode or a harddrive via pcmcia */
 #define CONFIG_IDE_PCMCIA 1