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

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

diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index c7cf8a4294f64f4a0539a97cddd3a05b35d9f5cc..82228c0126b5027a8b6ae7b3249b50827225f274 100644 (file)
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -40,6 +40,8 @@
 #undef  CONFIG_EDT32F10
 #define CONFIG_SHARP_LQ057Q3DC02
 
+#define        CONFIG_SPLASH_SCREEN
+
 #define MPC8XX_FACT             1              /* Multiply by 1        */
 #define MPC8XX_XIN              50000000       /* 50 MHz in            */
 #define CONFIG_8xx_GCLK_FREQ    50000000 /* define if can't use get_gclk_freq */
@@ -49,7 +51,7 @@
 #undef CONFIG_8xx_CONS_NONE
 #define CONFIG_BAUDRATE                115200  /* console baudrate in bps      */
 #if 0
-#define CONFIG_BOOTDELAY       -1      /* autoboot disabled            */
+#define CONFIG_BOOTDELAY       0       /* immediate boot               */
 #else
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 #endif
@@ -61,8 +63,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #undef CONFIG_SCC1_ENET
@@ -75,14 +77,6 @@
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
-#if 0
-#ifdef CONFIG_LCD
-# undef         CONFIG_STATUS_LED              /* disturbs display             */
-#else
-# define CONFIG_STATUS_LED     1       /* Status LED enabled           */
-#endif /* CONFIG_LCD */
-#endif
-
 #define        CONFIG_CAN_DRIVER               /* CAN Driver support enabled   */
 
 #define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
@@ -118,12 +112,16 @@
 #define CFG_I2C_TEM_ADDR       0x49    /* Temperature Sensors */
 
 #define CONFIG_COMMANDS              ( CONFIG_CMD_DFL  | \
-                               CFG_CMD_DHCP    | \
+                               CFG_CMD_BMP     | \
+                               CFG_CMD_BSP     | \
                                CFG_CMD_DATE    | \
+                               CFG_CMD_DHCP    | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IDE     | \
+                               CFG_CMD_JFFS2   | \
+                               CFG_CMD_NFS     | \
                                CFG_CMD_PCMCIA  | \
-                               CFG_CMD_BSP     )
+                               CFG_CMD_SNTP    )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -131,6 +129,9 @@
 /*
  * Miscellaneous configurable options
  */
+#define CFG_DEVICE_NULLDEV     1       /* we need the null device      */
+#define CFG_CONSOLE_IS_IN_ENV  1       /* must set console from env    */
+
 #define        CFG_LONGHELP                    /* undef to save memory         */
 #define        CFG_PROMPT      "=> "           /* Monitor Command Prompt       */
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
@@ -151,6 +152,23 @@
 
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200 }
 
+/*
+ * JFFS2 partitions
+ */
+/* No command line, one static partition
+ * use all the space starting at offset 3MB*/
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor0"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00300000
+
+/* mtdparts command line support */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=r360-0"
+#define MTDPARTS_DEFAULT       "mtdparts=r360-0:-@3m(user)"
+*/
+
 /*
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
@@ -329,8 +347,7 @@
  *-----------------------------------------------------------------------
  *
  */
-#define        CFG_DER 0x2002000F
-/*#define CFG_DER      0*/
+#define CFG_DER        0
 
 /*
  * Init Memory Controller: