diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2011-10-13 13:03:48 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-22 01:21:35 +0200 |
| commit | b3f44c21ea1a842eda757282d79e7c27efbf1f62 (patch) | |
| tree | 960a15cb6b6b01a1173facd9b71f34058dd0e59c | |
| parent | 8b3637c662e8a322f542942e5ee76b95ed9d9e39 (diff) | |
| download | u-boot-imx-b3f44c21ea1a842eda757282d79e7c27efbf1f62.zip u-boot-imx-b3f44c21ea1a842eda757282d79e7c27efbf1f62.tar.gz u-boot-imx-b3f44c21ea1a842eda757282d79e7c27efbf1f62.tar.bz2 | |
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>
57 files changed, 57 insertions, 57 deletions
diff --git a/common/env_common.c b/common/env_common.c index 596af82..c7e9bea 100644 --- 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 9b3018a..6ce1307 100644 --- 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 c4df9cd..ef1d6ba 100644 --- 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 aa7c114..d8e384a 100644 --- 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 5b73137..5cc9160 100644 --- 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 0fde1b2..541d2f4 100644 --- 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 feabe77..c57facf 100644 --- 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 cbe5a49..705f57a 100644 --- 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 0163c6a..a26a5bb 100644 --- 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 cda8167..d4e3ef5 100644 --- 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 85211cf..ae94a4a 100644 --- 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 4664a48..bd10dda 100644 --- 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 9027319..71d8970 100644 --- 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 c8fecfb..a99f8d5 100644 --- 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 f0fe469..ea460e6 100644 --- 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 b4b312b..ebe6a70 100644 --- 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 65dd0b2..f9c8dfb 100644 --- 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 cfaf47f..19d3271 100644 --- 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 547f752..ffee8fc 100644 --- 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 aabfb44..8fe72dc 100644 --- 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 1606d6d..61d6d5c 100644 --- 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 27d30c9..af4609f 100644 --- 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 d1512f5..0077060 100644 --- 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 e906922..013a6ac 100644 --- 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 765477a..883d44e 100644 --- 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 c69e092..2d9657a 100644 --- 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 5c90299..6d45bb1 100644 --- 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 62c3fda..efc59fe 100644 --- 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 11d564a..f1d30ba 100644 --- 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 3068774..2f99641 100644 --- 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 e23ca45..8842a18 100644 --- 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 72dd6f0..1c70b9d 100644 --- 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 33fc5fa..cf2e7d4 100644 --- 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 3da6d97..bc0aeeb 100644 --- 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 8473420..60c7c40 100644 --- 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 0ec4af6..e837f40 100644 --- 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 9c5f4df..0cddeee 100644 --- 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 8973955..7e8e6f5 100644 --- 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 df2b500..c14749b 100644 --- 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 94b270e..88d2aad 100644 --- 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 3fe8f70..50dd918 100644 --- 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 0d9dbef..2b0b616 100644 --- 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 c0bed27..ed9282b 100644 --- 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 e284a0f..c3d3afd 100644 --- 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 700dcda..61d758e 100644 --- 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 f32899f..0f7edff 100644 --- 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 dd79b2d..afa82cf 100644 --- 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 4c95a78..7a76288 100644 --- 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 c51cbff..bcfb034 100644 --- 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 c87370a..7de90d5 100644 --- 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 163ead9..ba7612c 100644 --- 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 9237bcb..95c68bc 100644 --- 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 70763e7..099bdec 100644 --- 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 8e46c52..d85d527 100644 --- 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 18a673e..08316b6 100644 --- 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 4129bb4..bdb64ba 100644 --- 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 f66bd3d..996682e 100644 --- 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" |