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

[u-boot] / include / configs / MPC8544DS.h

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 902731937255eed6cffca5667c71fb26ea2b6150..7410050f7be51b95f6c0373ba7d81463560389c4 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -224,9 +224,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT               1
@@ -468,7 +465,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_HOSTNAME        8544ds_unknown
 #define CONFIG_ROOTPATH        "/nfs/mpc85xx"
-#define CONFIG_BOOTFILE        8544ds/uImage.uboot
+#define CONFIG_BOOTFILE        "8544ds/uImage.uboot"
 #define CONFIG_UBOOTPATH       8544ds/u-boot.bin       /* TFTP server */
 
 #define CONFIG_SERVERIP        192.168.1.1