[PATCH] Fix: Compilerwarnings for SC3 board.

[oweals/u-boot.git] / include / configs / sc3.h

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 2d0278290a23fe01a1fd28b1c55e6b10965ef70b..a4a160546017913000df1389d43bb09982f9fa07 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -108,7 +108,8 @@
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "nand_args=setenv bootargs root=/dev/mtdblock4 rw\0"            \
+       "nand_args=setenv bootargs root=/dev/mtdblock5 rw"              \
+               "rootfstype=jffs2\0"                                    \
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
@@ -164,18 +165,19 @@
 
 #define CONFIG_COMMANDS          \
           (CONFIG_CMD_DFL      | \
-                               CFG_CMD_PCI     | \
-                               CFG_CMD_IRQ     | \
-                               CFG_CMD_NET | \
-                               CFG_CMD_MII | \
-                               CFG_CMD_PING | \
-                               CFG_CMD_NAND | \
-                               CFG_CMD_I2C | \
-                               CFG_CMD_IDE | \
-                               CFG_CMD_DATE | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_CACHE  | \
-                               CFG_CMD_ELF     )
+                       CFG_CMD_PCI     | \
+                       CFG_CMD_IRQ     | \
+                       CFG_CMD_NET     | \
+                       CFG_CMD_MII     | \
+                       CFG_CMD_PING    | \
+                       CFG_CMD_NAND    | \
+                       CFG_CMD_JFFS2   | \
+                       CFG_CMD_I2C     | \
+                       CFG_CMD_IDE     | \
+                       CFG_CMD_DATE    | \
+                       CFG_CMD_DHCP    | \
+                       CFG_CMD_CACHE   | \
+                       CFG_CMD_ELF     )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -404,6 +406,15 @@ extern unsigned long offsetOfEnvironment;
 #define NAND_MAX_CHIPS         1
 #define CFG_NAND_BASE          0x77D00000
 
+
+#define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
+
+/* No command line, one static partition Partition 3 contains jffs2 rootfs */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nand0"
+#define CONFIG_JFFS2_PART_SIZE         0x00400000
+#define CONFIG_JFFS2_PART_OFFSET       0x00c00000
+
 /*-----------------------------------------------------------------------
  * Cache Configuration
  *
@@ -516,6 +527,8 @@ extern unsigned long offsetOfEnvironment;
 #undef CFG_EBC_PB7AP
 #undef CFG_EBC_PB7CR
 
+#define CFG_EBC_CFG    0xb84ef000
+
 #define CONFIG_SDRAM_BANK0     /* use the standard SDRAM initialization */
 #undef CONFIG_SPD_EEPROM