diff --git a/uboot-5.x.x.x/common/cmd_nvedit.c b/uboot-5.x.x.x/common/cmd_nvedit.c
index 7521b88..333bf85 100644
--- a/uboot-5.x.x.x/common/cmd_nvedit.c
+++ b/uboot-5.x.x.x/common/cmd_nvedit.c
@@ -195,7 +195,7 @@ int _do_setenv (int flag, int argc, char *argv[])
 		if ( (strcmp (name, "serial#") == 0) ||
 		    ((strcmp (name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
-		     && (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
+		     && (strcmp (env_get_addr(oldval),CONFIG_ETHADDR) != 0)
 #endif	/* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
 		    ) ) {
 			printf ("Can't overwrite \"%s\"\n", name);
diff --git a/uboot-5.x.x.x/common/env_common.c b/uboot-5.x.x.x/common/env_common.c
index 0d7647f..12f2bd6 100644
--- a/uboot-5.x.x.x/common/env_common.c
+++ b/uboot-5.x.x.x/common/env_common.c
@@ -86,16 +86,16 @@ uchar default_environment[] = {
 	"loads_echo="	MK_STR(CONFIG_LOADS_ECHO)	"\0"
 #endif
 #ifdef	CONFIG_ETHADDR
-	"ethaddr="	MK_STR(CONFIG_ETHADDR)		"\0"
+	"ethaddr="	CONFIG_ETHADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH1ADDR
-	"eth1addr="	MK_STR(CONFIG_ETH1ADDR)		"\0"
+	"eth1addr="	CONFIG_ETH1ADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH2ADDR
-	"eth2addr="	MK_STR(CONFIG_ETH2ADDR)		"\0"
+	"eth2addr="	CONFIG_ETH2ADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH3ADDR
-	"eth3addr="	MK_STR(CONFIG_ETH3ADDR)		"\0"
+	"eth3addr="	CONFIG_ETH3ADDR			"\0"
 #endif
 #ifdef	CONFIG_IPADDR
 	"ipaddr=" MK_STR(CONFIG_IPADDR)		"\0"
diff --git a/uboot-5.x.x.x/common/environment.c b/uboot-5.x.x.x/common/environment.c
index ce06bf6..0920845 100644
--- a/uboot-5.x.x.x/common/environment.c
+++ b/uboot-5.x.x.x/common/environment.c
@@ -122,16 +122,16 @@ env_t environment __PPCENV__ = {
 	"loads_echo="	MK_STR(CONFIG_LOADS_ECHO)	"\0"
 #endif
 #ifdef	CONFIG_ETHADDR
-	"ethaddr="	MK_STR(CONFIG_ETHADDR)		"\0"
+	"ethaddr="	CONFIG_ETHADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH1ADDR
-	"eth1addr="	MK_STR(CONFIG_ETH1ADDR)		"\0"
+	"eth1addr="	CONFIG_ETH1ADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH2ADDR
-	"eth2addr="	MK_STR(CONFIG_ETH2ADDR)		"\0"
+	"eth2addr="	CONFIG_ETH2ADDR			"\0"
 #endif
 #ifdef	CONFIG_ETH3ADDR
-	"eth3addr="	MK_STR(CONFIG_ETH3ADDR)		"\0"
+	"eth3addr="	CONFIG_ETH3ADDR			"\0"
 #endif
 #ifdef	CONFIG_ETHPRIME
 	"ethprime="	CONFIG_ETHPRIME			"\0"
diff --git a/uboot-5.x.x.x/config.in b/uboot-5.x.x.x/config.in
index 4d012b8..5e44467 100644
--- a/uboot-5.x.x.x/config.in
+++ b/uboot-5.x.x.x/config.in
@@ -1810,6 +1810,10 @@ else
 define_hex TEXT_BASE  0xBC000000
 fi
 
+fi
+bool 'Allow env overwriting'			CONFIG_ENV_OVERWRITE			y
+if [ "$CONFIG_ENV_OVERWRITE" = "y" ]; then
+bool 'Allow setting ethaddr env only once'	CONFIG_OVERWRITE_ETHADDR_ONCE		n
 fi
 ##################################################################################################
 comment ""