diff --git a/common/env_common.c b/common/env_common.c
index 19149b513dc0eb1a68f3b120c2e11ea23a754dff..596af82d7bfc097cefe01f2ab9f5d90b087e4c77 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -100,7 +100,7 @@ const uchar default_environment[] = {
"preboot=" CONFIG_PREBOOT "\0"
#endif
#ifdef CONFIG_ROOTPATH
- "rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"
+ "rootpath=" CONFIG_ROOTPATH "\0"
#endif
#ifdef CONFIG_GATEWAYIP
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
diff --git a/common/env_embedded.c b/common/env_embedded.c
index e438575d448ba26bdf966a73690edce7025cc4be..9b3018a4844587706bd159c721c5062c23fc3be1 100644
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -154,7 +154,7 @@ env_t environment __PPCENV__ = {
"autoload=" CONFIG_SYS_AUTOLOAD "\0"
#endif
#ifdef CONFIG_ROOTPATH
- "rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"
+ "rootpath=" CONFIG_ROOTPATH "\0"
#endif
#ifdef CONFIG_GATEWAYIP
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index 1f825fd0dccca4d035dee18c8c71c637ab374b8a..c3f3a2415910b0c31824f8363b6f88e2f08daf2a 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -201,7 +201,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126
-#define CONFIG_ROOTPATH /mnt/yellow_dog_mini
+#define CONFIG_ROOTPATH "/mnt/yellow_dog_mini"
#define CONFIG_TESTDRAMDATA y
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 4218774de340da8b4a2979105d6bea5ca6e9aa9f..d48f09277f3467381c371dddbd49101c88929b5e 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -139,7 +139,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126
-#define CONFIG_ROOTPATH /mnt/yellow_dog_mini
+#define CONFIG_ROOTPATH "/mnt/yellow_dog_mini"
#define CONFIG_TESTDRAMDATA y
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 7f52bb196d4fe2bda6fba5119ab314900482aaac..aa7c114057a6a971fe8ffbeb04dc4eac5bfb99f0 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -597,7 +597,7 @@
#define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc8313erdb
-#define CONFIG_ROOTPATH /nfs/root/path
+#define CONFIG_ROOTPATH "/nfs/root/path"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8313erdb.dtb
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index a8657b110bbafa549ad867513b1fc849d5fdf381..5b73137aefc65c47a5f9e0023f813f3beda73a47 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -519,7 +519,7 @@
#define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc8323erdb
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 865d3176a5c6bfebf435c1bfc0c5fb2794d52f4f..0fde1b27cad050c9921c783988c87564095445ae 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -696,7 +696,7 @@
#endif
#define CONFIG_HOSTNAME mpc8349emds
-#define CONFIG_ROOTPATH /nfsroot/rootfs
+#define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 4999004d4a313fcaf67fa3a3d752c3c9fe45a41b..feabe77f6c8f671306f327dcbfb470f3810935b3 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -681,7 +681,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#endif
/* Default path and filenames */
-#define CONFIG_ROOTPATH /nfsroot/rootfs
+#define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
@@ -698,7 +698,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_BOOTARGS \
"root=/dev/nfs rw" \
- " nfsroot=" MK_STR(CONFIG_SERVERIP) ":" MK_STR(CONFIG_ROOTPATH) \
+ " nfsroot=" MK_STR(CONFIG_SERVERIP) ":" CONFIG_ROOTPATH \
" ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":" \
MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \
MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 909e8ab3c604e3f73e3564c6e2950a2fff4dded8..cbe5a49f3902bbf3bb344b8d0afb81f13ce4068f 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -501,7 +501,7 @@
#define CONFIG_HOSTNAME mpc8360erdk
#define CONFIG_BOOTFILE uImage
-#define CONFIG_ROOTPATH /nfsroot/
+#define CONFIG_ROOTPATH "/nfsroot/"
#define CONFIG_BOOTDELAY 2 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d0e4b2c00bd086fb93a0bf101e5356284e372ec7..0163c6a0fa48f5768d39cb68bdb01afe04515b59 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -642,7 +642,7 @@
#define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc837x_rdb
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 4b8cba24b2535ea0b7a2dcdc1c2f9dedf9fda5ae..cda8167f2be0ebe7cc978d7699b9c8b4472480bd 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -779,7 +779,7 @@
#define CONFIG_IPADDR 192.168.1.254
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 301efbefade0a271713a6ff39809786e8f1195cf..85211cf8a77a94d7482c298cb7c59590820f65ec 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -437,7 +437,7 @@
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index b2503a40f76bdfd8a71a5f121b02a6554bf96af6..4664a48399f13400cc95206fa8a9f7baf679a1ee 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -449,7 +449,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 97b55696abdd6863b39d67348f0700cc13e8a714..902731937255eed6cffca5667c71fb26ea2b6150 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -467,7 +467,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_IPADDR 192.168.1.251
#define CONFIG_HOSTNAME 8544ds_unknown
-#define CONFIG_ROOTPATH /nfs/mpc85xx
+#define CONFIG_ROOTPATH "/nfs/mpc85xx"
#define CONFIG_BOOTFILE 8544ds/uImage.uboot
#define CONFIG_UBOOTPATH 8544ds/u-boot.bin /* TFTP server */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 4b5f719926c05fb64cde9fcf171cf8cd07b30f4e..c8fecfba87f981d4066122b569c11416bec1bab1 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -577,7 +577,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE 8548cds/uImage.uboot
#define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index efd42807f62fbab55d353e50ce8419d334b7c207..f0fe4691a1cc309cac951489c3dd633dcd91bfdd 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -447,7 +447,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 84a5bccbc257055c24e04b15f6fe56f5c886ff70..b4b312b2b1addca2b6026e3ee1cfc808ae526da0 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -480,7 +480,7 @@
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 994e7aeded2d3541551a040f67b685df261f186b..65dd0b2f970396563a0eba28693e513a8b0c5107 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -470,7 +470,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index a4734eba65e39db919f5d702cd734ef0d2e4c57a..cfaf47fb09c600e9bb97f34ab20aabdccf0e7e3b 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -591,7 +591,7 @@ extern unsigned long get_clock_freq(void);
* Environment Configuration
*/
#define CONFIG_HOSTNAME mpc8569mds
-#define CONFIG_ROOTPATH /nfsroot
+#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index da20278d7a80e89b000f9e74eafb1ada06e3e57c..547f752929e3c7692dd90cbf7e65339b30ea7013 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -722,7 +722,7 @@
#define CONFIG_IPADDR 192.168.1.254
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index c90b69dd5c4dd0b5f9452271aff8ae073105fb04..aabfb4497a0f504f0df41bdd0deaabc0b90f7847 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -530,7 +530,7 @@
#define CONFIG_IPADDR 192.168.1.100
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH 8610hpcd/u-boot.bin
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 93b360a2ba717bd1c54460bd6b47c84219659a03..1606d6dd9cffd64366eb0aa5157d41d41ccb29a5 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -713,7 +713,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_IPADDR 192.168.1.100
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index ca6178a136023f03cdabf80ebca33eb01fe49df2..27d30c91b037c85b386a1a8256bd5ac980966880 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -719,7 +719,7 @@ extern unsigned long get_sdram_size(void);
#endif
#define CONFIG_HOSTNAME P1010RDB
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 96203708748d5dfa3bff0bf4c966fd3e737b8088..d1512f55b88598dd8220c6fd83275233d17b8bdc 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -482,7 +482,7 @@
*/
#define CONFIG_HOSTNAME p1022ds
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index ba74a150c1d395c833bd8a7dbac2eeaf8b54a89a..765477a63260fa67b5e72447b2bf3d035e84c1f4 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -642,7 +642,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif
#define CONFIG_HOSTNAME P2020RDB
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index 3fa38daaf890d6273d5098ed9cde82c3fb4b38d7..c69e092ee5e0d1711adfcda1357354b2a5a8fa50 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -719,7 +719,7 @@
#define CONFIG_IPADDR 192.168.1.254
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 337e8df27d8b7bbf832387a28eae753380fba131..5c90299054edea2c0639bb9af276d37150f09a86 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -571,7 +571,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Environment Configuration
*/
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin
diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index d562877c9a2a8bbf0f30d3615e88a0eee256948a..dae4577f374941ee309f1f92a1bdedf74b635405 100644
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -76,7 +76,7 @@
#define CONFIG_SERVERIP 10.0.0.201
#define CONFIG_IPADDR 10.0.0.200
-#define CONFIG_ROOTPATH /opt/eldk/ppc_82xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_82xx"
#define CONFIG_NETMASK 255.255.255.0
#undef CONFIG_BOOTARGS
#if 0
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 7b561cbd1493b8692a12f521bcaea0553beea1eb..62c3fda3a4141c46832ebd9f40fb51edc63b5c26 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -472,7 +472,7 @@
#define CONFIG_ETHADDR 00:10:EC:00:37:5B
#define CONFIG_IPADDR 172.16.115.7
#define CONFIG_SERVERIP 172.16.115.6
-#define CONFIG_ROOTPATH /workspace/myfilesystem/target/
+#define CONFIG_ROOTPATH "/workspace/myfilesystem/target/"
#define CONFIG_BOOTFILE uImage.rpxusb
#define CONFIG_HOSTNAME LITE_H1_DW
diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 7dcc14c82080c0dc2ca6eb622d4104775c99e863..0f8084ef704059fd5eddedc13d033b2dd85093ab 100644
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -60,7 +60,7 @@
#define CONFIG_IPADDR 10.0.0.5
#define CONFIG_SERVERIP 10.0.0.2
#define CONFIG_NETMASK 255.0.0.0
-#define CONFIG_ROOTPATH /opt/eldk/ppc_8xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_8xx"
#define CONFIG_BOOTCOMMAND "run flash_self"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 434b96b1d38b52d9ee6b6c43210fe137128c44fc..11d564a5e404f08da4e8ef07f3e8e45f14daf08f 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -425,7 +425,7 @@
#define CONFIG_GATEWAYIP YourGatewayIP
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_HOSTNAME SBC8560
-#define CONFIG_ROOTPATH YourRootPath
+#define CONFIG_ROOTPATH "YourRootPath"
#define CONFIG_BOOTFILE YourImageName
#endif /* __CONFIG_H */
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index e006b55533bf009f55478baba45596e5c1908e9e..30687749abcd42946b8e4c8d58c169c1fa87c533 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -489,7 +489,7 @@
#define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME simpc8313
-#define CONFIG_ROOTPATH /tftpboot/
+#define CONFIG_ROOTPATH "/tftpboot/"
#define CONFIG_BOOTFILE /tftpboot/uImage
#define CONFIG_UBOOTPATH u-boot-nand.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE simpc8313.dtb
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 0619cf780d262defccf179d57e439069042ac41e..33fc5fa6c4a565319bdd2dc1fc40b497f5d9b18f 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -537,7 +537,7 @@
#define CONFIG_HOSTNAME aria
#define CONFIG_BOOTFILE aria/uImage
-#define CONFIG_ROOTPATH /opt/eldk/ppc_6xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_6xx"
#define CONFIG_LOADADDR 400000 /* default load addr */
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 72d0948c1bbf27fb3b3cec4e29f1acd6689bbf6d..e8e26672138c0acb229480dda2412d718342f816 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -72,7 +72,7 @@
#define CONFIG_IPADDR 192.168.233.224
#define CONFIG_GATEWAYIP 192.168.233.1
#define CONFIG_SERVERIP 192.168.233.53
-#define CONFIG_ROOTPATH /romfs/brettl2
+#define CONFIG_ROOTPATH "/romfs/brettl2"
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:e8 */
#endif
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index c6ae4f15060c6ee3566d2288cb9cc886147272c9..ef9d236b1d8be12090c5056c1d5fed9771f11734 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -85,7 +85,7 @@
#endif
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH /romfs
+#define CONFIG_ROOTPATH "/romfs"
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index da3681def2c171a8faec3cfa220ce0c20390a72b..52d5d97abb2723006a9fa8a251cb89f5ecbc54ec 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -85,7 +85,7 @@
#endif
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_ROOTPATH /romfs
+#define CONFIG_ROOTPATH "/romfs"
/* Uncomment next line to use fixed MAC address */
/* #define CONFIG_ETHADDR 02:80:ad:20:31:42 */
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index bae2d761b432d7fba03cfdadc4be395306a11ec0..3fbf5c68e71a1c38f619afd3df495bad042759ce 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -265,7 +265,7 @@
# define CONFIG_SERVERIP 192.168.0.2
# endif
# ifndef CONFIG_ROOTPATH
-# define CONFIG_ROOTPATH /romfs
+# define CONFIG_ROOTPATH "/romfs"
# endif
# ifdef CONFIG_CMD_DHCP
# ifndef CONFIG_SYS_AUTOLOAD
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 63791be3e344bebebab0a99692b5079401ff4832..64fce30584c643abcb245f90f02374f0dccea3af 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -75,7 +75,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
#define CONFIG_HOSTNAME blackstamp
-#define CONFIG_ROOTPATH /checkout/uClinux-dist/romfs
+#define CONFIG_ROOTPATH "/checkout/uClinux-dist/romfs"
#define CONFIG_SYS_AUTOLOAD "no"
/* To remove hardcoding and enable MAC storage in EEPROM */
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index b425b7b6288e212dd407223f60695ff3b6c0b64c..f2dc6aae9d3631fd68e2293967a29ef9e7811f06 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -81,7 +81,7 @@
#define CONFIG_GATEWAYIP 169.254.144.144 /* dedic card */
#define CONFIG_SERVERIP 169.254.144.144 /* tftp server */
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_ROOTPATH /export/uClinux-dist/romfs /*NFS*/
+#define CONFIG_ROOTPATH "/export/uClinux-dist/romfs" /*NFS*/
#define CFG_AUTOLOAD "no"
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_PING
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 007521055067b3f679dae9631ae7d829c924b4c9..3da6d9798d963d434dc5332a11ba4f5b87cd9cca 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -626,7 +626,7 @@
/*
* Environment Configuration
*/
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/debris.h b/include/configs/debris.h
index 60c70ebb2e74077e0a23c07fde9543abc100d821..8473420a07ae454795d4a027d5009d199ba29712 100644
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -81,7 +81,7 @@
#undef CONFIG_SYS_AUTOLOAD
/* rootpath */
-#define CONFIG_ROOTPATH /tftpboot/target
+#define CONFIG_ROOTPATH "/tftpboot/target"
/* gatewayip */
#define CONFIG_GATEWAYIP 192.168.0.1
diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 4ab48c774058c0b7cb96b1c2582e06db1a6b1af5..f2f41028eb899bf642970f20a483de582cc67a4a 100644
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -47,7 +47,7 @@
* Network Settings
*/
#ifndef __ADSPBF534__
-#define CONFIG_ROOTPATH /romfs
+#define CONFIG_ROOTPATH "/romfs"
#define CONFIG_BFIN_MAC 1
#define CONFIG_PHY_ADDR 0
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index a127a2ba39758f123c56ccf5cacee6404d1312b7..0ec4af6aa4d5754089d621d244a59b9fe63ed757 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -135,7 +135,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.20
#define CONFIG_IPADDR 192.168.0.206
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
#define CONFIG_HOSTNAME ax2000
#define CONFIG_BOOTFILE /uImage
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 643efc4f18bd7764e2e7b79f7731b5130f6d8424..9c5f4dfe56baeaecfc39d8fca250ad3b529948b1 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -123,7 +123,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.20
#define CONFIG_IPADDR 192.168.0.207
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
#define CONFIG_HOSTNAME ml401
#define CONFIG_BOOTFILE /uImage
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index e13299e0130fe8d456ee5649fd8cd59237e9eecb..8973955d893c5c33257317238a145b2a5772999c 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -99,7 +99,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.20
#define CONFIG_IPADDR 192.168.0.206
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
#define CONFIG_HOSTNAME grxc3s1500
#define CONFIG_BOOTFILE /uImage
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f868d965cfa40f5aa1e05dd86d6b28de02e43b79..df2b50019edfedcedfd31390567e8240988014c3 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -121,7 +121,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.81
#define CONFIG_IPADDR 192.168.0.80
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
#define CONFIG_HOSTNAME grxc3s1500
#define CONFIG_BOOTFILE /uImage
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index ed1008f9fcf12f92d76c26b49032c5bba6b67fb9..94b270e08d4e99fe1cf8abf5ecab5293a3952977 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -118,7 +118,7 @@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.81
#define CONFIG_IPADDR 192.168.0.80
-#define CONFIG_ROOTPATH /export/rootfs
+#define CONFIG_ROOTPATH "/export/rootfs"
#define CONFIG_HOSTNAME grxc3s1500
#define CONFIG_BOOTFILE /uImage
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 4bc36b99f2375f51307697ab53b903cf75280333..3fe8f701fdc81f581b543aeaa87138db2277e5df 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -52,7 +52,7 @@
#define CONFIG_ETHPRIME
#define CONFIG_IPADDR 192.168.30.1
#define CONFIG_SERVERIP 192.168.1.1
-#define CONFIG_ROOTPATH
+#define CONFIG_ROOTPATH ""
#define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.0.0
#define CONFIG_HOSTNAME idmr
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index b19d54481f92e14fa40189cbcdad57f4ab0f7d4a..0d9dbefda1016b938b4ee7a8d500992f6cb77082 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -135,7 +135,7 @@
#define CONFIG_NETMASK 255.255.255.0
#define HOSTNAME inka4x0
#define CONFIG_BOOTFILE /tftpboot/inka4x0/uImage
-#define CONFIG_ROOTPATH /opt/eldk/ppc_6xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_6xx"
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 19ef2544a0cb2f7694e4d5de2c358fcc9894d549..c0bed27727e0e2062cae26128edf47bf89af8a42 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -373,7 +373,7 @@
#define CONFIG_HOSTNAME mecp512x
#define CONFIG_BOOTFILE /tftpboot/mecp512x/uImage
-#define CONFIG_ROOTPATH /tftpboot/mecp512x/target_root
+#define CONFIG_ROOTPATH "/tftpboot/mecp512x/target_root"
#define CONFIG_LOADADDR 400000 /* def. location for tftp and bootm */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 4288894726cc3921435dfa85a2597973ce324a42..e284a0f7c9524021ecb0a95fab0eaa32626ee0a2 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -526,7 +526,7 @@
#define CONFIG_HOSTNAME mpc5121ads
#define CONFIG_BOOTFILE mpc5121ads/uImage
-#define CONFIG_ROOTPATH /opt/eldk/ppc_6xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_6xx"
#define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 4a1e9e9dbc95f86c286a57c1b717cd1498677d33..c51cbffa5435752717305ac585456ca4c37a585f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -841,7 +841,7 @@
* Environment Configuration
*/
#define CONFIG_HOSTNAME unknown
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 57a0416899f70c2945d8bf0858c99120d4a59f22..1f7543c1336a0b9b1be1f6bde3a3c72c16490438 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -352,7 +352,7 @@
#define CONFIG_SYS_JFFS2_FIRST_SECTOR 11
#define CONFIG_BOOTCOMMAND "run flashboot"
-#define CONFIG_ROOTPATH /ronetix/rootfs
+#define CONFIG_ROOTPATH "/ronetix/rootfs"
#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
#define CONFIG_CON_ROT "fbcon=rotate:3 "
diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index 3ff80d2868e7e34a934ccf0c922d1203531c58fb..dcfa29af1cc5a5d58f4d36e8dd534cfecd0c97a9 100644
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -59,7 +59,7 @@
#define CONFIG_SERVERIP 10.10.69.49
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_HOSTNAME QUANTUM
-#define CONFIG_ROOTPATH /opt/eldk/pcc_8xx
+#define CONFIG_ROOTPATH "/opt/eldk/pcc_8xx"
#define CONFIG_BOOTARGS "root=/dev/ram rw"
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index fae95d7a5a49751ad7f259ca717ec8e912afd27c..c87370aca86ca55cdee0fde670cd9e24f1da0dde 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -610,7 +610,7 @@
#endif
#define CONFIG_HOSTNAME SBC8349
-#define CONFIG_ROOTPATH /tftpboot/rootfs
+#define CONFIG_ROOTPATH "/tftpboot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 171058cf22cb00ffde0ff5c5b8b1e43417e17da1..163ead938d35c1abd950bf1b476fabc86fe6bd71 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -527,7 +527,7 @@
#define CONFIG_IPADDR 192.168.0.55
#define CONFIG_HOSTNAME sbc8548
-#define CONFIG_ROOTPATH /opt/eldk/ppc_85xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_85xx"
#define CONFIG_BOOTFILE /uImage
#define CONFIG_UBOOTPATH /u-boot.bin /* TFTP server */
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index f928622f27e6afdaf5ac76b89e5e2aea52cb2a1c..9237bcb204b7633b169f2f4ac6d5925963ab5232 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -428,7 +428,7 @@
*/
#define CONFIG_HOSTNAME SBC8560
-#define CONFIG_ROOTPATH /home/ppc
+#define CONFIG_ROOTPATH "/home/ppc"
#define CONFIG_BOOTFILE uImage
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 61551ece4753dce4fb0fd388f43e1da84a65bd5b..70763e715abb9b3a99fa48601dc23963e23fae03 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -565,7 +565,7 @@
#define CONFIG_IPADDR 192.168.0.50
#define CONFIG_HOSTNAME sbc8641d
-#define CONFIG_ROOTPATH /opt/eldk/ppc_74xx
+#define CONFIG_ROOTPATH "/opt/eldk/ppc_74xx"
#define CONFIG_BOOTFILE uImage
#define CONFIG_SERVERIP 192.168.0.2
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 6f611be9001a456eb9e5981fd0070d9b90244422..8e46c52a539a112a75431d8b1dbb381b7fc71cb0 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -377,7 +377,7 @@
#define CONFIG_GATEWAYIP 192.168.85.1
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_HOSTNAME STX_GP3
-#define CONFIG_ROOTPATH /gppproot
+#define CONFIG_ROOTPATH "/gppproot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 0x1000000
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 50a615fc7a13af93aca2b86e34a8033307b936fc..18a673e7744d9ca04b66f497db9ac6932ee774fd 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -426,7 +426,7 @@
#define CONFIG_GATEWAYIP 192.168.85.1
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_HOSTNAME STX_SSA
-#define CONFIG_ROOTPATH /gppproot
+#define CONFIG_ROOTPATH "/gppproot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 0x1000000
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index fe2bc1d9228e8d38cfbe9d26921805692abec099..4129bb4e52b43cbf5ad0171c63cc13413a9e2924 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -545,7 +545,7 @@
#endif
#define CONFIG_HOSTNAME VME8349
-#define CONFIG_ROOTPATH /tftpboot/rootfs
+#define CONFIG_ROOTPATH "/tftpboot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 800000 /* def location for tftp and bootm */
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index cd0cc31ad795b60fe62fafdcfd07f68d9a65fa9a..f66bd3dbf5bd8a459b3b090c6295c45c561940de 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -175,7 +175,7 @@ static char default_environment[] = {
"autoload=" CONFIG_SYS_AUTOLOAD "\0"
#endif
#ifdef CONFIG_ROOTPATH
- "rootpath=" MK_STR (CONFIG_ROOTPATH) "\0"
+ "rootpath=" CONFIG_ROOTPATH "\0"
#endif
#ifdef CONFIG_GATEWAYIP
"gatewayip=" MK_STR (CONFIG_GATEWAYIP) "\0"