projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[oweals/u-boot.git]
/
include
/
configs
/
p1_p2_rdb_pc.h
diff --git
a/include/configs/p1_p2_rdb_pc.h
b/include/configs/p1_p2_rdb_pc.h
index 4a1e9e9dbc95f86c286a57c1b717cd1498677d33..5a69902f899b96e2bb31416d08d18366a0eb80eb 100644
(file)
--- a/
include/configs/p1_p2_rdb_pc.h
+++ b/
include/configs/p1_p2_rdb_pc.h
@@
-221,7
+221,7
@@
/* IN case of NAND bootloader relocate CCSRBAR in RAMboot code not in the 4k
SPL code*/
/* IN case of NAND bootloader relocate CCSRBAR in RAMboot code not in the 4k
SPL code*/
-#if defined(CONFIG_NAND_
U_BOOT) && defined(CONFIG_NAND_
SPL)
+#if defined(CONFIG_NAND_SPL)
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
#endif
#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
#endif
@@
-841,8
+841,8
@@
* Environment Configuration
*/
#define CONFIG_HOSTNAME unknown
* Environment Configuration
*/
#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 */
/* default location for tftp and bootm */
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
/* default location for tftp and bootm */