common: cosmetic: CONFIG_ROOTPATH checkpatch compliance

Remove MK_STR from places that consume CONFIG_ROOTPATH to force all definitions to be string literals.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/common/env_common.c b/common/env_common.c
index 19149b5..596af82 100644 (file)
--- 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 e438575..9b3018a 100644 (file)
--- 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 1f825fd..c3f3a24 100644 (file)
--- 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 4218774..d48f092 100644 (file)
--- 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 7f52bb1..aa7c114 100644 (file)
--- 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 a8657b1..5b73137 100644 (file)
--- 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 865d317..0fde1b2 100644 (file)
--- 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 4999004..feabe77 100644 (file)
--- 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 909e8ab..cbe5a49 100644 (file)
--- 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 d0e4b2c..0163c6a 100644 (file)
--- 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 4b8cba2..cda8167 100644 (file)
--- 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 301efbe..85211cf 100644 (file)
--- 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 b2503a4..4664a48 100644 (file)
--- 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 97b5569..9027319 100644 (file)
--- 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 4b5f719..c8fecfb 100644 (file)
--- 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 efd4280..f0fe469 100644 (file)
--- 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 84a5bcc..b4b312b 100644 (file)
--- 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 994e7ae..65dd0b2 100644 (file)
--- 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 a4734eb..cfaf47f 100644 (file)
--- 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 da20278..547f752 100644 (file)
--- 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 c90b69d..aabfb44 100644 (file)
--- 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 93b360a..1606d6d 100644 (file)
--- 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 ca6178a..27d30c9 100644 (file)
--- 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 9620370..d1512f5 100644 (file)
--- 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 ba74a15..765477a 100644 (file)
--- 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 3fa38da..c69e092 100644 (file)
--- 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 337e8df..5c90299 100644 (file)
--- 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 d562877..dae4577 100644 (file)
--- 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 7b561cb..62c3fda 100644 (file)
--- 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 7dcc14c..0f8084e 100644 (file)
--- 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 434b96b..11d564a 100644 (file)
--- 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 e006b55..3068774 100644 (file)
--- 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 0619cf7..33fc5fa 100644 (file)
--- 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 72d0948..e8e2667 100644 (file)
--- 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 c6ae4f1..ef9d236 100644 (file)
--- 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 da3681d..52d5d97 100644 (file)
--- 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 bae2d76..3fbf5c6 100644 (file)
--- 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 63791be..64fce30 100644 (file)
--- 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 b425b7b..f2dc6aa 100644 (file)
--- 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 0075210..3da6d97 100644 (file)
--- 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 60c70eb..8473420 100644 (file)
--- 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 4ab48c7..f2f4102 100644 (file)
--- 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 a127a2b..0ec4af6 100644 (file)
--- 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 643efc4..9c5f4df 100644 (file)
--- 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 e13299e..8973955 100644 (file)
--- 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 f868d96..df2b500 100644 (file)
--- 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 ed1008f..94b270e 100644 (file)
--- 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 4bc36b9..3fe8f70 100644 (file)
--- 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 b19d544..0d9dbef 100644 (file)
--- 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 19ef254..c0bed27 100644 (file)
--- 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 4288894..e284a0f 100644 (file)
--- 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 4a1e9e9..c51cbff 100644 (file)
--- 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 57a0416..1f7543c 100644 (file)
--- 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 3ff80d2..dcfa29a 100644 (file)
--- 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 fae95d7..c87370a 100644 (file)
--- 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 171058c..163ead9 100644 (file)
--- 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 f928622..9237bcb 100644 (file)
--- 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 61551ec..70763e7 100644 (file)
--- 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 6f611be..8e46c52 100644 (file)
--- 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 50a615f..18a673e 100644 (file)
--- 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 fe2bc1d..4129bb4 100644 (file)
--- 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 cd0cc31..f66bd3d 100644 (file)
--- 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"