summaryrefslogtreecommitdiff
path: root/include/configs/MERGERBOX.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-06-19 15:54:35 -0700
committerWolfgang Denk <wd@denx.de>2012-06-20 20:36:51 +0200
commit219f4788d33b04e394d4ade1feaedc0292acc790 (patch)
treef3829771b07673cb0571fc9a02aba66689d8249b /include/configs/MERGERBOX.h
parent26750c8aee2383a026e0cf89e9310628d3a5a6a0 (diff)
hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c
Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value different than "> " which is vision2. I have Cc'd the maintainer here as I strongly suspect this is a bug rather than intentional behavior. Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/MERGERBOX.h')
-rw-r--r--include/configs/MERGERBOX.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index 81769164ec4..077e0d0f96f 100644
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -216,7 +216,6 @@
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
/* Pass open firmware flat tree */
#define CONFIG_OF_LIBFDT 1