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

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

diff --git a/include/configs/malta.h b/include/configs/malta.h
index 775c30a5a79048a276bedb7ba2670e731485c91c..17951bf75b24da84341b40ca2b1c2aa6a77f380d 100644 (file)
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -11,14 +11,11 @@
  * System configuration
  */
 #define CONFIG_MALTA
-#define CONFIG_BOARD_EARLY_INIT_F
 
 #define CONFIG_MEMSIZE_IN_BYTES
 
-#define CONFIG_PCI
 #define CONFIG_PCI_GT64120
 #define CONFIG_PCI_MSC01
-#define CONFIG_PCI_PNP
 #define CONFIG_PCNET
 #define CONFIG_PCNET_79C973
 #define PCNET_HAS_PROM
@@ -55,18 +52,9 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN      (128 * 1024)
 #define CONFIG_SYS_BOOTM_LEN           (64 * 1024 * 1024)
 
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 /*
  * Serial driver
  */
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_NS16550_PORT_MAPPED
 
 /*
@@ -86,7 +74,6 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE           0x20000
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_ADDR \
@@ -105,10 +92,5 @@
 /*
  * Commands
  */
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_PCI
-
-#define CONFIG_SYS_LONGHELP            /* verbose help, undef to save memory */
 
 #endif /* _MALTA_CONFIG_H */