Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 6c37208..192cbd4 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -42,14 +42,29 @@
 #define CONFIG_CONS_INDEX      1
 
 
-#define REMOVE_COMMANDS         ( CFG_CMD_AUTOSCRIPT | \
-                                 CFG_CMD_LOADS | \
-                                 CFG_CMD_ENV | \
-                                 CFG_CMD_FLASH )
+/*
+ * 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_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             */
 
@@ -58,7 +73,7 @@
 #define        CONFIG_CLOCKS_IN_MHZ    1       /* clocks passsed to Linux in MHz */
 
 #define CONFIG_SERVERIP                10.0.0.201
-#define CONFIG_IPADDR          10.0.0.200
+#define CONFIG_IPADDR          10.0.0.200
 #define CONFIG_ROOTPATH                /opt/eldk/ppc_82xx
 #define CONFIG_NETMASK         255.255.255.0
 #undef CONFIG_BOOTARGS
@@ -66,25 +81,21 @@
 /* Boot Linux with NFS root filesystem */
 #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;" \
+                       "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
+                       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 100000; 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 " \
+                       "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 +112,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   */
 
 /*
@@ -115,7 +128,7 @@
 /*
  * Networking stuff
  */
-#define CONFIG_NET_MULTI                               /* Multi ethernet cards support */
+#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_PCNET                           /* there are 2 AMD PCnet 79C973 */
 #define CONFIG_PCNET_79C973
@@ -140,16 +153,16 @@
 /*#define CFG_GBL_DATA_SIZE    256*/
 #define CFG_GBL_DATA_SIZE      128
 
-#define CFG_INIT_RAM_ADDR      0x40000000
-#define CFG_INIT_RAM_END       0x1000
-#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_RAM_ADDR      0x40000000
+#define CFG_INIT_RAM_END       0x1000
+#define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 
 
 #define CFG_NO_FLASH           1               /* There is no FLASH memory     */
 
-#define CFG_ENV_IS_NOWHERE     1               /* Store ENV in memory only     */
-#define CFG_ENV_OFFSET         0x00004000      /* Offset of Environment Sector */
-#define CFG_ENV_SIZE           0x00002000      /* Total Size of Environment Sector */
+#define CONFIG_ENV_IS_NOWHERE  1               /* Store ENV in memory only     */
+#define CONFIG_ENV_OFFSET              0x00004000      /* Offset of Environment Sector */
+#define CONFIG_ENV_SIZE                0x00002000      /* Total Size of Environment Sector */
 
 #define CFG_MALLOC_LEN         (512 << 10)     /* Reserve 512 kB for malloc()  */
 
@@ -284,7 +297,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