diff options
| author | Mario Six <mario.six@gdsys.cc> | 2018-03-28 14:38:20 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-08 18:31:09 -0400 |
| commit | 5bc0543df3079add8152afa041b887d081d71839 (patch) | |
| tree | 52391dd5ad89ac8681dccb7efd6a3441e2ccec06 | |
| parent | 07dea2e737f78ee70e81c27d976811f0e9fdbad8 (diff) | |
| download | u-boot-5bc0543df3079add8152afa041b887d081d71839.tar.gz | |
treewide: Convert CONFIG_HOSTNAME to a string option
CONFIG_HOSTNAME is defined as a "plain" preprocessor string, but every
use is couched by __stringify(...).
Hence, convert it to a proper string option.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
84 files changed, 134 insertions, 132 deletions
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index d192d76f3b..f81f0de7a5 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -324,7 +324,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_HAS_ETH0 #endif -#define CONFIG_HOSTNAME BSC9131rdb +#define CONFIG_HOSTNAME "BSC9131rdb" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index ae28868491..fb4762d3cf 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -528,7 +528,7 @@ combinations. this should be removed later #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME BSC9132qds +#define CONFIG_HOSTNAME "BSC9132qds" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 3385dcb5b7..4a1a8ffafb 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -64,7 +64,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5208EVBe +#define CONFIG_HOSTNAME "M5208EVBe" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 7798b06625..2e2e512814 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -31,7 +31,7 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_HOSTNAME M52277EVB +#define CONFIG_HOSTNAME "M52277EVB" #define CONFIG_SYS_UBOOT_END 0x3FFFF #define CONFIG_SYS_LOAD_ADDR2 0x40010007 #ifdef CONFIG_SYS_STMICRO_BOOT diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index d221f718f0..e507ad92bf 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -76,7 +76,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5235EVB +#define CONFIG_HOSTNAME "M5235EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index cf10f306c7..b9f30ccc0a 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -77,7 +77,7 @@ "" #endif -#define CONFIG_HOSTNAME M5253DEMO +#define CONFIG_HOSTNAME "M5253DEMO" /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 936a91e27d..ab5ebbd5b8 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -80,7 +80,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5272C3 +#define CONFIG_HOSTNAME "M5272C3" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b29515077a..26b9ef3e53 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -72,7 +72,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */ -#define CONFIG_HOSTNAME M5282EVB +#define CONFIG_HOSTNAME "M5282EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 96fb87bc7c..69b7d8644b 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -81,7 +81,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M53017 +#define CONFIG_HOSTNAME "M53017" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 5a994859f1..6dcd41a4c7 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -73,7 +73,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5329EVB +#define CONFIG_HOSTNAME "M5329EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 7b2d1bb398..faf098e2b8 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -73,7 +73,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M5373EVB +#define CONFIG_HOSTNAME "M5373EVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index ba9ba00698..c614193963 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -85,7 +85,7 @@ #endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54418TWR +#define CONFIG_HOSTNAME "M54418TWR" #if defined(CONFIG_CF_SBF) /* ST Micro serial flash */ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index b144332b22..bec0ca0ce1 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -64,7 +64,7 @@ # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54451EVB +#define CONFIG_HOSTNAME "M54451EVB" #ifdef CONFIG_SYS_STMICRO_BOOT /* ST Micro serial flash */ #define CONFIG_SYS_LOAD_ADDR2 0x40010007 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 14dd2a516e..fb3fee6103 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -67,7 +67,7 @@ # endif /* CONFIG_SYS_DISCOVER_PHY */ #endif -#define CONFIG_HOSTNAME M54455EVB +#define CONFIG_HOSTNAME "M54455EVB" #ifdef CONFIG_SYS_STMICRO_BOOT /* ST Micro serial flash */ #define CONFIG_SYS_LOAD_ADDR2 0x40010013 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 566f24e3b1..5c53e82f55 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -110,7 +110,7 @@ # define CONFIG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */ -#define CONFIG_HOSTNAME M547xEVB +#define CONFIG_HOSTNAME "M547xEVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 31564748bc..bc10284376 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -98,7 +98,7 @@ #define CONFIG_UDP_CHECKSUM -#define CONFIG_HOSTNAME M548xEVB +#define CONFIG_HOSTNAME "M548xEVB" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 19608b08ff..ef6d820d7d 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -604,7 +604,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc8313erdb +#define CONFIG_HOSTNAME "mpc8313erdb" #define CONFIG_ROOTPATH "/nfs/root/path" #define CONFIG_BOOTFILE "uImage" /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 3f0e87fe8a..85ea171175 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -448,7 +448,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc8323erdb +#define CONFIG_HOSTNAME "mpc8323erdb" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "uImage" /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 1452031ab2..c40ba469b0 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -685,7 +685,7 @@ #define CONFIG_HAS_ETH0 #endif -#define CONFIG_HOSTNAME mpc8349emds +#define CONFIG_HOSTNAME "mpc8349emds" #define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 93dc6f00fb..7ebd6175a6 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -622,7 +622,7 @@ #define CONFIG_NETDEV "eth1" -#define CONFIG_HOSTNAME mpc837x_rdb +#define CONFIG_HOSTNAME "mpc837x_rdb" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_RAMDISKFILE "rootfs.ext2.gz.uboot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 17575c981d..6843ef2866 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -612,7 +612,7 @@ #define CONFIG_IPADDR 192.168.1.254 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 0c1c648968..a43210f4c8 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -340,7 +340,7 @@ #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index a1d000f227..d4753c4277 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -363,7 +363,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 27b67be8af..b2943fa622 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -370,7 +370,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_IPADDR 192.168.1.251 -#define CONFIG_HOSTNAME 8544ds_unknown +#define CONFIG_HOSTNAME "8544ds_unknown" #define CONFIG_ROOTPATH "/nfs/mpc85xx" #define CONFIG_BOOTFILE "8544ds/uImage.uboot" #define CONFIG_UBOOTPATH 8544ds/u-boot.bin /* TFTP server */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 7b4813592a..0c44c16e66 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -478,7 +478,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "8548cds/uImage.uboot" #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index db4b10e027..a74b24c390 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -359,7 +359,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 6cfb2417eb..13567e48af 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -376,7 +376,7 @@ #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 0b3bd759b6..7fb4054566 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -377,7 +377,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_IPADDR 192.168.1.253 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index d32a7d7ab7..6d0970582b 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -469,7 +469,7 @@ extern unsigned long get_clock_freq(void); /* * Environment Configuration */ -#define CONFIG_HOSTNAME mpc8569mds +#define CONFIG_HOSTNAME "mpc8569mds" #define CONFIG_ROOTPATH "/nfsroot" #define CONFIG_BOOTFILE "your.uImage" diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 5f663bf106..c04b3a2af2 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -569,7 +569,7 @@ #define CONFIG_IPADDR 192.168.1.254 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 0fc0d11bb0..3fd432e5c0 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -439,7 +439,7 @@ */ #define CONFIG_IPADDR 192.168.1.100 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH 8610hpcd/u-boot.bin diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index ff81dd8aa8..9ede6dd9b1 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -602,7 +602,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_IPADDR 192.168.1.100 -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 95f8d20eba..8dd4f91efb 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -587,7 +587,7 @@ * Environment Configuration */ -#define CONFIG_HOSTNAME p1022ds +#define CONFIG_HOSTNAME "p1022ds" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 0cc3af75f6..489e4e35f9 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -469,7 +469,7 @@ #endif -#define CONFIG_HOSTNAME UCP1020 +#define CONFIG_HOSTNAME "UCP1020" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 569fd982b6..58c77deac7 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -9,7 +9,7 @@ #ifndef __AMCORE_CONFIG_H #define __AMCORE_CONFIG_H -#define CONFIG_HOSTNAME AMCORE +#define CONFIG_HOSTNAME "AMCORE" #define CONFIG_MCFTMR #define CONFIG_MCFUART diff --git a/include/configs/apf27.h b/include/configs/apf27.h index e1d4aa6a72..ceca5ba949 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -42,7 +42,7 @@ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_DNS2 -#define CONFIG_HOSTNAME CONFIG_BOARD_NAME +#define CONFIG_HOSTNAME "apf27" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" /* diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 1799cc1f32..a671611cd8 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -14,7 +14,7 @@ #define __ARISTAINETOS_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 1 -#define CONFIG_HOSTNAME aristainetos +#define CONFIG_HOSTNAME "aristainetos" #define CONFIG_BOARDNAME "aristainetos" #define CONFIG_MXC_UART_BASE UART5_BASE diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 9cd40a7616..3584c27a61 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -13,7 +13,7 @@ #define __ARISTAINETOS2_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 2 -#define CONFIG_HOSTNAME aristainetos2 +#define CONFIG_HOSTNAME "aristainetos2" #define CONFIG_BOARDNAME "aristainetos2" #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index a680e762d7..9befb89b37 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -13,7 +13,7 @@ #define __ARISTAINETOS2B_CONFIG_H #define CONFIG_SYS_BOARD_VERSION 3 -#define CONFIG_HOSTNAME aristainetos2 +#define CONFIG_HOSTNAME "aristainetos2" #define CONFIG_BOARDNAME "aristainetos2-revB" #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h index 9c666430f5..f0eba6bd8f 100644 --- a/include/configs/bcm_northstar2.h +++ b/include/configs/bcm_northstar2.h @@ -9,7 +9,7 @@ #include <linux/sizes.h> -#define CONFIG_HOSTNAME northstar2 +#define CONFIG_HOSTNAME "northstar2" /* Physical Memory Map */ #define V2M_BASE 0x80000000 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 5cf9ead20e..1fe6f2fa5e 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -343,7 +343,7 @@ #else -#define CONFIG_HOSTNAME controlcenterd +#define CONFIG_HOSTNAME "controlcenterd" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 2b7dc7c2cf..1db18a4065 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -141,7 +141,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_HOSTNAME ccdc +#define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "ccdc.img" diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 75353cd112..ce1ed5b275 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -151,7 +151,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME ea20 +#define CONFIG_HOSTNAME "ea20" #define CONFIG_EXTRA_ENV_SETTINGS \ "as=3\0" \ "netdev=eth0\0" \ @@ -188,9 +188,9 @@ "loadaddr=c0000014\0" \ "memory=32M\0" \ "kernel_addr_r=c0700000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/image.ext2\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/image.ext2\0" \ "flash_self=run ramargs addip addtty addmtd addmisc addmem;" \ "bootm ${kernel_addr_r}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc addmem;" \ @@ -219,7 +219,7 @@ "net_nandrw=tftp ${kernel_addr_r} ${bootfile}; run nandrwargs" \ " addip addtty addmtd addmisc addmem;" \ "clrlogo;bootm ${kernel_addr_r}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load_magic=if sf probe 0;then sf " \ "read c0000000 0x10000 0x60000;fi\0" \ "load_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;" \ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 63568caa78..16382f6f26 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -26,6 +26,8 @@ #define CONFIG_BOOTFILE "uImage" +#define CONFIG_HOSTNAME "eco5pk" + /* * Set its own mtdparts, different from common */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 2ce8720b75..6ca69fb996 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -155,7 +155,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME flea3 +#define CONFIG_HOSTNAME "flea3" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -173,9 +173,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -189,7 +189,7 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index d09b863c86..d6761ddad1 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -578,7 +578,7 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_HOSTNAME hrcon +#define CONFIG_HOSTNAME "hrcon" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 4b17d780ae..a10dc123f2 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -426,7 +426,7 @@ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_NETDEV eth1 -#define CONFIG_HOSTNAME ids8313 +#define CONFIG_HOSTNAME "ids8313" #define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx" #define CONFIG_BOOTFILE "ids8313/uImage" #define CONFIG_UBOOTPATH "ids8313/u-boot.bin" diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 475461471f..ad9aca4cf3 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -150,9 +150,9 @@ " console=ttymxc0,${baudrate}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "addmisc=setenv bootargs ${bootargs}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "kernel_addr_r=a0800000\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ "rootpath=/opt/eldk-4.2-arm/arm\0" \ "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ "run nfsargs addip addtty addmtd addmisc;" \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 72e7dac7b2..c4d4b0c0fa 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -65,7 +65,7 @@ #define CONFIG_KM_DEF_BOOT_ARGS_CPU "" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ "erase " __stringify(BOOTFLASH_START) " +${filesize} && "\ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 379224dde4..c6761921c7 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -69,7 +69,7 @@ " boardid=0x${IVM_BoardId} hwkey=0x${IVM_HWKey}" #define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "set_fdthigh=setenv fdt_high ${kernelmem}\0" \ "checkfdt=" \ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 1f2e1c1c34..05a4e86511 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -391,7 +391,7 @@ int get_scl(void); "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.pbl\0" \ + "u-boot="CONFIG_HOSTNAME "/u-boot.pbl\0" \ "update=" \ "sf probe 0;sf erase 0 +${filesize};" \ "sf write ${load_addr_r} 0 ${filesize};\0" \ diff --git a/include/configs/km8360.h b/include/configs/km8360.h index 7d4b43068b..280da9d6cc 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -14,11 +14,11 @@ #define CONFIG_SYS_KMBEC_FPGA_SIZE 64 #if defined CONFIG_KMETER1 -#define CONFIG_HOSTNAME kmeter1 +#define CONFIG_HOSTNAME "kmeter1" #define CONFIG_KM_BOARD_NAME "kmeter1" #define CONFIG_KM_DEF_NETDEV "netdev=eth2\0" #elif defined CONFIG_KMCOGE5NE -#define CONFIG_HOSTNAME kmcoge5ne +#define CONFIG_HOSTNAME "kmcoge5ne" #define CONFIG_KM_BOARD_NAME "kmcoge5ne" #define CONFIG_KM_DEF_NETDEV "netdev=eth1\0" #define CONFIG_NAND_ECC_BCH diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 0d78cfaed6..15e4b46625 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -23,13 +23,13 @@ /* KM_KIRKWOOD */ #if defined(CONFIG_KM_KIRKWOOD) -#define CONFIG_HOSTNAME km_kirkwood +#define CONFIG_HOSTNAME "km_kirkwood" #define CONFIG_KM_DISABLE_PCIE #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ /* KM_KIRKWOOD_PCI */ #elif defined(CONFIG_KM_KIRKWOOD_PCI) -#define CONFIG_HOSTNAME km_kirkwood_pci +#define CONFIG_HOSTNAME "km_kirkwood_pci" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_FPGA_CONFIG #define CONFIG_KM_UBI_PART_BOOT_OPTS ",2048" @@ -37,7 +37,7 @@ /* KM_KIRKWOOD_128M16 */ #elif defined(CONFIG_KM_KIRKWOOD_128M16) -#define CONFIG_HOSTNAME km_kirkwood_128m16 +#define CONFIG_HOSTNAME "km_kirkwood_128m16" #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg #define CONFIG_KM_DISABLE_PCIE @@ -48,9 +48,9 @@ #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ # if defined(CONFIG_KM_NUSA) -#define CONFIG_HOSTNAME kmnusa +#define CONFIG_HOSTNAME "kmnusa" # elif defined(CONFIG_KM_SUGP1) -#define CONFIG_HOSTNAME kmsugp1 +#define CONFIG_HOSTNAME "kmsugp1" #define KM_PCIE_RESET_MPP7 #endif @@ -64,7 +64,7 @@ /* KM_MGCOGE3UN */ #elif defined(CONFIG_KM_MGCOGE3UN) -#define CONFIG_HOSTNAME mgcoge3un +#define CONFIG_HOSTNAME "mgcoge3un" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg @@ -80,20 +80,20 @@ #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg #define CONFIG_KM_ENV_IS_IN_SPI_NOR #define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3 -#define CONFIG_HOSTNAME kmcoge5un +#define CONFIG_HOSTNAME "kmcoge5un" #define CONFIG_KM_DISABLE_PCIE #define CONFIG_KM_PIGGY4_88E6352 /* KM_PORTL2 */ #elif defined(CONFIG_KM_PORTL2) -#define CONFIG_HOSTNAME portl2 +#define CONFIG_HOSTNAME "portl2" #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ #define CONFIG_KM_PIGGY4_88E6061 /* KM_SUV31 */ #elif defined(CONFIG_KM_SUV31) #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ -#define CONFIG_HOSTNAME kmsuv31 +#define CONFIG_HOSTNAME "kmsuv31" #undef CONFIG_SYS_KWD_CONFIG #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg #define CONFIG_KM_ENV_IS_IN_SPI_NOR diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h index 8bb3571691..37a33e5ae0 100644 --- a/include/configs/kmp204x.h +++ b/include/configs/kmp204x.h @@ -10,12 +10,12 @@ /* KMLION1 */ #if defined(CONFIG_KMLION1) -#define CONFIG_HOSTNAME kmlion1 +#define CONFIG_HOSTNAME "kmlion1" #define CONFIG_KM_BOARD_NAME "kmlion1" /* KMCOGE4 */ #elif defined(CONFIG_KMCOGE4) -#define CONFIG_HOSTNAME kmcoge4 +#define CONFIG_HOSTNAME "kmcoge4" #define CONFIG_KM_BOARD_NAME "kmcoge4" #else diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index d44cf786d7..9c4d01e1d1 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -97,7 +97,7 @@ /* Extra Environment */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME m28evk +#define CONFIG_HOSTNAME "m28evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttyAMA0\0" \ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 3210c7fb66..0ef9929b88 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -184,7 +184,7 @@ * Extra Environments */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME m53evk +#define CONFIG_HOSTNAME "m53evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttymxc1\0" \ diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 4aefc85000..a00af1a1fb 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -118,7 +118,7 @@ * Extra Environments */ #define CONFIG_PREBOOT "run try_bootscript" -#define CONFIG_HOSTNAME ma5d4evk +#define CONFIG_HOSTNAME "ma5d4evk" #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttyS3\0" \ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 045f602837..27098eca73 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -106,7 +106,7 @@ /* Setup MTD for NAND on the SOM */ -#define CONFIG_HOSTNAME mcx +#define CONFIG_HOSTNAME "mcx" #define CONFIG_EXTRA_ENV_SETTINGS \ "adddbg=setenv bootargs ${bootargs} trace_buf_size=64M\0" \ "adddebug=setenv bootargs ${bootargs} earlyprintk=serial\0" \ @@ -125,13 +125,13 @@ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "baudrate=115200\0" \ "consoledev=ttyO2\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ "loadaddr=0x82000000\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "load_k=tftp ${loadaddr} ${bootfile}\0" \ "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ "loadmlo=tftp ${loadaddr} ${mlo}\0" \ - "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \ + "mlo=" CONFIG_HOSTNAME "/MLO\0" \ "mmcargs=root=/dev/mmcblk0p2 rw " \ "rootfstype=ext3 rootwait\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -145,7 +145,7 @@ "bootm ${loadaddr}\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.img\0" \ "uboot_addr=0x80000\0" \ "update=nandecc sw;nand erase ${uboot_addr} 100000;" \ "nand write ${loadaddr} ${uboot_addr} 80000\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 73c3c2ae48..1a02ff5e09 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -179,7 +179,7 @@ /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0 -#define CONFIG_HOSTNAME XILINX_BOARD_NAME +#define CONFIG_HOSTNAME "microblaze-generic" #define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm" /* architecture dependent code */ diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 710994988e..3810fd948f 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -23,7 +23,7 @@ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_HOSTNAME mt_ventoux +#define CONFIG_HOSTNAME "mt_ventoux" /* * Set its own mtdparts, different from common diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index d81351ee13..3aefe5b862 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -207,9 +207,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -219,7 +219,7 @@ "bootm ${kernel_addr_r}\0" \ "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \ "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/novena.h b/include/configs/novena.h index 977b2c3643..121d339a16 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -37,7 +37,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_HOSTNAME novena +#define CONFIG_HOSTNAME "novena" /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b260129ea5..a9752ad7f6 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -801,7 +801,7 @@ /* * Environment Configuration */ -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 782211d61e..623b238d4c 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -390,7 +390,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Environment Configuration */ -#define CONFIG_HOSTNAME unknown +#define CONFIG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h index 20315546aa..148e561ed0 100644 --- a/include/configs/platinum_picon.h +++ b/include/configs/platinum_picon.h @@ -16,7 +16,7 @@ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_FEC_MXC_PHYADDR 0 -#define CONFIG_HOSTNAME picon +#define CONFIG_HOSTNAME "picon" #define CONFIG_PLATFORM_ENV_SETTINGS "\0" diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h index 09b9bd38ff..362d3a4143 100644 --- a/include/configs/platinum_titanium.h +++ b/include/configs/platinum_titanium.h @@ -21,7 +21,7 @@ #define CONFIG_PHY_RESET_DELAY 1000 -#define CONFIG_HOSTNAME titanium +#define CONFIG_HOSTNAME "titanium" #define CONFIG_PLATFORM_ENV_SETTINGS "\0" diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index a7c7be7a2c..73a2d190af 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -597,7 +597,7 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME SBC8349 +#define CONFIG_HOSTNAME "SBC8349" #define CONFIG_ROOTPATH "/tftpboot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index c2982f242f..51c0ad65b1 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -520,7 +520,7 @@ #define CONFIG_IPADDR 192.168.0.55 -#define CONFIG_HOSTNAME sbc8548 +#define CONFIG_HOSTNAME "sbc8548" #define CONFIG_ROOTPATH "/opt/eldk/ppc_85xx" #define CONFIG_BOOTFILE "/uImage" #define CONFIG_UBOOTPATH /u-boot.bin /* TFTP server */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 7419b2ab4d..5f0a955632 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -479,7 +479,7 @@ #define CONFIG_IPADDR 192.168.0.50 -#define CONFIG_HOSTNAME sbc8641d +#define CONFIG_HOSTNAME "sbc8641d" #define CONFIG_ROOTPATH "/opt/eldk/ppc_74xx" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 1197b40b58..1d8aed90ce 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -41,7 +41,7 @@ #endif /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_vining_fpga +#define CONFIG_HOSTNAME "socfpga_vining_fpga" /* * Active LOW GPIO buttons: diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index d20dd9c3c5..c02fe2a963 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -9,7 +9,7 @@ #ifndef __STMARK2_CONFIG_H #define __STMARK2_CONFIG_H -#define CONFIG_HOSTNAME stmark2 +#define CONFIG_HOSTNAME "stmark2" #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT 0 diff --git a/include/configs/strider.h b/include/configs/strider.h index 7838805bc0..b56a03e4e6 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -610,7 +610,7 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */ -#define CONFIG_HOSTNAME hrcon +#define CONFIG_HOSTNAME "hrcon" #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h index 606a4fc13f..a1d03acf25 100644 --- a/include/configs/suvd3.h +++ b/include/configs/suvd3.h @@ -24,13 +24,13 @@ /* This needs to be set prior to including km/km83xx-common.h */ #if defined(CONFIG_SUVD3) /* SUVD3 board specific */ -#define CONFIG_HOSTNAME suvd3 +#define CONFIG_HOSTNAME "suvd3" #define CONFIG_KM_BOARD_NAME "suvd3" /* include common defines/options for all 8321 Keymile boards */ #include "km/km8321-common.h" #elif defined(CONFIG_KMVECT1) /* VECT1 board specific */ -#define CONFIG_HOSTNAME kmvect1 +#define CONFIG_HOSTNAME "kmvect1" #define CONFIG_KM_BOARD_NAME "kmvect1" /* at end of uboot partition, before env */ #define CONFIG_SYS_QE_FW_ADDR 0xF00B0000 @@ -38,7 +38,7 @@ #include "km/km8309-common.h" #elif defined(CONFIG_KMTEGR1) /* TEGR1 board specific */ -#define CONFIG_HOSTNAME kmtegr1 +#define CONFIG_HOSTNAME "kmtegr1" #define CONFIG_KM_BOARD_NAME "kmtegr1" #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 72da301436..7f5a3cadcb 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -214,8 +214,8 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=82000000\0" \ "kernel_addr_r=82000000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -230,10 +230,10 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.img\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "loadmlo=tftp ${loadaddr} ${mlo}\0" \ - "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \ + "mlo=" CONFIG_HOSTNAME "/MLO\0" \ "uboot_addr=0x80000\0" \ "update=nandecc sw;nand erase ${uboot_addr} 100000;" \ "nand write ${loadaddr} ${uboot_addr} 80000\0" \ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 0fe40ee72f..b53ddacd88 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -54,17 +54,17 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20)) -#define CONFIG_HOSTNAME titanium +#define CONFIG_HOSTNAME "titanium" #define CONFIG_UBI_PART ubi #define CONFIG_UBIFS_VOLUME rootfs0 #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "kernel=" CONFIG_HOSTNAME "/uImage\0" \ "kernel_fs=/boot/uImage\0" \ "kernel_addr=11000000\0" \ - "dtb=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "dtb=" CONFIG_HOSTNAME "/" \ + CONFIG_HOSTNAME ".dtb\0" \ + "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0" \ "dtb_addr=12800000\0" \ "script=boot.scr\0" \ "uimage=uImage\0" \ @@ -93,7 +93,7 @@ "rootpath=/opt/eldk-5.3/armv7a/rootfs-minimal-mtdutils\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsroot=${serverip}:${rootpath}\0" \ - "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \ + "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \ "boot_vol=0\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \ diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index b63bdf1a05..bb1d1dbffa 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -26,19 +26,19 @@ */ #if defined(CONFIG_KMSUPX5) #define CONFIG_KM_BOARD_NAME "kmsupx5" -#define CONFIG_HOSTNAME kmsupx5 +#define CONFIG_HOSTNAME "kmsupx5" #elif defined(CONFIG_TUGE1) #define CONFIG_KM_BOARD_NAME "tuge1" -#define CONFIG_HOSTNAME tuge1 +#define CONFIG_HOSTNAME "tuge1" #elif defined(CONFIG_TUXX1) /* TUXX1 board (tuxa1/tuda1) specific */ #define CONFIG_KM_BOARD_NAME "tuxx1" -#define CONFIG_HOSTNAME tuxx1 +#define CONFIG_HOSTNAME "tuxx1" #elif defined(CONFIG_KMOPTI2) #define CONFIG_KM_BOARD_NAME "kmopti2" -#define CONFIG_HOSTNAME kmopti2 +#define CONFIG_HOSTNAME "kmopti2" #elif defined(CONFIG_KMTEPR2) #define CONFIG_KM_BOARD_NAME "kmtepr2" -#define CONFIG_HOSTNAME kmtepr2 +#define CONFIG_HOSTNAME "kmtepr2" #else #error ("Board not supported") #endif diff --git a/include/configs/twister.h b/include/configs/twister.h index 5626eb1b95..032559633b 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -22,7 +22,7 @@ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_HOSTNAME twister +#define CONFIG_HOSTNAME "twister" #define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \ "bootcmd=run nandboot\0" diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f8bd34dff7..1c44f76b17 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -51,7 +51,7 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR /* Linux boot */ -#define CONFIG_HOSTNAME usbarmory +#define CONFIG_HOSTNAME "usbarmory" #define CONFIG_BOOTCOMMAND \ "run distro_bootcmd; " \ "setenv bootargs console=${console} ${bootargs_default}; " \ diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 3fbac280db..bbd8ec5e3c 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -437,7 +437,7 @@ #define CONFIG_NETDEV eth0 -#define CONFIG_HOSTNAME ve8313 +#define CONFIG_HOSTNAME "ve8313" #define CONFIG_UBOOTPATH ve8313/u-boot.bin #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 5289d302f6..9559b503db 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -495,7 +495,7 @@ #define CONFIG_HAS_ETH1 #endif -#define CONFIG_HOSTNAME VME8349 +#define CONFIG_HOSTNAME "VME8349" #define CONFIG_ROOTPATH "/tftpboot/rootfs" #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index c11f17caf8..7e993b8298 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -164,7 +164,7 @@ * to update uboot and load kernel */ -#define CONFIG_HOSTNAME woodburn +#define CONFIG_HOSTNAME "woodburn" #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -182,9 +182,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ - "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" CONFIG_HOSTNAME "\0" \ + "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ + "ramdisk_file=" CONFIG_HOSTNAME "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -198,7 +198,7 @@ "run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "else echo Images not loades;fi\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ diff --git a/include/configs/x600.h b/include/configs/x600.h index 5b2d0bf536..a6fb9889be 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -113,13 +113,13 @@ #define CONFIG_SYS_MALLOC_LEN (8 << 20) #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_HOSTNAME x600 +#define CONFIG_HOSTNAME "x600" #define CONFIG_UBI_PART ubi0 #define CONFIG_UBIFS_VOLUME rootfs #define CONFIG_EXTRA_ENV_SETTINGS \ "u-boot_addr=1000000\0" \ - "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.spr\0" \ "load=tftp ${u-boot_addr} ${u-boot}\0" \ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize};" \ @@ -129,7 +129,7 @@ "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ " +${filesize}\0" \ "upd=run load update\0" \ - "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \ + "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \ "load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \ @@ -154,12 +154,12 @@ "saveenv;boot\0" \ "ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \ "root=ubi0:rootfs rootfstype=ubifs\0" \ - "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "kernel=" CONFIG_HOSTNAME "/uImage\0" \ "kernel_fs=/boot/uImage \0" \ "kernel_addr=1000000\0" \ - "dtb=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "dtb=" CONFIG_HOSTNAME "/" \ + CONFIG_HOSTNAME ".dtb\0" \ + "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0" \ "dtb_addr=1800000\0" \ "load_kernel=tftp ${kernel_addr} ${kernel}\0" \ "load_dtb=tftp ${dtb_addr} ${dtb}\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7cf5c2731f..6d650b79da 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -110,7 +110,7 @@ /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" -#define CONFIG_HOSTNAME x86 +#define CONFIG_HOSTNAME "x86" #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 #define CONFIG_RAMDISK_ADDR 0x4000000 diff --git a/include/env_default.h b/include/env_default.h index ba1c3c0d74..7d5988a1a5 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -75,7 +75,7 @@ const uchar default_environment[] = { "netmask=" __stringify(CONFIG_NETMASK) "\0" #endif #ifdef CONFIG_HOSTNAME - "hostname=" __stringify(CONFIG_HOSTNAME) "\0" + "hostname=" CONFIG_HOSTNAME "\0" #endif #ifdef CONFIG_BOOTFILE "bootfile=" CONFIG_BOOTFILE "\0" |