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>

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index d192d76f3b86231bca9725bd24a5598709f52277..f81f0de7a5843fc9df96012671e9b52f00c599be 100644 (file)
--- 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 ae288684919b17c9bc530450a5ae458cafe4a0db..fb4762d3cf1c2657d10f53b94e4bb7f805b72803 100644 (file)
--- 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 3385dcb5b7fb2c91c3463c4f45a4050400485c7d..4a1a8ffafbd8a995743bbbfefaa79fa547a7c970 100644 (file)
--- 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 7798b066252273944942c5348e45e5bf18417aa2..2e2e5128148fd7ff00084e86c1a2676cb0d9a3e0 100644 (file)
--- 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 d221f718f076d65dc6fa4320987e8b89b7293428..e507ad92bfd5f2bd5d2f24bf7f21905962369e1d 100644 (file)
--- 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 cf10f306c76a6423f3a8d0a5811c7e6a0ec7d478..b9f30ccc0ad9e8d486b6871e9a5308f18ac71cfa 100644 (file)
--- 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 936a91e27d77f49f633459784aec163647beeaa1..ab5ebbd5b820f690d392a1fd7b03326c800fd836 100644 (file)
--- 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 b29515077a17f12be9c80a74a87aef8475189674..26b9ef3e533f2d3b6df672ee791298fae97052fb 100644 (file)
--- 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 96fb87bc7c7e4ab5cb32391b2ce0abb30cc946be..69b7d8644b1481b4d72c57619f41def1254d9892 100644 (file)
--- 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 5a994859f11aa18402f527e403182b707e0365bf..6dcd41a4c73d7150c4b69d9cc54f624864d09e73 100644 (file)
--- 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 7b2d1bb398cb27af9546b17e60b7fc9693f40d97..faf098e2b8499706c4064ee378cae6f5075b50e5 100644 (file)
--- 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 ba9ba0069868f452f19313185d6b3493bb5799d5..c614193963e0d455878e2f4682738c1cea897cca 100644 (file)
--- 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 b144332b2267201d3be88f26776f3e6955b5347a..bec0ca0ce18c2efae16637d5c1443d7d0acd3f66 100644 (file)
--- 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 14dd2a516e9d5206aadd04cc248769274ccd5711..fb3fee61031ab3b4955e05d27f0da95805bf4a11 100644 (file)
--- 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 566f24e3b12ab90d8bf000618d313b76a99672cf..5c53e82f55cf8450a864e6f3e341061c9287fa8b 100644 (file)
--- 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 31564748bc80807477784eb4190bbd410680477a..bc102843766dfe2d614b7ea801c81e7b5a7e49d3 100644 (file)
--- 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 19608b08ff3d1c18c7c61eb6d7afff30105ab516..ef6d820d7d54ec15d849e07b7706ef33d72cdca2 100644 (file)
--- 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 3f0e87fe8a476908d901f5de44526cfc8e81dc71..85ea1711751d9d71dea97e57bf82fde46a189629 100644 (file)
--- 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 1452031ab26aa7377a7407a23362ffbb19becae9..c40ba469b0865a2fca87d5b6e292cbf39d1027e4 100644 (file)
--- 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 93dc6f00fb0d230338e5a86747aff1e3007f7b49..7ebd6175a6f6961ec1823dfe47cf448582f8ba44 100644 (file)
--- 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 17575c981d1a23e9a8081afefb1d08e1d9da7058..6843ef2866c783f80390d2db95c2ba8dc283939a 100644 (file)
--- 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 0c1c6489687fec02e83b0459b87e94c749f2d5b7..a43210f4c895065f9e15f7e980c3b141d560d584 100644 (file)
--- 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 a1d000f227be35d284788dc08012e88fc7e2c186..d4753c42770c812de5aab0e3aff82ea32ab84708 100644 (file)
--- 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 27b67be8afbc17af79f8dc08301d913341e50485..b2943fa622191054155b98a066e02b82f79b169a 100644 (file)
--- 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 7b4813592a0e6750382fe9156e0f1b2e33ed441e..0c44c16e666e4e2d51e3361d67b743df5875840e 100644 (file)
--- 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 db4b10e027d2e697fd3e551693e777f8dc8f80d7..a74b24c3901cfd7339a164c2ec139511ad2f6212 100644 (file)
--- 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 6cfb2417eb30f49030d7d1d40a4d19e78e645fd9..13567e48af6404c4c0e6a96f6006065167dccae0 100644 (file)
--- 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 0b3bd759b66e0a998290a0824379566d6d1ae5ed..7fb40545669244f2211e1086142768879963e103 100644 (file)
--- 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 d32a7d7ab792a11209b3d30872f4600b0bac580b..6d0970582b0b644dff7e0e2609c2c680980bf649 100644 (file)
--- 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 5f663bf10685abdb8c30787f19d9dae16bc7be2f..c04b3a2af2cb2b6d083f684fe69ff57b5666faef 100644 (file)
--- 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 0fc0d11bb03c3f138fa2260d2aad34315ce92f20..3fd432e5c00d3b9933f79ee64fe7a02026b62fe0 100644 (file)
--- 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 ff81dd8aa8d9542fdcf95f39a9e55793c12cc641..9ede6dd9b12ca62dbb5fc236506ebf3265e2047d 100644 (file)
--- 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 95f8d20ebae15dbcfff98743e711a9d976ac85f2..8dd4f91efbacabda1f29d8b52930a5eb1184fccd 100644 (file)
--- 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 0cc3af75f6bc967c28352b8a041bf37e34dca406..489e4e35f95bfcf95849162dc9fd64128f7bc8d3 100644 (file)
--- 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 569fd982b625fc0458b2346917f7586fea302994..58c77deac7f228b8611051a6ce22df3215e37abb 100644 (file)
--- 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 e1d4aa6a72248b46c696c10d211a659bbb27ce02..ceca5ba9497593ece6818ec7223472791a67bf1c 100644 (file)
--- 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 1799cc1f3239b2e46fa8bcc49ddab453caaec136..a671611cd891cd3c39646eb9d329f98d741b45e8 100644 (file)
--- 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 9cd40a761647cc5d95c7c6a23d784049228c62ae..3584c27a61a81b10aead5ba32c69db9846e0a481 100644 (file)
--- 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 a680e762d710ec87aa0fd839276671f55132f112..9befb89b372b772977fddf7d4debc564237132dc 100644 (file)
--- 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 9c666430f5903b5770f02abf9436fb7a39f5a4bd..f0eba6bd8f65db3609348e2b06250ffbe2ec0642 100644 (file)
--- 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 5cf9ead20e1f86dcf1d0d7aa5cdc3504b7a89bd1..1fe6f2fa5e2cfeb6a3c427ecec4fd521f5e0219d 100644 (file)
--- 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 2b7dc7c2cfae01a49d919d40d78108a1b97f010a..1db18a4065c61cb1d44817c2511dbcca4c565f4e 100644 (file)
--- 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 75353cd11239e20237b65610f44a7f1f26f13afc..ce1ed5b2750b430e9ac528382a4c1a3e615a5df5 100644 (file)
--- 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 63568caa7859bfbb8935631e98ed9cdcf1abfcc4..16382f6f264b43895f5db7ba0e45808ec4db02d0 100644 (file)
--- 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 2ce8720b75c1a0882de4343c57097ad9fe2911b1..6ca69fb99623205b3622c8162589a6e005bf9de3 100644 (file)
--- 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 d09b863c86610df421a9a08ccf3ac5a653bce503..d6761ddad1d6e3750076f57bd3b2f0f745006e7b 100644 (file)
--- 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 4b17d780ae5cc0d9da1d836f42622d1a86053d84..a10dc123f2a93ab3f095f884e6798262cbade0d5 100644 (file)
--- 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 475461471f04cb8e47bf6dd517a7c8b58edfa2ce..ad9aca4cf394f5794c68287c3f95d7af8ae6f434 100644 (file)
--- 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 72e7dac7b213dfcd6378f138176036cd4eb3f4a2..c4d4b0c0fae0e1df5f62711642c047db3c8de444 100644 (file)
--- 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 379224dde4e501bc6e79cfd466d39f31129f8ab2..c6761921c76f276c1e544f44048946bb1d3a06dd 100644 (file)
--- 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 1f2e1c1c346c34107e010220af8812406f48f991..05a4e86511e5f1c32f6eb7be3fa012559479837a 100644 (file)
--- 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 7d4b43068b51428c8b31c3b4a3bc9da8287aa155..280da9d6cc59d0a51471209414e1eee3ec4375fe 100644 (file)
--- 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 0d78cfaed67815c8b531c754caa240c3646ab0ba..15e4b466252229cd024256a11eff1aa0c2f29385 100644 (file)
--- 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 8bb35716912a134d167da25addb55734c2fd5827..37a33e5ae016e4e32c8fc294c592419b582c7cab 100644 (file)
--- 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 d44cf786d706fc4ec6f41344ed70923dce9ee3d5..9c4d01e1d171a0cf3df7882960d7daad695007a4 100644 (file)
--- 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 3210c7fb66fed28289f785ca0235a1c8295a3336..0ef9929b883605534006efed0c0e0d8f2c39479c 100644 (file)
--- 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 4aefc85000ad00f51f134b6da3d229dc1ecb4455..a00af1a1fb3bd55b8d5402b67925e8abd69a5468 100644 (file)
--- 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 045f6028373c857c7cba839625485da996fb647d..27098eca734403e20da1a80ce09ce13ca9fa6da2 100644 (file)
--- 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 73c3c2ae485c79a1e10ce8609df10a2083157c1a..1a02ff5e09964dc3682c4fa7402a2be661940574 100644 (file)
--- 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 710994988e7eac1055082b34883e2f794c586749..3810fd948f0282d8d0a9ac4d497b89b9526adf83 100644 (file)
--- 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 d81351ee13ba09cff8b743be1988a1d7b9774a26..3aefe5b8624f7c722bbf0327441545765bc1ca4c 100644 (file)
--- 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 977b2c36438c21bfd5c2337f474272a7a671dd7a..121d339a16df44b64a9cd41c57e99f4177e6c03d 100644 (file)
--- 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 b260129ea5d5c07daa04ce0997367fe3e9f11a84..a9752ad7f63d634c31fbc6e97fa285dfde3884d2 100644 (file)
--- 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 782211d61e508fa7b6f23950358e308b02774774..623b238d4cfd9ddf608a74e7500a655fe6d2121a 100644 (file)
--- 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 20315546aae84f8114a404aaa6bfa3724bee83aa..148e561ed06250bc8dd2c997b155c08609c44936 100644 (file)
--- 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 09b9bd38ff458b42baaafc5f64949d7b958914f0..362d3a4143400d6f569f452e3d607e094173cc21 100644 (file)
--- 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 a7c7be7a2caa57246b2d32d1f859707665edfa28..73a2d190af9756bfe323c5723b35f989b48f969c 100644 (file)
--- 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 c2982f242fc1b42da120f53dd7bed3d503c1f73a..51c0ad65b1af4db90601b69edd60a028e89af161 100644 (file)
--- 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 7419b2ab4d261ef1ea0532a8c038eb22dd937833..5f0a955632b71c16aaedb438a8ef7a6c4449d115 100644 (file)
--- 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 1197b40b58b2286a09b07492fd10afdc063dc38b..1d8aed90ce32aa8f324c5137c7d8cc740974c83d 100644 (file)
--- 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 d20dd9c3c59cc42c9ad4d00e851c766f31d784bf..c02fe2a963ec4045414c8eb8a3b22f8d294882c5 100644 (file)
--- 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 7838805bc02e5ca7d0e9dc2094e0101166507bb3..b56a03e4e616b8c44552912f6f0e00139b53db7b 100644 (file)
--- 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 606a4fc13fe26699d011b966b4e9e74cbaecc786..a1d03acf2569bab6f511620b970d54ddf5f294c6 100644 (file)
--- 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 72da30143668254a471ed3c75ff756135191f7d0..7f5a3cadcb38db2dc373f1145bb63f94fac4c4e1 100644 (file)
--- 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 0fe40ee72f894208939a0ca6e531f36ca53ad8f7..b53ddacd887a5de9788390b3ff83bd7af47d723f 100644 (file)
--- 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 b63bdf1a05330a7a8bcd9b8477a531ec6d47da2a..bb1d1dbffa70cf5671c3e9f91ca82396a42ea34a 100644 (file)
--- 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 5626eb1b953f4db693023f4e9000058a6c304e24..032559633b045c8967c0d19a63afe07a7536a8ca 100644 (file)
--- 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 f8bd34dff70f08bfdc7ec16ad455b129e9601af9..1c44f76b17131b8d086d6355387ebf9e11ba4340 100644 (file)
--- 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 3fbac280db77e9bc1455effaac9f199a8fd6799a..bbd8ec5e3c8a8e41e7b6de52e9491dec4ad3ea4b 100644 (file)
--- 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 5289d302f62af51ecf437ae28846245973e6df5a..9559b503dbbed46e02bc9639ebe5ed81259073bf 100644 (file)
--- 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 c11f17caf88918fb897df34452ce68e6c264573e..7e993b8298a4d7ab66b950d716e5a7f13f86233c 100644 (file)
--- 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 5b2d0bf5365d35357420261c259a2ea5d569af76..a6fb9889be6a95b3a585579511745adf27aae44b 100644 (file)
--- 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 7cf5c2731f86de78804f7639224db36983a0a833..6d650b79dad2f9498aded8aab77be980a85b255d 100644 (file)
--- 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 ba1c3c0d74dee4d2333f9ff74e05d716732eb367..7d5988a1a50137276f0eee3c7b8275a7ad693073 100644 (file)
--- 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"