[PoC 054/241] global: Migrate CONFIG_HOSTNAME to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:30:45 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/M5208EVBE.h           | 2 +-
 include/configs/M5235EVB.h            | 2 +-
 include/configs/M5253DEMO.h           | 2 +-
 include/configs/M5272C3.h             | 2 +-
 include/configs/M5282EVB.h            | 2 +-
 include/configs/M53017EVB.h           | 2 +-
 include/configs/M5329EVB.h            | 2 +-
 include/configs/M5373EVB.h            | 2 +-
 include/configs/MPC837XERDB.h         | 2 +-
 include/configs/MPC8548CDS.h          | 2 +-
 include/configs/amcore.h              | 2 +-
 include/configs/aristainetos2.h       | 2 +-
 include/configs/bcm_ns3.h             | 2 +-
 include/configs/controlcenterdc.h     | 2 +-
 include/configs/gazerbeam.h           | 2 +-
 include/configs/km/km-powerpc.h       | 2 +-
 include/configs/km/pg-wcom-ls102xa.h  | 2 +-
 include/configs/kmcent2.h             | 6 +++---
 include/configs/kmcoge5ne.h           | 2 +-
 include/configs/kmeter1.h             | 2 +-
 include/configs/kmopti2.h             | 2 +-
 include/configs/kmsupx5.h             | 2 +-
 include/configs/kmtepr2.h             | 2 +-
 include/configs/kontron-sl-mx6ul.h    | 2 +-
 include/configs/kontron-sl-mx8mm.h    | 2 +-
 include/configs/m53menlo.h            | 2 +-
 include/configs/microblaze-generic.h  | 2 +-
 include/configs/novena.h              | 2 +-
 include/configs/p1_p2_rdb_pc.h        | 2 +-
 include/configs/pg-wcom-expu1.h       | 2 +-
 include/configs/pg-wcom-seli8.h       | 2 +-
 include/configs/socfpga_vining_fpga.h | 2 +-
 include/configs/stmark2.h             | 2 +-
 include/configs/tuge1.h               | 2 +-
 include/configs/tuxx1.h               | 2 +-
 include/configs/usbarmory.h           | 2 +-
 include/configs/x86-common.h          | 2 +-
 include/configs/xea.h                 | 2 +-
 include/env_default.h                 | 4 ++--
 scripts/config_whitelist.txt          | 2 +-
 40 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 83ffe7ce76d9..ce75c4cbcaf0 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -24,7 +24,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5208EVBe"
+#define CFG_HOSTNAME		"M5208EVBe"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index fc56834bd9be..8cebf099f1db 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -33,7 +33,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5235EVB"
+#define CFG_HOSTNAME		"M5235EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index a1cb1a8a7022..bf31d203e664 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -42,7 +42,7 @@
 		""
 #endif
 
-#define CONFIG_HOSTNAME		"M5253DEMO"
+#define CFG_HOSTNAME		"M5253DEMO"
 
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(*(u32 *) (CFG_SYS_MBAR+0x19C))
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 78eeca342c82..10bfb01a2e03 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5272C3"
+#define CFG_HOSTNAME		"M5272C3"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index afc19de8ce73..b69e452b9e50 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5282EVB"
+#define CFG_HOSTNAME		"M5282EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 1fcc34184928..ce38b823436d 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -37,7 +37,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M53017"
+#define CFG_HOSTNAME		"M53017"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index a49cf6dacb81..2dc22a0b5af8 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -29,7 +29,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5329EVB"
+#define CFG_HOSTNAME		"M5329EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 53434881f4c7..bce4a8470f91 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -31,7 +31,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5373EVB"
+#define CFG_HOSTNAME		"M5373EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index dc7fe06ceb4b..4c3acd5b013b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -225,7 +225,7 @@
 
 #define CONFIG_NETDEV		"eth1"
 
-#define CONFIG_HOSTNAME		"mpc837x_rdb"
+#define CFG_HOSTNAME		"mpc837x_rdb"
 #define CONFIG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH	"u-boot.bin"
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index e93b3cb97517..2ce8597c0c52 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -327,7 +327,7 @@
 
 #define CONFIG_IPADDR	 192.168.1.253
 
-#define CONFIG_HOSTNAME	 "unknown"
+#define CFG_HOSTNAME	 "unknown"
 #define CONFIG_ROOTPATH	 "/nfsroot"
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 78060d432a86..18244d1be4c2 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -8,7 +8,7 @@
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_HOSTNAME			"AMCORE"
+#define CFG_HOSTNAME			"AMCORE"
 
 #define CFG_SYS_UART_PORT		0
 
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 9b11934546c1..271d15dc5e50 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -11,7 +11,7 @@
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
-#define CONFIG_HOSTNAME		"aristainetos2"
+#define CFG_HOSTNAME		"aristainetos2"
 
 #if (CONFIG_SYS_BOARD_VERSION == 5)
 #define CONSOLE_DEV	"ttymxc1"
diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 70dd2802686f..84a72bff24f0 100644
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -9,7 +9,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_HOSTNAME			"NS3"
+#define CFG_HOSTNAME			"NS3"
 
 /* Physical Memory Map */
 #define V2M_BASE			0x80000000
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 8b31e14df31a..9cb194643492 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -21,7 +21,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_HOSTNAME		"ccdc"
+#define CFG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS						\
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 7ab504f35531..f86eb4c40354 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -56,7 +56,7 @@
  */
 
 /* TODO: Turn into string option and migrate to Kconfig */
-#define CONFIG_HOSTNAME		"gazerbeam"
+#define CFG_HOSTNAME		"gazerbeam"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 424caa0df977..f6c21e1666d1 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -31,7 +31,7 @@
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
-	"u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
 		"erase " __stringify(BOOTFLASH_START) "  +${filesize} && "\
diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 64fb706a1ce6..ddeabc0f79ce 100644
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -188,7 +188,7 @@
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"			\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"			\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 639f2075e69f..729278ebb246 100644
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -8,8 +8,8 @@
 #ifndef __KMCENT2_H
 #define __KMCENT2_H
 
-#define CONFIG_HOSTNAME		"kmcent2"
-#define KM_BOARD_NAME	CONFIG_HOSTNAME
+#define CFG_HOSTNAME		"kmcent2"
+#define KM_BOARD_NAME	CFG_HOSTNAME
 
 /*
  * The Linux fsl_fman driver needs to be able to process frames with more
@@ -401,7 +401,7 @@ int get_scl(void);
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 6b30fb4b617e..8681145c309f 100644
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmcoge5ne"
+#define CFG_HOSTNAME		"kmcoge5ne"
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 910fc1b2cb25..deffde289601 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmeter1"
+#define CFG_HOSTNAME		"kmeter1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h
index 5050c7030390..32f5089656d9 100644
--- a/include/configs/kmopti2.h
+++ b/include/configs/kmopti2.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmopti2"
+#define CFG_HOSTNAME		"kmopti2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index e3de6c61e71c..2e666c45dc80 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmsupx5"
+#define CFG_HOSTNAME		"kmsupx5"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h
index a4ceb1c50d6b..e41a61f9d9d0 100644
--- a/include/configs/kmtepr2.h
+++ b/include/configs/kmtepr2.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME         "kmtepr2"
+#define CFG_HOSTNAME         "kmtepr2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 81ca83fdbfab..e57ae20a74ea 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -23,7 +23,7 @@
 
 /* Board and environment settings */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_HOSTNAME			"kontron-mx6ul"
+#define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 2e21aacd1893..56d0036147c6 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -23,7 +23,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x200000
 
 /* Board and environment settings */
-#define CONFIG_HOSTNAME			"kontron-mx8mm"
+#define CFG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 4123964256bd..979fddab5e32 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -84,7 +84,7 @@
 /*
  * Extra Environments
  */
-#define CONFIG_HOSTNAME		"m53menlo"
+#define CFG_HOSTNAME		"m53menlo"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ede4ffd53f4e..53498e1c78d8 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -16,7 +16,7 @@
 # define CFG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define	CONFIG_HOSTNAME		"microblaze-generic"
+#define	CFG_HOSTNAME		"microblaze-generic"
 
 /* architecture dependent code */
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 19b40070be92..520c4ba130f1 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -25,7 +25,7 @@
  */
 
 /* Booting Linux */
-#define CONFIG_HOSTNAME			"novena"
+#define CFG_HOSTNAME			"novena"
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 93909eda55dd..de6440a07564 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -418,7 +418,7 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_HOSTNAME		"unknown"
+#define CFG_HOSTNAME		"unknown"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h
index 1b72739d143d..5b5637762aca 100644
--- a/include/configs/pg-wcom-expu1.h
+++ b/include/configs/pg-wcom-expu1.h
@@ -7,7 +7,7 @@
 #define __CONFIG_PG_WCOM_EXPU1_H
 
 #define WCOM_EXPU1
-#define CONFIG_HOSTNAME				"EXPU1"
+#define CFG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h
index e4bcae5bb5e1..a1c1ca993d7e 100644
--- a/include/configs/pg-wcom-seli8.h
+++ b/include/configs/pg-wcom-seli8.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_HOSTNAME			"SELI8"
+#define CFG_HOSTNAME			"SELI8"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index cd48650dd554..31ebf34c1c68 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -13,7 +13,7 @@
 /* Booting Linux */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			"socfpga_vining_fpga"
+#define CFG_HOSTNAME			"socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index be0193105b4b..63040adf97cb 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -8,7 +8,7 @@
 #ifndef __STMARK2_CONFIG_H
 #define __STMARK2_CONFIG_H
 
-#define CONFIG_HOSTNAME			"stmark2"
+#define CFG_HOSTNAME			"stmark2"
 
 #define CFG_SYS_UART_PORT		0
 
diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h
index d43ccbe8dd94..7ddb44124c2f 100644
--- a/include/configs/tuge1.h
+++ b/include/configs/tuge1.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuge1"
+#define CFG_HOSTNAME		"tuge1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 7eed31c35f03..d18c57c4d198 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuxx1"
+#define CFG_HOSTNAME		"tuxx1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f273533be429..b2153b441142 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -28,7 +28,7 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* Linux boot */
-#define CONFIG_HOSTNAME		"usbarmory"
+#define CFG_HOSTNAME		"usbarmory"
 
 #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
 
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7705d31a313a..fdd7dba9a6f2 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -42,7 +42,7 @@
 
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_HOSTNAME		"x86"
+#define CFG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS	"othbootargs=\0"
diff --git a/include/configs/xea.h b/include/configs/xea.h
index 50b96f31e163..974ed4224bc5 100644
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -26,7 +26,7 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		"xea"
+#define CFG_HOSTNAME		"xea"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
diff --git a/include/env_default.h b/include/env_default.h
index 7d0af83a5913..b1fe945bae5b 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -74,8 +74,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_NETMASK
 	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
 #endif
-#ifdef	CONFIG_HOSTNAME
-	"hostname="	CONFIG_HOSTNAME	"\0"
+#ifdef	CFG_HOSTNAME
+	"hostname="	CFG_HOSTNAME	"\0"
 #endif
 #ifdef CONFIG_USE_BOOTFILE
 	"bootfile="	CONFIG_BOOTFILE			"\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9079fbb2e3f6..0fc29f456c13 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -54,7 +54,7 @@ CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HOSTNAME
+CFG_HOSTNAME
 CONFIG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
-- 
2.25.1



More information about the U-Boot mailing list