[PoC 140/241] global: Migrate CONFIG_OVERWRITE_ETHADDR_ONCE to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 README                       | 2 +-
 include/configs/M5253DEMO.h  | 2 +-
 include/configs/M5275EVB.h   | 2 +-
 include/configs/eb_cpu5282.h | 2 +-
 include/env_flags.h          | 2 +-
 scripts/config_whitelist.txt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README b/README
index f5b4669b97c7..d3659e7b54a2 100644
--- a/README
+++ b/README
@@ -1123,7 +1123,7 @@ The following options need to be configured:
 		these parameters.
 
 		Alternatively, if you define _both_ an ethaddr in the
-		default env _and_ CONFIG_OVERWRITE_ETHADDR_ONCE, a default
+		default env _and_ CFG_OVERWRITE_ETHADDR_ONCE, a default
 		Ethernet address is installed in the environment,
 		which can be changed exactly ONCE by the user. [The
 		serial# is unaffected by this, i. e. it remains
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index bf31d203e664..3bb22b8d50cd 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -26,7 +26,7 @@
 #	undef CONFIG_DM9000_DEBUG
 #	define CFG_DM9000_BYTE_SWAPPED
 
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 
 #	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 951209fbd750..9f73237749aa 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -39,7 +39,7 @@
 #define CFG_SYS_I2C_PINMUX_SET	(0x000F)
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
+#	define CFG_OVERWRITE_ETHADDR_ONCE
 #endif				/* FEC_ENET */
 
 #define CFG_EXTRA_ENV_SETTINGS		\
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index e8d85bdd78f2..49bf6fa4a280 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -45,7 +45,7 @@
  *----------------------------------------------------------------------*/
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_OVERWRITE_ETHADDR_ONCE
+#define CFG_OVERWRITE_ETHADDR_ONCE
 #endif
 
 /*-------------------------------------------------------------------------
diff --git a/include/env_flags.h b/include/env_flags.h
index e4e40169aed0..de1cdd013cda 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -48,7 +48,7 @@ enum env_flags_varaccess {
 #ifdef CONFIG_ENV_OVERWRITE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma,"
 #else
-#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
+#ifdef CFG_OVERWRITE_ETHADDR_ONCE
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc,"
 #else
 #define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo,"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a5c5644e65dd..cb85e39ad2cd 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -149,7 +149,7 @@ CFG_NORBOOT
 CFG_NUM_DSP_CPUS
 CFG_ODROID_REV_AIN
 CFG_OTHBOOTARGS
-CONFIG_OVERWRITE_ETHADDR_ONCE
+CFG_OVERWRITE_ETHADDR_ONCE
 CONFIG_PCIE_IMX_PERST_GPIO
 CONFIG_PCIE_IMX_POWER_GPIO
 CONFIG_PEN_ADDR_BIG_ENDIAN
-- 
2.25.1