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

[J-u-boot.git] / include / configs / bamboo.h

diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 5b8b22f0e643f3dcf306636c0c7cea923050ba0e..2e8105afd408d061b3fa84cb310590399b8f9b46 100644 (file)
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -29,7 +29,8 @@
 #define CONFIG_HOSTNAME                bamboo
 #include "amcc-common.h"
 
-#define CONFIG_BOARD_EARLY_INIT_F 1     /* Call board_early_init_f     */
+/* Reclaim some space. */
+#undef CONFIG_SYS_LONGHELP
 
 /*
  * Please note that, if NAND support is enabled, the 2nd ethernet port
@@ -172,7 +173,6 @@
 #ifdef CONFIG_440EP
 /* USB */
 #define CONFIG_USB_OHCI
-#define CONFIG_USB_STORAGE
 
 /*Comment this out to enable USB 1.1 device*/
 #define USB_2_0_DEVICE
@@ -182,12 +182,8 @@
  * Commands additional to the ones defined in amcc-common.h
  */
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_USB
 
 #ifdef CONFIG_BAMBOO_NAND
 #define CONFIG_CMD_NAND
@@ -205,9 +201,7 @@
  *-----------------------------------------------------------------------
  */
 /* General PCI */
-#define CONFIG_PCI                     /* include pci support          */
 #define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
-#undef  CONFIG_PCI_PNP                 /* do (not) pci plug-and-play   */
 #define CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup  */
 #define CONFIG_SYS_PCI_TARGBASE        0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/