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: 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 596af82d7bfc097cefe01f2ab9f5d90b087e4c77..c7e9bea04b299f9e17fe991889cb9219db27ae4a 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -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"

diff --git a/common/env_embedded.c b/common/env_embedded.c
index 9b3018a4844587706bd159c721c5062c23fc3be1..6ce1307767a90ae0ef77f9330435d713bdd0e0c5 100644 (file)
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -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"

diff --git a/doc/README.usb b/doc/README.usb
index c4df9cd0512d203988cd33d27a9248301d9c67a8..ef1d6ba36608f596c3c4a0d7643331d7fa767687 100644 (file)
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -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:

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index aa7c114057a6a971fe8ffbeb04dc4eac5bfb99f0..d8e384abe4f75c065e852583518235d5cc697280 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -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
 

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 5b73137aefc65c47a5f9e0023f813f3beda73a47..5cc916020da5c15258cb2fb39d8e07c1236530d6 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -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
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 0fde1b27cad050c9921c783988c87564095445ae..541d2f446a8020bfed8ecf0063578025a5f18a6b 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -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 */
 

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index feabe77f6c8f671306f327dcbfb470f3810935b3..c57facfecf45026f4a2325e8dedd1d22f94391b1 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -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

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index cbe5a49f3902bbf3bb344b8d0afb81f13ce4068f..705f57a4a5fb06639e388d80bf947c96ab4c1e46 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -499,7 +499,7 @@
 
 #define CONFIG_LOADADDR        a00000
 #define CONFIG_HOSTNAME        mpc8360erdk
-#define CONFIG_BOOTFILE        uImage
+#define CONFIG_BOOTFILE        "uImage"
 
 #define CONFIG_ROOTPATH                "/nfsroot/"
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 0163c6a0fa48f5768d39cb68bdb01afe04515b59..a26a5bbe73685a8087383e54187bd2cfb6b9c4f6 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -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
 

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index cda8167f2be0ebe7cc978d7699b9c8b4472480bd..d4e3ef5c2c0e2399782531688664eaa0b89fc927 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -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

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 85211cf8a77a94d7482c298cb7c59590820f65ec..ae94a4a276b57eb1c072a32aee569bb5cf39ff09 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -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

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 4664a48399f13400cc95206fa8a9f7baf679a1ee..bd10ddaed12aa2693c1447d4d714c1da74abfd88 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -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

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 902731937255eed6cffca5667c71fb26ea2b6150..71d89708f1e2b8ad895214822dee6a9b6ec19523 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -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

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index c8fecfba87f981d4066122b569c11416bec1bab1..a99f8d592a4fec3d36d45e0b393bb56a6121d0fd 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -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

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index f0fe4691a1cc309cac951489c3dd633dcd91bfdd..ea460e6dcb2b9342c122f1c3202d04a815184967 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -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

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index b4b312b2b1addca2b6026e3ee1cfc808ae526da0..ebe6a70fa81b0add58d4a1a91320cb9b58ded41b 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -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

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 65dd0b2f970396563a0eba28693e513a8b0c5107..f9c8dfbc248f79fabaa89e22f3e595f8c06c83ff 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -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

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index cfaf47fb09c600e9bb97f34ab20aabdccf0e7e3b..19d32718fab2d64761f64418288e5aee6b7d32c5 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -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

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 547f752929e3c7692dd90cbf7e65339b30ea7013..ffee8fc8b0163e23f1081e5fb286d143f3897b0f 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -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

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index aabfb4497a0f504f0df41bdd0deaabc0b90f7847..8fe72dca4453290f3f8b13ab6debdf638278c383 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -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

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 1606d6dd9cffd64366eb0aa5157d41d41ccb29a5..61d6d5c101fa2899a657835b3d91fec1d9316b12 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -714,7 +714,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #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

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 27d30c91b037c85b386a1a8256bd5ac980966880..af4609f841393a407287885232811108f239e24e 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -720,7 +720,7 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_HOSTNAME                P1010RDB
 #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 */
 
 /* default location for tftp and bootm */

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index d1512f55b88598dd8220c6fd83275233d17b8bdc..00770609845ce0de55d5f14ae8b4f5d2cdfa49bb 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -483,7 +483,7 @@
 
 #define CONFIG_HOSTNAME                p1022ds
 #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_LOADADDR                1000000

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index e9069222dc784a124009d7f7e58212f1afdff90c..013a6acdca2c51bcbc9962ad6d844ee00582e52d 100644 (file)
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -495,7 +495,7 @@ extern unsigned long get_clock_freq(void);
 /*
  * Environment Configuration
  */
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       (u-boot.bin) /* U-Boot image on TFTP server */
 
 /* default location for tftp and bootm */

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 765477a63260fa67b5e72447b2bf3d035e84c1f4..883d44e37105d2eabd596a8bb7ed821c63895134 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -643,7 +643,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_HOSTNAME                P2020RDB
 #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 */
 
 /* default location for tftp and bootm */

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index c69e092ee5e0d1711adfcda1357354b2a5a8fa50..2d9657a15347d5c038bc38ebf80a8cea2ead245b 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -720,7 +720,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

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 5c90299054edea2c0639bb9af276d37150f09a86..6d45bb1e8d8ef2460694c192484e91e513a9a584 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -572,7 +572,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * Environment Configuration
  */
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin
 
 /* default location for tftp and bootm */

diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 62c3fda3a4141c46832ebd9f40fb51edc63b5c26..efc59fea6f4eae72ce520ad8b304248275651d03 100644 (file)
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -473,7 +473,7 @@
 #define CONFIG_IPADDR  172.16.115.7
 #define CONFIG_SERVERIP 172.16.115.6
 #define CONFIG_ROOTPATH "/workspace/myfilesystem/target/"
-#define CONFIG_BOOTFILE uImage.rpxusb
+#define CONFIG_BOOTFILE "uImage.rpxusb"
 #define CONFIG_HOSTNAME LITE_H1_DW
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 11d564a5e404f08da4e8ef07f3e8e45f14daf08f..f1d30ba89929ef5661302b31a643d28502d15cba 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -426,6 +426,6 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_HOSTNAME                SBC8560
 #define CONFIG_ROOTPATH                "YourRootPath"
-#define CONFIG_BOOTFILE                YourImageName
+#define CONFIG_BOOTFILE                "YourImageName"
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 30687749abcd42946b8e4c8d58c169c1fa87c533..2f99641e68aeaa79d246217b420024b4fbd23b7f 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -490,7 +490,7 @@
 
 #define CONFIG_HOSTNAME                simpc8313
 #define CONFIG_ROOTPATH                "/tftpboot/"
-#define CONFIG_BOOTFILE                /tftpboot/uImage
+#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/am3517_crane.h b/include/configs/am3517_crane.h
index e23ca45dd5c5a6d020a5609f5cfff5645af03726..8842a183f807231438a28d9192805d6db1d081ac 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -187,7 +187,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY       10
 
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x82000000\0" \

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 72dd6f02ceccc12476f79625d11b4d42bd98941a..1c70b9df697493ced61019d727406a4878b060a4 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -186,7 +186,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY       10
 
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x82000000\0" \

diff --git a/include/configs/aria.h b/include/configs/aria.h
index 33fc5fa6c4a565319bdd2dc1fc40b497f5d9b18f..cf2e7d4323f2003131146fd34ad66e7449059989 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -536,7 +536,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME                        aria
-#define CONFIG_BOOTFILE                        aria/uImage
+#define CONFIG_BOOTFILE                        "aria/uImage"
 #define CONFIG_ROOTPATH                        "/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR                        400000  /* default load addr */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 3da6d9798d963d434dc5332a11ba4f5b87cd9cca..bc0aeebb441118144531df4716fb84fc67769b21 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -627,7 +627,7 @@
  * Environment Configuration
  */
 #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 */
 
 /* default location for tftp and bootm */

diff --git a/include/configs/debris.h b/include/configs/debris.h
index 8473420a07ae454795d4a027d5009d199ba29712..60c7c4058f87a3ad19ec2aca9775dec528b5ed13 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -93,7 +93,7 @@
 #define CONFIG_HOSTNAME debris
 
 /* bootfile */
-#define CONFIG_BOOTFILE pImage
+#define CONFIG_BOOTFILE "pImage"
 
 /* loadaddr */
 #define CONFIG_LOADADDR 800000

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 0ec4af6aa4d5754089d621d244a59b9fe63ed757..e837f40132800dc3b87eb911dfc683da8b5ea5d4 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -137,7 +137,7 @@
 #define CONFIG_IPADDR 192.168.0.206
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ax2000
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 9c5f4dfe56baeaecfc39d8fca250ad3b529948b1..0cddeeef6b72b8140cadc9185eee5e72b8e8f27d 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -125,7 +125,7 @@
 #define CONFIG_IPADDR 192.168.0.207
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  ml401
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 8973955d893c5c33257317238a145b2a5772999c..7e8e6f558996c8ad6ac1f064278aa30be8cd4445 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -101,7 +101,7 @@
 #define CONFIG_IPADDR 192.168.0.206
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index df2b50019edfedcedfd31390567e8240988014c3..c14749b7e9d1b01a0e95d3088646967317fb64c7 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -123,7 +123,7 @@
 #define CONFIG_IPADDR 192.168.0.80
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 94b270e08d4e99fe1cf8abf5ecab5293a3952977..88d2aad95fbcedf65533299a0417319771ca4d91 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -120,7 +120,7 @@
 #define CONFIG_IPADDR 192.168.0.80
 #define CONFIG_ROOTPATH "/export/rootfs"
 #define CONFIG_HOSTNAME  grxc3s1500
-#define CONFIG_BOOTFILE  /uImage
+#define CONFIG_BOOTFILE "/uImage"
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 3fe8f701fdc81f581b543aeaa87138db2277e5df..50dd918385413186144b8619dd170f7a97532e05 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -56,7 +56,7 @@
 #define CONFIG_GATEWAYIP       192.168.1.1
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_HOSTNAME                idmr
-#define CONFIG_BOOTFILE                /tftpboot/idmr/uImage
+#define CONFIG_BOOTFILE                "/tftpboot/idmr/uImage"
 #define CONFIG_PREBOOT         "echo;echo Type \\\"run flash_nfs\\\" to mount root " \
                                "filesystem over NFS; echo"
 

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 0d9dbefda1016b938b4ee7a8d500992f6cb77082..2b0b61697eb4126a1ad88096a712fe064e2b8b7d 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -134,7 +134,7 @@
 #define        CONFIG_SERVERIP         192.168.100.1
 #define        CONFIG_NETMASK          255.255.255.0
 #define HOSTNAME               inka4x0
-#define CONFIG_BOOTFILE                /tftpboot/inka4x0/uImage
+#define CONFIG_BOOTFILE                "/tftpboot/inka4x0/uImage"
 #define        CONFIG_ROOTPATH         "/opt/eldk/ppc_6xx"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \

diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index c0bed27727e0e2062cae26128edf47bf89af8a42..ed9282b998a2b64796495dcfac5a20938cf6503f 100644 (file)
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -372,7 +372,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME                mecp512x
-#define CONFIG_BOOTFILE                /tftpboot/mecp512x/uImage
+#define CONFIG_BOOTFILE                "/tftpboot/mecp512x/uImage"
 #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 e284a0f7c9524021ecb0a95fab0eaa32626ee0a2..c3d3afde0e0f94328dead73fa93fb7e25741d252 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -525,7 +525,7 @@
 #define CONFIG_TIMESTAMP
 
 #define CONFIG_HOSTNAME                mpc5121ads
-#define CONFIG_BOOTFILE                mpc5121ads/uImage
+#define CONFIG_BOOTFILE                "mpc5121ads/uImage"
 #define CONFIG_ROOTPATH                "/opt/eldk/ppc_6xx"
 
 #define CONFIG_LOADADDR                400000  /* default location for tftp and bootm */

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 700dcdaae6e873dc441f7d63043dea8c340ea8d9..61d758e6391d5e3c59361fce65e6d7a877db8710 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -129,7 +129,7 @@
 #define CONFIG_TSI108_ETH_NUM_PORTS    2
 
 
-#define CONFIG_BOOTFILE                zImage.initrd.elf
+#define CONFIG_BOOTFILE                "zImage.initrd.elf"
 #define CONFIG_LOADADDR                0x400000
 
 /*-------------------------------------------------------------------------- */

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index f32899f47d3c0f26ea92cd73659d28891ef004b9..0f7edffc1241aeaaf4adf7fbcca4ba69822a36e0 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -35,7 +35,7 @@
 /* Default environment variables */
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
-#define CONFIG_BOOTFILE                /boot/zImage
+#define CONFIG_BOOTFILE                "/boot/zImage"
 #define CONFIG_LOADADDR                0x8E000000
 #define CONFIG_VERSION_VARIABLE
 

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index dd79b2d92de49099a27083014dcfc4f717ce9b7a..afa82cfb2ce88d44a0c431b2a51ab7371eb55ddf 100644 (file)
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -41,7 +41,7 @@
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
-#define CONFIG_BOOTFILE                /boot/zImage
+#define CONFIG_BOOTFILE                "/boot/zImage"
 #define CONFIG_LOADADDR                0x8E000000
 
 #define CONFIG_VERSION_VARIABLE

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 4c95a78d32053a674dcee876f6e920dd83897a90..7a76288013132a39d095c4dacff7740f2c0a4e01 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -194,7 +194,7 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY       10
 
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x82000000\0" \

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index c51cbffa5435752717305ac585456ca4c37a585f..bcfb0348404d33c83782c8d10b6e9cdb39528312 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -842,7 +842,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 */
 
 /* default location for tftp and bootm */

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index c87370aca86ca55cdee0fde670cd9e24f1da0dde..7de90d5915485406d4ec484068249083a9607493 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -611,7 +611,7 @@
 
 #define CONFIG_HOSTNAME                SBC8349
 #define CONFIG_ROOTPATH                "/tftpboot/rootfs"
-#define CONFIG_BOOTFILE                uImage
+#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 163ead938d35c1abd950bf1b476fabc86fe6bd71..ba7612c5a1c96e2a5da586739c4dac27b2d39a5b 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -528,7 +528,7 @@
 
 #define CONFIG_HOSTNAME         sbc8548
 #define CONFIG_ROOTPATH         "/opt/eldk/ppc_85xx"
-#define CONFIG_BOOTFILE         /uImage
+#define CONFIG_BOOTFILE         "/uImage"
 #define CONFIG_UBOOTPATH /u-boot.bin   /* TFTP server */
 
 #define CONFIG_SERVERIP         192.168.0.2

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 9237bcb204b7633b169f2f4ac6d5925963ab5232..95c68bce3cbde94206602dce5ce5d0c858ca256e 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -429,7 +429,7 @@
 
 #define CONFIG_HOSTNAME                SBC8560
 #define CONFIG_ROOTPATH                "/home/ppc"
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS               \
        "netdev=eth0\0"                         \

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 70763e715abb9b3a99fa48601dc23963e23fae03..099bdecc8c28a79c5f09905736342eac72fe9920 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -566,7 +566,7 @@
 
 #define CONFIG_HOSTNAME                sbc8641d
 #define CONFIG_ROOTPATH                "/opt/eldk/ppc_74xx"
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 
 #define CONFIG_SERVERIP                192.168.0.2
 #define CONFIG_GATEWAYIP       192.168.0.1

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 8e46c52a539a112a75431d8b1dbb381b7fc71cb0..d85d5276405d7b547565f471cd7d61c8c100ca35 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -378,7 +378,7 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_HOSTNAME                STX_GP3
 #define CONFIG_ROOTPATH                "/gppproot"
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_LOADADDR                0x1000000
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 18a673e7744d9ca04b66f497db9ac6932ee774fd..08316b6bf15253bbad9029b944764370e44d7a57 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -427,7 +427,7 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_HOSTNAME                STX_SSA
 #define CONFIG_ROOTPATH                "/gppproot"
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_LOADADDR                0x1000000
 
 #else /* ENV IS IN FLASH               -- use a full-blown envionment */

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 4129bb4e52b43cbf5ad0171c63cc13413a9e2924..bdb64bab1d9fce664d94660567cb5932127a0a58 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -546,7 +546,7 @@
 
 #define CONFIG_HOSTNAME                VME8349
 #define CONFIG_ROOTPATH                "/tftpboot/rootfs"
-#define CONFIG_BOOTFILE                uImage
+#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 f66bd3dbf5bd8a459b3b090c6295c45c561940de..996682ebc7e0797e5981adafdc7548d1df984262 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -187,7 +187,7 @@ static char 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"