Merge branch 'lwmon5' of /home/wd/git/u-boot/projects

[platform/kernel/u-boot.git] / include / configs / MUSENKI.h

diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index 03765a3..4319e6c 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -52,11 +52,20 @@
 
 #define CONFIG_BOOTDELAY       5
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
 
-#include <cmd_confdefs.h>
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
 
 
 /*
@@ -77,7 +86,7 @@
  * PCI stuff
  *-----------------------------------------------------------------------
  */
-#define CONFIG_PCI                     /* include pci support          */
+#define CONFIG_PCI                     /* include pci support          */
 #undef CONFIG_PCI_PNP
 
 #define CONFIG_NET_MULTI               /* Multi ethernet cards support */
@@ -280,7 +289,7 @@
  * Cache Configuration
  */
 #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
 
@@ -292,6 +301,4 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
-
-
 #endif /* __CONFIG_H */