diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:05:38 +0200 |
| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /include/configs/m501sk.h | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
| download | u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz u-boot-imx-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2 | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/m501sk.h')
| -rw-r--r-- | include/configs/m501sk.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h index 095fdaf..e4be1ed 100644 --- a/include/configs/m501sk.h +++ b/include/configs/m501sk.h @@ -40,7 +40,6 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#undef CONFIG_AUTOBOOT_PROMPT #define CONFIG_MENUPROMPT "." /* @@ -105,7 +104,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "unlock=yes\0" -#define CFG_CMD_JFFS2 +#define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_EEPROM #define CONFIG_CMD_NET #define CONFIG_CMD_RUN |