Skip to content
Snippets Groups Projects
Commit 8b3637c6 authored by Joe Hershberger's avatar Joe Hershberger Committed by Wolfgang Denk
Browse files

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: 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 4c34b2a0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 21 deletions
common/env_common.c
+ 1
− 1
View file @ 8b3637c6
...@@ -100,7 +100,7 @@ const uchar default_environment[] = { ...@@ -100,7 +100,7 @@ const uchar default_environment[] = {
"preboot=" CONFIG_PREBOOT "\0" "preboot=" CONFIG_PREBOOT "\0"
#endif #endif
#ifdef CONFIG_ROOTPATH #ifdef CONFIG_ROOTPATH
"rootpath=" MK_STR(CONFIG_ROOTPATH) "\0" "rootpath=" CONFIG_ROOTPATH "\0"
#endif #endif
#ifdef CONFIG_GATEWAYIP #ifdef CONFIG_GATEWAYIP
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0" "gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
......
common/env_embedded.c
+ 1
− 1
View file @ 8b3637c6
...@@ -154,7 +154,7 @@ env_t environment __PPCENV__ = { ...@@ -154,7 +154,7 @@ env_t environment __PPCENV__ = {
"autoload=" CONFIG_SYS_AUTOLOAD "\0" "autoload=" CONFIG_SYS_AUTOLOAD "\0"
#endif #endif
#ifdef CONFIG_ROOTPATH #ifdef CONFIG_ROOTPATH
"rootpath=" MK_STR(CONFIG_ROOTPATH) "\0" "rootpath=" CONFIG_ROOTPATH "\0"
#endif #endif
#ifdef CONFIG_GATEWAYIP #ifdef CONFIG_GATEWAYIP
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0" "gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
......
include/configs/DB64360.h
+ 1
− 1
View file @ 8b3637c6
...@@ -201,7 +201,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" ...@@ -201,7 +201,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SERIAL "No. 1" #define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126 #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_TESTDRAMDATA y
......
include/configs/DB64460.h
+ 1
− 1
View file @ 8b3637c6
...@@ -139,7 +139,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0" ...@@ -139,7 +139,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SERIAL "No. 1" #define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126 #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_TESTDRAMDATA y
......
include/configs/MPC8313ERDB.h
+ 1
− 1
View file @ 8b3637c6
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
#define CONFIG_NETDEV eth1 #define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc8313erdb #define CONFIG_HOSTNAME mpc8313erdb
#define CONFIG_ROOTPATH /nfs/root/path #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_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8313erdb.dtb #define CONFIG_FDTFILE mpc8313erdb.dtb
......
include/configs/MPC8323ERDB.h
+ 1
− 1
View file @ 8b3637c6
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
#define CONFIG_NETDEV eth1 #define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc8323erdb #define CONFIG_HOSTNAME mpc8323erdb
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot #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_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
......
include/configs/MPC8349EMDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
#endif #endif
#define CONFIG_HOSTNAME mpc8349emds #define CONFIG_HOSTNAME mpc8349emds
#define CONFIG_ROOTPATH /nfsroot/rootfs #define CONFIG_ROOTPATH "/nfsroot/rootfs"
#define CONFIG_BOOTFILE uImage #define CONFIG_BOOTFILE uImage
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
......
include/configs/MPC8349ITX.h
+ 2
− 2
View file @ 8b3637c6
...@@ -681,7 +681,7 @@ boards, we say we have two, but don't display a message if we find only one. */ ...@@ -681,7 +681,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#endif #endif
/* Default path and filenames */ /* Default path and filenames */
#define CONFIG_ROOTPATH /nfsroot/rootfs #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 */ #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. */ ...@@ -698,7 +698,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_BOOTARGS \ #define CONFIG_BOOTARGS \
"root=/dev/nfs rw" \ "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) ":" \ " ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":" \
MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \ MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \
MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \ MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \
......
include/configs/MPC8360ERDK.h
+ 1
− 1
View file @ 8b3637c6
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
#define CONFIG_HOSTNAME mpc8360erdk #define CONFIG_HOSTNAME mpc8360erdk
#define CONFIG_BOOTFILE uImage #define CONFIG_BOOTFILE uImage
#define CONFIG_ROOTPATH /nfsroot/ #define CONFIG_ROOTPATH "/nfsroot/"
#define CONFIG_BOOTDELAY 2 /* -1 disables auto-boot */ #define CONFIG_BOOTDELAY 2 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */
......
include/configs/MPC837XERDB.h
+ 1
− 1
View file @ 8b3637c6
...@@ -642,7 +642,7 @@ ...@@ -642,7 +642,7 @@
#define CONFIG_NETDEV eth1 #define CONFIG_NETDEV eth1
#define CONFIG_HOSTNAME mpc837x_rdb #define CONFIG_HOSTNAME mpc837x_rdb
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot #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_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
......
include/configs/MPC8536DS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -779,7 +779,7 @@ ...@@ -779,7 +779,7 @@
#define CONFIG_IPADDR 192.168.1.254 #define CONFIG_IPADDR 192.168.1.254
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /opt/nfsroot #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_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
......
include/configs/MPC8540ADS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8541CDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -449,7 +449,7 @@ extern unsigned long get_clock_freq(void); ...@@ -449,7 +449,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8544DS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -467,7 +467,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); ...@@ -467,7 +467,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_IPADDR 192.168.1.251 #define CONFIG_IPADDR 192.168.1.251
#define CONFIG_HOSTNAME 8544ds_unknown #define CONFIG_HOSTNAME 8544ds_unknown
#define CONFIG_ROOTPATH /nfs/mpc85xx #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_UBOOTPATH 8544ds/u-boot.bin /* TFTP server */
......
include/configs/MPC8548CDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -577,7 +577,7 @@ extern unsigned long get_clock_freq(void); ...@@ -577,7 +577,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #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_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
......
include/configs/MPC8555CDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -447,7 +447,7 @@ extern unsigned long get_clock_freq(void); ...@@ -447,7 +447,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8560ADS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8568MDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -470,7 +470,7 @@ extern unsigned long get_clock_freq(void); ...@@ -470,7 +470,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_IPADDR 192.168.1.253 #define CONFIG_IPADDR 192.168.1.253
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8569MDS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -591,7 +591,7 @@ extern unsigned long get_clock_freq(void); ...@@ -591,7 +591,7 @@ extern unsigned long get_clock_freq(void);
* Environment Configuration * Environment Configuration
*/ */
#define CONFIG_HOSTNAME mpc8569mds #define CONFIG_HOSTNAME mpc8569mds
#define CONFIG_ROOTPATH /nfsroot #define CONFIG_ROOTPATH "/nfsroot"
#define CONFIG_BOOTFILE your.uImage #define CONFIG_BOOTFILE your.uImage
#define CONFIG_SERVERIP 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.1
......
include/configs/MPC8572DS.h
+ 1
− 1
View file @ 8b3637c6
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
#define CONFIG_IPADDR 192.168.1.254 #define CONFIG_IPADDR 192.168.1.254
#define CONFIG_HOSTNAME unknown #define CONFIG_HOSTNAME unknown
#define CONFIG_ROOTPATH /opt/nfsroot #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_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment