* Enabled password check on RMU board

* Fix configuration problem with IceCube in LOWBOOT configuration:
  environment got embedded, corrupting the image layout.

diff --git a/CHANGELOG b/CHANGELOG
index 0da9bfb9af126687f3917cf1eedf154c05ad98c6..9c388230efe45d6e4d9319f0315efae45b781eeb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,13 @@
 Changes since U-Boot 1.0.0:
 ======================================================================
 
+* Enabled password check on RMU board
+
+* Fix configuration problem with IceCube in LOWBOOT configuration:
+  envrionment got embedded, corrupting the image layout.
+
+* Fix NEC display names (it's 6440 [for 640x480], not 6640).
+
 * Added BMS2003 board
   add support for NEC NL6448BC33-54. 10.4", 640x480 TFT display
 

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 59abaef4a45dfbcaf1661343161c837e4fca5dba..f371ba668dbc328709d69f813569b59942a55569 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -206,7 +206,7 @@
 #   define CFG_RAMBOOT         1
 #endif
 
-#define CFG_MONITOR_LEN                (256 << 10)     /* Reserve 256 kB for Monitor   */
+#define CFG_MONITOR_LEN                (192 << 10)     /* Reserve 192 kB for Monitor   */
 #define CFG_MALLOC_LEN         (128 << 10)     /* Reserve 128 kB for malloc()  */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 

diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index c0c4083330fdf7587c22bfaf72575d185852432a..68c35b41b9a7ba0ba9fcbdd7fca9c8ded3a97662 100644 (file)
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -99,6 +99,10 @@
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
+#define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection */
+#define        CONFIG_AUTOBOOT_PROMPT          "\nEnter password - autoboot in %d sec...\n"
+#define        CONFIG_AUTOBOOT_DELAY_STR       "system"
+
 /*
  * Miscellaneous configurable options
  */