summaryrefslogtreecommitdiff
path: root/include/configs/sc3.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-06-20 08:23:42 +0200
committerStefan Roese <sr@denx.de>2007-06-20 08:23:42 +0200
commit6b44466cdeabd54f9dabcd2f00d3a232a4b854a9 (patch)
tree35e536aa1eb7e781b78fff82da76e16a5e3a00f7 /include/configs/sc3.h
parentb3f9ec86e388207fd03dcdf7b145b9ed080bf024 (diff)
parent5ffa76a032279bc6d3230b703eda32d13305ba13 (diff)
downloadu-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.zip
u-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.tar.gz
u-boot-imx-6b44466cdeabd54f9dabcd2f00d3a232a4b854a9.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/configs/sc3.h')
-rw-r--r--include/configs/sc3.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 6b6acfa..e4357b0 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -58,7 +58,7 @@
* 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB)
*/
-#define CONFIG_SOLIDCARD3 1
+#define CONFIG_SC3 1
#define CONFIG_4xx 1
#define CONFIG_405GP 1
@@ -134,7 +134,8 @@
#if 1 /* feel free to disable for development */
#define CONFIG_AUTOBOOT_KEYED /* Enable password protection */
#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n"
-#define CONFIG_AUTOBOOT_DELAY_STR "\n" /* 1st "password" */
+#define CONFIG_AUTOBOOT_DELAY_STR "\r" /* 1st "password" */
+#define CONFIG_AUTOBOOT_DELAY_STR2 "\n" /* 1st "password" */
#endif
/*