Przeglądaj źródła

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>
Joe Hershberger 13 lat temu
rodzic
commit
8b3637c662
62 zmienionych plików z 63 dodań i 63 usunięć
  1. 1 1
      common/env_common.c
  2. 1 1
      common/env_embedded.c
  3. 1 1
      include/configs/DB64360.h
  4. 1 1
      include/configs/DB64460.h
  5. 1 1
      include/configs/MPC8313ERDB.h
  6. 1 1
      include/configs/MPC8323ERDB.h
  7. 1 1
      include/configs/MPC8349EMDS.h
  8. 2 2
      include/configs/MPC8349ITX.h
  9. 1 1
      include/configs/MPC8360ERDK.h
  10. 1 1
      include/configs/MPC837XERDB.h
  11. 1 1
      include/configs/MPC8536DS.h
  12. 1 1
      include/configs/MPC8540ADS.h
  13. 1 1
      include/configs/MPC8541CDS.h
  14. 1 1
      include/configs/MPC8544DS.h
  15. 1 1
      include/configs/MPC8548CDS.h
  16. 1 1
      include/configs/MPC8555CDS.h
  17. 1 1
      include/configs/MPC8560ADS.h
  18. 1 1
      include/configs/MPC8568MDS.h
  19. 1 1
      include/configs/MPC8569MDS.h
  20. 1 1
      include/configs/MPC8572DS.h
  21. 1 1
      include/configs/MPC8610HPCD.h
  22. 1 1
      include/configs/MPC8641HPCN.h
  23. 1 1
      include/configs/P1010RDB.h
  24. 1 1
      include/configs/P1022DS.h
  25. 1 1
      include/configs/P1_P2_RDB.h
  26. 1 1
      include/configs/P2020DS.h
  27. 1 1
      include/configs/P2041RDB.h
  28. 1 1
      include/configs/PN62.h
  29. 1 1
      include/configs/RPXlite_DW.h
  30. 1 1
      include/configs/RRvision.h
  31. 1 1
      include/configs/SBC8540.h
  32. 1 1
      include/configs/SIMPC8313.h
  33. 1 1
      include/configs/aria.h
  34. 1 1
      include/configs/bct-brettl2.h
  35. 1 1
      include/configs/bf537-minotaur.h
  36. 1 1
      include/configs/bf537-srv1.h
  37. 1 1
      include/configs/bfin_adi_common.h
  38. 1 1
      include/configs/blackstamp.h
  39. 1 1
      include/configs/blackvme.h
  40. 1 1
      include/configs/corenet_ds.h
  41. 1 1
      include/configs/debris.h
  42. 1 1
      include/configs/dnp5370.h
  43. 1 1
      include/configs/gr_cpci_ax2000.h
  44. 1 1
      include/configs/gr_ep2s60.h
  45. 1 1
      include/configs/gr_xc3s_1500.h
  46. 1 1
      include/configs/grsim.h
  47. 1 1
      include/configs/grsim_leon2.h
  48. 1 1
      include/configs/idmr.h
  49. 1 1
      include/configs/inka4x0.h
  50. 1 1
      include/configs/mecp5123.h
  51. 1 1
      include/configs/mpc5121ads.h
  52. 1 1
      include/configs/p1_p2_rdb_pc.h
  53. 1 1
      include/configs/pm9263.h
  54. 1 1
      include/configs/quantum.h
  55. 1 1
      include/configs/sbc8349.h
  56. 1 1
      include/configs/sbc8548.h
  57. 1 1
      include/configs/sbc8560.h
  58. 1 1
      include/configs/sbc8641d.h
  59. 1 1
      include/configs/stxgp3.h
  60. 1 1
      include/configs/stxssa.h
  61. 1 1
      include/configs/vme8349.h
  62. 1 1
      tools/env/fw_env.c

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 2 - 2
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" \

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 */
 

+ 1 - 1
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
 

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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
 

+ 1 - 1
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					\

+ 1 - 1
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 */

+ 1 - 1
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

+ 1 - 1
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 */
 

+ 1 - 1
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

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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

+ 1 - 1
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  */

+ 1 - 1
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

+ 1 - 1
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 */
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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"							\

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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 */
 

+ 1 - 1
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 "

+ 1 - 1
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"
 

+ 1 - 1
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 */

+ 1 - 1
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 */
 

+ 1 - 1
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		\

+ 1 - 1
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

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 1 - 1
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 */

+ 1 - 1
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"