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>
"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"
"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"
#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
#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
#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
#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 */
#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 */
#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 */
#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" \
#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 */
#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 */
#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 */
#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
#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
#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 */
#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 */
#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
#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
#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
* 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
#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 */
#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
#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 */
#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 */
*/
#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 */
#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 */
#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 */
/*
* Environment Configuration
*/
-#define CONFIG_ROOTPATH /opt/nfsroot
+#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin
#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
#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
#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 \
#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 */
#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
#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 */
#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
#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 */
#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 */
# 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
#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 */
#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
/*
* 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 */
#undef CONFIG_SYS_AUTOLOAD
/* rootpath */
-#define CONFIG_ROOTPATH /tftpboot/target
+#define CONFIG_ROOTPATH "/tftpboot/target"
/* gatewayip */
#define CONFIG_GATEWAYIP 192.168.0.1
* Network Settings
*/
#ifndef __ADSPBF534__
-#define CONFIG_ROOTPATH /romfs
+#define CONFIG_ROOTPATH "/romfs"
#define CONFIG_BFIN_MAC 1
#define CONFIG_PHY_ADDR 0
#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
#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
#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
#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
#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
#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
#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" \
#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 */
#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 */
* 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 */
#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 "
#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"
#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 */
#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 */
*/
#define CONFIG_HOSTNAME SBC8560
-#define CONFIG_ROOTPATH /home/ppc
+#define CONFIG_ROOTPATH "/home/ppc"
#define CONFIG_BOOTFILE uImage
#define CONFIG_EXTRA_ENV_SETTINGS \
#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
#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
#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
#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 */
"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"