diff options
| author | Gerald Van Baren <vanbaren@cideas.com> | 2007-04-14 23:02:21 -0400 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2007-04-14 23:02:21 -0400 |
| commit | 6f1d57c567824b7e525ea36f972b662d67382f73 (patch) | |
| tree | 0a6f9aaf0b86e4cbab8cace70e648a61cf6a014b /include | |
| parent | c28abb9c614f65ce2096cc4a66fc886c77d0e5a4 (diff) | |
| parent | 8048cdd56f04a756eeea4951f402bf5cc33785db (diff) | |
| download | u-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.zip u-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.tar.gz u-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into fdt-cmd
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sc3.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 8298084..6b6acfa 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -133,8 +133,8 @@ #if 1 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ -#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with S\n" -#define CONFIG_AUTOBOOT_DELAY_STR "S" /* 1st "password" */ +#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n" +#define CONFIG_AUTOBOOT_DELAY_STR "\n" /* 1st "password" */ #endif /* @@ -416,11 +416,11 @@ extern unsigned long offsetOfEnvironment; #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -/* No command line, one static partition Partition 3 contains jffs2 rootfs */ +/* No command line, one static partition */ #undef CONFIG_JFFS2_CMDLINE #define CONFIG_JFFS2_DEV "nand0" -#define CONFIG_JFFS2_PART_SIZE 0x00400000 -#define CONFIG_JFFS2_PART_OFFSET 0x00c00000 +#define CONFIG_JFFS2_PART_SIZE 0x01000000 +#define CONFIG_JFFS2_PART_OFFSET 0x00000000 /*----------------------------------------------------------------------- * Cache Configuration |