projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'u-boot-imx/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8641HPCN.h
diff --git
a/include/configs/MPC8641HPCN.h
b/include/configs/MPC8641HPCN.h
index
93b360a
..
7fd8ea8
100644
(file)
--- a/
include/configs/MPC8641HPCN.h
+++ b/
include/configs/MPC8641HPCN.h
@@
-287,9
+287,6
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
/* 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 to kernel
/*
* Pass open firmware flat tree to kernel
@@
-713,8
+710,8
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_IPADDR 192.168.1.100
#define CONFIG_HOSTNAME unknown
#define CONFIG_IPADDR 192.168.1.100
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH
/opt/nfsroot
-#define CONFIG_BOOTFILE
uImage
+#define CONFIG_ROOTPATH
"/opt/nfsroot"
+#define CONFIG_BOOTFILE
"uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_SERVERIP 192.168.1.1