diff --git a/README b/README
index a785dbfbca85b3572fbce4b470deab96006323b8..99c10c2f471ddcd0f4d407b1057361b8a847bf7e 100644
--- a/README
+++ b/README
@@ -833,7 +833,6 @@ The following options need to be configured:
 		CONFIG_CMD_ECHO		  echo arguments
 		CONFIG_CMD_EDITENV	  edit env variable
 		CONFIG_CMD_ELF		* bootelf, bootvx
-		CONFIG_CMD_ENV_FLAGS	* display details about env flags
 		CONFIG_CMD_ENV_EXISTS	* check existence of env variable
 		CONFIG_CMD_EXPORTENV	* export the environment
 		CONFIG_CMD_EXT2		* ext2 command support
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 3ac876403c1f9cbab3d119b647605cb7bef3a38c..ab09a9f52842d33d148bfca2f690b7c7847805e1 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -322,6 +322,14 @@ config CMD_ENV_CALLBACK
 	  For example changing "baudrate" adjust the serial baud rate. This
 	  command lists the currently defined callbacks.
 
+config CMD_ENV_FLAGS
+	bool "env flags -print variables that have non-default flags"
+	help
+	  Some environment variables have special flags that control their
+	  behaviour. For example, serial# can only be written once and cannot
+	  be deleted. This command shows the variables that have special
+	  flags.
+
 endmenu
 
 menu "Memory commands"
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 165e2eb4950593e739fe70a1d9184697d9ddda4a..2accd31229dc2f3589144b0e38aea5caeed6e6d2 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -13,6 +13,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n"
 CONFIG_AUTOBOOT_DELAY_STR="ids"
+CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 410277a2873139b2f78c315539b06d8d30e85abb..9e46fa6a3728ca5c18c889da28772f9ca8a95c6f 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_ENV_CALLBACK=y
+CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 090e057515773d2ec562564edbe33ca6aafb7cf8..4bf1f4b393ae1a224274469a74cef9c6a2ad5989 100644
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_ENV_CALLBACK=y
+CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index b623e297fbf7fd0895e99d348ac432b2124a9652..cbe4185b59a736d5ef862c99151bd50e002ca9e0 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_ENV_CALLBACK=y
+CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_MD5SUM=y
 CONFIG_LOOPW=y
 CONFIG_CMD_MEMTEST=y
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 17944a905817c0ff4c1ea37e91c9bd49157b5d39..69e2b9e3972c40d8b64f9f11dca95729dc712ea1 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -444,7 +444,6 @@
 #define CONFIG_UBOOTPATH		"ids8313/u-boot.bin"
 #define CONFIG_FDTFILE			"ids8313/ids8313.dtb"
 #define CONFIG_LOADADDR		0x400000
-#define CONFIG_CMD_ENV_FLAGS
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
 
 /* Initial Memory map for Linux*/
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 9aa18d465f33eaff32d339c31dbfc0d4b15de7ba..9d69fa2bc506bf9b7bbb7f420f9cabde534a6000 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -107,8 +107,6 @@
 
 #define CONFIG_CMD_SANDBOX
 
-#define CONFIG_CMD_ENV_FLAGS
-
 #define CONFIG_BOOTARGS ""
 
 #ifndef SANDBOX_NO_SDL
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0cece7d7043186226ce61c20814d2c0b7f03f212..e51ddb832deca30be0813e14049d067f72f75341 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ENV_FLAGS
 CONFIG_CMD_ERRATA
 CONFIG_CMD_ESBC_VALIDATE
 CONFIG_CMD_ETHSW