Commit b3f44c21 authored by Joe Hershberger's avatar Joe Hershberger Committed by Wolfgang Denk
Browse files

common: cosmetic: CONFIG_BOOTFILE checkpatch compliance



Remove MK_STR from places that consume CONFIG_BOOTFILE to force all definitions to be string literals.
Signed-off-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 8b3637c6
......@@ -112,7 +112,7 @@ const uchar default_environment[] = {
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
#endif
#ifdef CONFIG_BOOTFILE
"bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
"bootfile=" CONFIG_BOOTFILE "\0"
#endif
#ifdef CONFIG_LOADADDR
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
......
......@@ -166,7 +166,7 @@ env_t environment __PPCENV__ = {
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
#endif
#ifdef CONFIG_BOOTFILE
"bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
"bootfile=" CONFIG_BOOTFILE "\0"
#endif
#ifdef CONFIG_LOADADDR
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
......
......@@ -169,7 +169,7 @@ All of these can be obtained from the bootp server if not set.
#define CONFIG_IPADDR 10.0.0.2 (replace with your value)
#define CONFIG_SERVERIP 10.0.0.1 (replace with your value)
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
The 'usb start' command should identify the adapter something like this:
......
......@@ -598,7 +598,7 @@
#define CONFIG_HOSTNAME mpc8313erdb
#define CONFIG_ROOTPATH "/nfs/root/path"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8313erdb.dtb
......
......@@ -521,7 +521,7 @@
#define CONFIG_HOSTNAME mpc8323erdb
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc832x_rdb.dtb
......
......@@ -697,7 +697,7 @@
#define CONFIG_HOSTNAME mpc8349emds
#define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
......
......@@ -682,7 +682,7 @@ boards, we say we have two, but don't display a message if we find only one. */
/* Default path and filenames */
#define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#ifdef CONFIG_MPC8349ITX
......
......@@ -499,7 +499,7 @@
#define CONFIG_LOADADDR a00000
#define CONFIG_HOSTNAME mpc8360erdk
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_ROOTPATH "/nfsroot/"
......
......@@ -644,7 +644,7 @@
#define CONFIG_HOSTNAME mpc837x_rdb
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8379_rdb.dtb
......
......@@ -780,7 +780,7 @@
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_SERVERIP 192.168.1.1
......
......@@ -438,7 +438,7 @@
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -450,7 +450,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -468,7 +468,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_HOSTNAME 8544ds_unknown
#define CONFIG_ROOTPATH "/nfs/mpc85xx"
#define CONFIG_BOOTFILE 8544ds/uImage.uboot
#define CONFIG_BOOTFILE "8544ds/uImage.uboot"
#define CONFIG_UBOOTPATH 8544ds/u-boot.bin /* TFTP server */
#define CONFIG_SERVERIP 192.168.1.1
......
......@@ -578,7 +578,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE 8548cds/uImage.uboot
#define CONFIG_BOOTFILE "8548cds/uImage.uboot"
#define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
#define CONFIG_SERVERIP 192.168.1.1
......
......@@ -448,7 +448,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -481,7 +481,7 @@
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -471,7 +471,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -592,7 +592,7 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_HOSTNAME mpc8569mds
#define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage
#define CONFIG_BOOTFILE "your.uImage"
#define CONFIG_SERVERIP 192.168.1.1
#define CONFIG_GATEWAYIP 192.168.1.1
......
......@@ -723,7 +723,7 @@
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_SERVERIP 192.168.1.1
......
......@@ -531,7 +531,7 @@
#define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE uImage
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH 8610hpcd/u-boot.bin
#define CONFIG_SERVERIP 192.168.1.1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment