Support for redundant environment in NAND Flash.

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

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 53dbf827226e2d7e2a5520c59b91829ce2307e90..c5ee78ff4d71b5ef41f414565f1c6f7bebee5161 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -98,20 +98,17 @@
 #endif
 
 /*
- * Size of malloc() pool
+ * Size of malloc() pool and stack
  */
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 #ifdef VOICEBLUE_SMALL_FLASH
 #define CFG_MALLOC_LEN         (SZ_64K - CFG_GBL_DATA_SIZE)
+#define CONFIG_STACKSIZE       SZ_8K
 #else
-#define CFG_MALLOC_LEN         (SZ_4M - CFG_GBL_DATA_SIZE)
+#define CFG_MALLOC_LEN         SZ_4M
+#define CONFIG_STACKSIZE       SZ_1M
 #endif
 
-/*
- * The stack size is set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       SZ_8K   /* regular stack */
-
 /*
  * Hardware drivers
  */
@@ -163,17 +160,17 @@
 #ifdef VOICEBLUE_SMALL_FLASH
 #define CONFIG_BOOTDELAY       0
 #undef  CONFIG_BOOTARGS                /* the preboot command will set bootargs*/
-#define CFG_AUTOLOAD           "n"     /* No autoload */
+#define CFG_AUTOLOAD           "n"     /* no autoload */
 #define CONFIG_PREBOOT         "run setup"
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "setup=setenv bootargs console=ttyS0,$(baudrate) "      \
+       "setup=setenv bootargs console=ttyS0,${baudrate} "      \
                "root=/dev/nfs ip=dhcp\0"                       \
        "update=erase c000000 c03ffff; "                        \
-               "cp.b 10400000 c000000 $(filesize)\0"
+               "cp.b 10400000 c000000 ${filesize}\0"
 #else
 #define CONFIG_BOOTDELAY       3
-#undef  CONFIG_BOOTARGS                /* the boot command will set bootargs*/
-#define CFG_AUTOLOAD           "n"     /* No autoload */
+#undef  CONFIG_BOOTARGS                /* boot command will set bootargs */
+#define CFG_AUTOLOAD           "n"     /* no autoload */
 #define CONFIG_BOOTCOMMAND     "run nboot"
 #define CONFIG_PREBOOT         "run setup"
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
@@ -188,11 +185,11 @@
        "fi\0"                                                  \
        "setup=setenv bootargs console=ttyS0,$baudrate "        \
                "mtdparts=$mtdparts\0"                          \
-       "nfsargs=setenv bootargs $bootargs "                    \
-               "root=/dev/nfs ip=dhcp; run setpart\0"                  \
-       "flashargs=setenv bootargs $bootargs "                  \
-               "root=/dev/mtdblock$partition "                 \
-               "rootfstype=jffs2; run setpart\0"                               \
+       "nfsargs=run setpart; setenv bootargs $bootargs "       \
+               "root=/dev/nfs ip=dhcp\0"                       \
+       "flashargs=run setpart; setenv bootargs $bootargs "     \
+               "root=/dev/mtdblock$partition ro "              \
+               "rootfstype=jffs2\0"                            \
        "nboot=run nfsargs; bootp; tftp; bootm\0"               \
        "fboot=run flashargs; fsload /boot/uImage; bootm\0"
 #endif
@@ -250,4 +247,22 @@
 
 #define VOICEBLUE_LED_REG      0x04030000
 
+/*
+ * JFFS2 partitions
+ *
+ */
+/* No command line, one static partition */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor0"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00040000
+
+/* mtdparts command line support */
+/* Note: fake mtd_id used, no linux mtd map file */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=voiceblue-0"
+#define MTDPARTS_DEFAULT       "mtdparts=voiceblue-0:128k(uboot),64k(env),64k(renv),-(jffs2)"
+*/
+
 #endif /* __CONFIG_H */