Merge branch 'origin'

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

diff --git a/include/configs/v37.h b/include/configs/v37.h
index 6696985..a2e99b5 100644 (file)
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -65,8 +65,8 @@
 #define CONFIG_BOOTCOMMAND                                                     \
        "tftpboot; "                                                            \
        "setenv bootargs console=tty0 "                                   \
-       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "                     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "                     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -87,10 +87,23 @@
                                CFG_CMD_JFFS2   | \
                                CFG_CMD_DATE    )
 
-
-/* Flash banks JFFS2 should use */
-#define CFG_JFFS2_FIRST_BANK   1
-#define CFG_JFFS2_NUM_BANKS    1
+/*
+ * JFFS2 partitions
+ *
+ */
+/* No command line, one static partition, whole device */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor1"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00000000
+
+/* mtdparts command line support */
+/* Note: fake mtd_id used, no linux mtd map file */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor1=v37-1"
+#define MTDPARTS_DEFAULT       "mtdparts=v37-1:-(jffs2)"
+*/
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -296,8 +309,7 @@
  *-----------------------------------------------------------------------
  *
  */
-#define        CFG_DER 0x0082000F
-/*#define CFG_DER      0*/
+#define CFG_DER        0
 
 /*
  * Init Memory Controller: