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

[u-boot] / include / configs / RBC823.h

diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 21945a343cd807436095812c71129ce2881fb5e2..2f6de815514de24f5c89f3553c2b20321e72a45a 100644 (file)
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -79,7 +79,15 @@
 
 #undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 #undef CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -94,42 +102,45 @@
 #define CFG_EEPROM_WRITE_BITS          4
 #define CFG_EEPROM_WRITE_DELAY_MS      10
 
-#define CONFIG_COMMANDS              ( CFG_CMD_ALL     & \
-                               ~CFG_CMD_BSP    & \
-                               ~CFG_CMD_DATE   & \
-                               ~CFG_CMD_DISPLAY& \
-                               ~CFG_CMD_DTT    & \
-                               ~CFG_CMD_EXT2   & \
-                               ~CFG_CMD_FDC    & \
-                               ~CFG_CMD_FDOS   & \
-                               ~CFG_CMD_HWFLOW & \
-                               ~CFG_CMD_IDE    & \
-                               ~CFG_CMD_IRQ    & \
-                               ~CFG_CMD_JFFS2  & \
-                               ~CFG_CMD_MII    & \
-                               ~CFG_CMD_MMC    & \
-                               ~CFG_CMD_NAND   & \
-                               ~CFG_CMD_PCI    & \
-                               ~CFG_CMD_PCMCIA & \
-                               ~CFG_CMD_REISER & \
-                               ~CFG_CMD_SCSI   & \
-                               ~CFG_CMD_SETGETDCR & \
-                               ~CFG_CMD_SNTP   & \
-                               ~CFG_CMD_SPI    & \
-                               ~CFG_CMD_UNIVERSE & \
-                               ~CFG_CMD_USB    & \
-                               ~CFG_CMD_VFD    & \
-                               ~CFG_CMD_XIMG   )
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_all.h>
+
+#undef CONFIG_CMD_BSP
+#undef CONFIG_CMD_DATE
+#undef CONFIG_CMD_DISPLAY
+#undef CONFIG_CMD_DTT
+#undef CONFIG_CMD_EXT2
+#undef CONFIG_CMD_FDC
+#undef CONFIG_CMD_FDOS
+#undef CONFIG_CMD_HWFLOW
+#undef CONFIG_CMD_IDE
+#undef CONFIG_CMD_IRQ
+#undef CONFIG_CMD_JFFS2
+#undef CONFIG_CMD_MII
+#undef CONFIG_CMD_MFSL
+#undef CONFIG_CMD_MMC
+#undef CONFIG_CMD_NAND
+#undef CONFIG_CMD_PCI
+#undef CONFIG_CMD_PCMCIA
+#undef CONFIG_CMD_REISER
+#undef CONFIG_CMD_SCSI
+#undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_SNTP
+#undef CONFIG_CMD_SPI
+#undef CONFIG_CMD_UNIVERSE
+#undef CONFIG_CMD_USB
+#undef CONFIG_CMD_VFD
+#undef CONFIG_CMD_XIMG
+
 
 /*
  * Miscellaneous configurable options
  */
 #define        CFG_LONGHELP                    /* undef to save memory         */
 #define        CFG_PROMPT      "=> "           /* Monitor Command Prompt       */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define        CFG_CBSIZE      1024            /* Console I/O Buffer Size      */
 #else
 #define        CFG_CBSIZE      256             /* Console I/O Buffer Size      */
@@ -205,7 +216,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     16      /* For all MPC8xx CPUs                  */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    4       /* log base 2 of the above value        */
 #endif
 
@@ -326,8 +337,6 @@
 /************************************************************
  * Disk-On-Chip configuration
  ************************************************************/
-#define CFG_NAND_LEGACY
-
 #define CFG_MAX_DOC_DEVICE     1       /* Max number of DOC devices            */
 #define CFG_DOC_SHORT_TIMEOUT
 #define CFG_DOC_SUPPORT_2000