Merge with /home/stefan/git/u-boot/u-boot-ppc4xx

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

diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 517d130d5cad933aa27b9e998ed5174b675fbba8..e3f6e2c8b34afdd83fd0a631b872b316c48f3eb5 100644 (file)
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -123,10 +123,8 @@
 #define CFG_FLASH_USE_BUFFER_WRITE 1   /* use buffered writes (20x faster)     */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#define        _CFG_CMD_INCLUDE        (CFG_CMD_ALL)
 #else
 #define        CFG_NO_FLASH            1       /* No NOR on Acadia when NAND-booting   */
-#define        _CFG_CMD_INCLUDE        ((CFG_CMD_ALL) & ~(CFG_CMD_FLASH | CFG_CMD_IMLS))
 #endif
 
 #ifdef CFG_ENV_IS_IN_FLASH
@@ -301,27 +299,45 @@
 
 #define CONFIG_SUPPORT_VFAT
 
-#define CONFIG_COMMANDS        ((CONFIG_CMD_DFL & _CFG_CMD_INCLUDE)    |       \
-                        CFG_CMD_ASKENV |                               \
-                        CFG_CMD_DHCP   |                               \
-                        CFG_CMD_DTT    |                               \
-                        CFG_CMD_DIAG   |                               \
-                        CFG_CMD_EEPROM |                               \
-                        CFG_CMD_ELF    |                               \
-                        CFG_CMD_FAT    |                               \
-                        CFG_CMD_I2C    |                               \
-                        CFG_CMD_IRQ    |                               \
-                        CFG_CMD_MII    |                               \
-                        CFG_CMD_NAND   |                               \
-                        CFG_CMD_NET    |                               \
-                        CFG_CMD_NFS    |                               \
-                        CFG_CMD_PCI    |                               \
-                        CFG_CMD_PING   |                               \
-                        CFG_CMD_REGINFO |                              \
-                        CFG_CMD_USB)
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DTT
+#define CONFIG_CMD_DIAG
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_USB
+
+/*
+ * No NOR on Acadia when NAND-booting
+ */
+#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_IMLS
+#endif
 
 #undef CONFIG_WATCHDOG                                 /* watchdog disabled            */
 
@@ -330,7 +346,7 @@
  *----------------------------------------------------------------------*/
 #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      */
@@ -373,7 +389,7 @@
  */
 #define CFG_DCACHE_SIZE                16384           /* For AMCC 405EZ CPU           */
 #define CFG_CACHELINE_SIZE     32              /* ...                          */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    5               /* log base 2 of the above value*/
 #endif
 
@@ -489,7 +505,7 @@
 #define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
   #define CONFIG_KGDB_BAUDRATE 230400  /* speed to run kgdb serial port */
   #define CONFIG_KGDB_SER_INDEX        2       /* which serial port to use */
 #endif