Merge with /home/hs/U-Boot/u-boot-dev

diff --git a/CHANGELOG b/CHANGELOG
index 8c3f13e..1604376 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,16 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* VoiceBlue update: use new MTD flash partitioning methods, use more
+  reasonable TEXT_BASE, update default environment and enable keyed
+  autoboot.
+  Patch by Ladislav Michl, 16. Aug 2005 
+
+* Add forgotten changes for the PLEB 2 Board.
+  Patch by David Snowdon, 13. Aug 2005
+
 * Add support for wrPPMC7xx/74xx boards
-  Patch from Richard Danter, 12 Aug 2005
+  Patch by Richard Danter, 12 Aug 2005
  
 * Add support for gth2 board
   Patch by Thomas Lange, Aug 11 2005

diff --git a/MAKEALL b/MAKEALL
index 1b63767..804ea12 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -204,9 +204,9 @@ LIST_ARM11="        \
 
 LIST_pxa="     \
        adsvix          cerf250         cradle          csb226          \
-       delta           innokom         lubbock         pxa255_idp      \
-       wepep250        xaeniax         xm250           xsengine        \
-       zylonite                                                        \
+       delta           innokom         lubbock         pleb2           \
+       pxa255_idp      wepep250        xaeniax         xm250           \
+       xsengine        zylonite                                        \
 "
 
 LIST_ixp="ixdp425      ixdpg425        pdnb3"

diff --git a/Makefile b/Makefile
index e282b1f..0b00819 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1717,6 +1717,9 @@ ixdpg425_config   :       unconfig
 lubbock_config :       unconfig
        @./mkconfig $(@:_config=) arm pxa lubbock
 
+pleb2_config   :       unconfig
+       @./mkconfig $(@:_config=) arm pxa pleb2
+
 logodl_config  :       unconfig
        @./mkconfig $(@:_config=) arm pxa logodl
 

diff --git a/README b/README
index a3dadd4..5ed30f2 100644 (file)
--- a/README
+++ b/README
@@ -310,8 +310,9 @@ The following options need to be configured:
                CONFIG_IMPA7,       CONFIG_INNOVATOROMAP1510,   CONFIG_INNOVATOROMAP1610,
                CONFIG_KB9202,          CONFIG_LART,            CONFIG_LPD7A400,
                CONFIG_LUBBOCK,         CONFIG_OSK_OMAP5912,    CONFIG_OMAP2420H4,
-               CONFIG_SHANNON,         CONFIG_P2_OMAP730,      CONFIG_SMDK2400,
-               CONFIG_SMDK2410,        CONFIG_TRAB,            CONFIG_VCMA9
+               CONFIG_PLEB2,           CONFIG_SHANNON,         CONFIG_P2_OMAP730,
+               CONFIG_SMDK2400,        CONFIG_SMDK2410,        CONFIG_TRAB,
+               CONFIG_VCMA9
 
                MicroBlaze based boards:
                ------------------------

diff --git a/board/voiceblue/config.mk b/board/voiceblue/config.mk
index c73cd27..b77c91c 100644 (file)
--- a/board/voiceblue/config.mk
+++ b/board/voiceblue/config.mk
@@ -12,5 +12,5 @@ ifeq ($(VOICEBLUE_SMALL_FLASH),y)
 TEXT_BASE = 0x20012000
 else
 # Running in SDRAM...
-TEXT_BASE = 0x13000000
+TEXT_BASE = 0x13FD0000
 endif

diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index c5ee78f..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,7 +96,6 @@
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CFG_JFFS_CUSTOM_PART   /* see board/voiceblue/jffs2parts.c */
 #endif
 
 /*
@@ -104,9 +105,11 @@
 #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
 #define CONFIG_STACKSIZE       SZ_1M
+#define PHYS_SDRAM_1_RESERVED  (CFG_MONITOR_LEN + CFG_MALLOC_LEN + CONFIG_STACKSIZE)
 #endif
 
 /*
@@ -174,6 +177,7 @@
 #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="                                              \
@@ -185,15 +189,37 @@
        "fi\0"                                                  \
        "setup=setenv bootargs console=ttyS0,$baudrate "        \
                "mtdparts=$mtdparts\0"                          \
-       "nfsargs=run setpart; setenv bootargs $bootargs "       \
-               "root=/dev/nfs ip=dhcp\0"                       \
+       "nfsargs=setenv bootargs $bootargs "                    \
+               "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"                            \
-       "nboot=run nfsargs; bootp; tftp; bootm\0"               \
-       "fboot=run flashargs; fsload /boot/uImage; bootm\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>
 
@@ -213,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 */
 
@@ -247,22 +273,4 @@
 
 #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 */