Merge branch 'master' of git://git.denx.de/u-boot-nios

[oweals/u-boot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 4ab8ca399199a304c9a773bd079b24f0b5ffa01e..b486c7753c8e699aca2690ae64d123d2e7c19a8d 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -288,7 +288,7 @@
 #define        CONFIG_SYS_USR_EXCEP    /* user exception */
 #define CONFIG_SYS_HZ  1000
 
-#define        CONFIG_PREBOOT          "echo U-BOOT for $(hostname);setenv preboot;echo"
+#define        CONFIG_PREBOOT  "echo U-BOOT for ${hostname};setenv preboot;echo"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS       "unlock=yes\0" /* hardware flash protection */\
                                        "nor0=ml401-0\0"\
@@ -298,4 +298,10 @@
 
 #define CONFIG_CMDLINE_EDITING
 
+/* Use the HUSH parser */
+#define CONFIG_SYS_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
+#endif
+
 #endif /* __CONFIG_H */