summaryrefslogtreecommitdiff
path: root/include/configs/omap2420h4.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-01-12 23:47:03 +0100
committerWolfgang Denk <wd@denx.de>2010-01-12 23:47:03 +0100
commit2ff6922280025c1315c53fa2eb4ab33f0c9591de (patch)
tree8061843b797eac0669f51b3b14d361bdae1dbe3b /include/configs/omap2420h4.h
parentf8b365ceb64e0b86bea243d783ff94687302cba9 (diff)
parent06f95959bc5421e516a9a25012e303dea8833385 (diff)
downloadu-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.zip
u-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.tar.gz
u-boot-imx-2ff6922280025c1315c53fa2eb4ab33f0c9591de.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/omap2420h4.h')
-rw-r--r--include/configs/omap2420h4.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 6ab4438..47437b0 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -164,14 +164,12 @@
/*
* Miscellaneous configurable options
*/
+#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_APTIX
-#define V_PROMPT "OMAP2420 Aptix # "
+# define CONFIG_SYS_PROMPT "OMAP2420 Aptix # "
#else
-#define V_PROMPT "OMAP242x H4 # "
+# define CONFIG_SYS_PROMPT "OMAP242x H4 # "
#endif
-
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)