Merge branch 'mpc86xx'

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

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 53dbf82..4e97b01 100644 (file)
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -47,6 +47,8 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
+#define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
+
 /*
  * Physical Memory Map
  */
@@ -94,25 +96,23 @@
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CFG_JFFS_CUSTOM_PART   /* see board/voiceblue/jffs2parts.c */
 #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
+#define PHYS_SDRAM_1_RESERVED  0
 #else
-#define CFG_MALLOC_LEN         (SZ_4M - CFG_GBL_DATA_SIZE)
+#define CFG_MALLOC_LEN         SZ_4M
+#define CONFIG_STACKSIZE       SZ_1M
+#define PHYS_SDRAM_1_RESERVED  (CFG_MONITOR_LEN + CFG_MALLOC_LEN + CONFIG_STACKSIZE)
 #endif
 
 /*
- * The stack size is set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       SZ_8K   /* regular stack */
-
-/*
  * Hardware drivers
  */
 #define CONFIG_DRIVER_SMC91111
@@ -163,20 +163,21 @@
 #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                               \
+       "silent=1\0"                                            \
        "ospart=0\0"                                            \
        "swapos=no\0"                                           \
        "setpart="                                              \
@@ -189,14 +190,36 @@
        "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"                               \
-       "nboot=run nfsargs; bootp; tftp; bootm\0"               \
-       "fboot=run flashargs; fsload /boot/uImage; bootm\0"
+               "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \
+               "nfsroot=$rootpath root=/dev/nfs\0"             \
+       "flashargs=run setpart; setenv bootargs $bootargs "     \
+               "root=/dev/mtdblock$partition ro "              \
+               "rootfstype=jffs2\0"                            \
+       "initrdargs=setenv bootargs $bootargs "                 \
+               "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
+       "fboot=run flashargs; fsload /boot/uImage; bootm\0"     \
+       "iboot=bootp; run initrdargs; tftp; bootm\0"            \
+       "nboot=bootp; run nfsargs; tftp; bootm\0"
+#endif
+
+#ifndef VOICEBLUE_SMALL_FLASH
+#define CONFIG_SILENT_CONSOLE          1       /* enable silent startup */
+
+#if 1  /* feel free to disable for development */
+#define CONFIG_AUTOBOOT_KEYED          /* Enable password protection   */
+#define CONFIG_AUTOBOOT_PROMPT "\nVoiceBlue Enterprise - booting...\n"
+#define CONFIG_AUTOBOOT_DELAY_STR      "."     /* 1st "password"       */
 #endif
 
+/*
+ * JFFS2 partitions (mtdparts command line support)
+ */
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=omapflash.0"
+#define MTDPARTS_DEFAULT       "mtdparts=omapflash.0:128k(uboot),64k(env),64k(r_env),16256k(data1),-(data2)"
+
+#endif /* VOICEBLUE_SMALL_FLASH */
+
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
@@ -216,7 +239,7 @@
 #define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size    */
 
 #define CFG_MEMTEST_START      PHYS_SDRAM_1
-#define CFG_MEMTEST_END                PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE
+#define CFG_MEMTEST_END                PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE - PHYS_SDRAM_1_RESERVED
 
 #undef CFG_CLKS_IN_HZ          /* everything, incl board info, in Hz */