include/configs: Use new CONFIG_CMD_* in various P* named board config files.

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

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 0750116..8346d8c 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -42,14 +42,20 @@
 #define CONFIG_CONS_INDEX      1
 
 
-#define REMOVE_COMMANDS         ( CFG_CMD_AUTOSCRIPT | \
-                                 CFG_CMD_LOADS | \
-                                 CFG_CMD_ENV | \
-                                 CFG_CMD_FLASH )
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_BSP
+
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_ENV
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_IMLS
 
-#define CONFIG_COMMANDS                ( (CONFIG_CMD_DFL & ~REMOVE_COMMANDS) |\
-                                 CFG_CMD_PCI |\
-                                 CFG_CMD_BSP)
 
 #define CONFIG_BAUDRATE                19200   /* console baudrate             */
 
@@ -67,24 +73,20 @@
 #define CONFIG_BOOTCOMMAND \
                        "setenv verify y;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
-                       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 100000; bootm"
-                       /* "tftpboot 100000 pImage; bootm" */
+                       /* "tftpboot 100000 uImage; bootm" */
 #else
 /* Boot Linux with RAMdisk based filesystem (initrd, BusyBox) */
 #define CONFIG_BOOTCOMMAND \
                        "setenv verify n;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
                        "root=/dev/ram rw " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 200000; bootm"
 #endif
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)      */
-#include <cmd_confdefs.h>
-
-
 /*
  * Miscellaneous configurable options
  */
@@ -101,6 +103,8 @@
 
 #define CONFIG_MISC_INIT_R     1               /* call misc_init_r() on init   */
 
+#define CONFIG_HAS_ETH1                1               /* add support for eth1addr     */
+
 #define CONFIG_SHOW_BOOT_PROGRESS 1            /* Show boot progress on LEDs   */
 
 /*
@@ -284,7 +288,7 @@
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32      /* For MPC8240 CPU                      */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
 #endif