Makefile: drop unused cpp_cfg macro

[u-boot] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index f403906b6f90c3231f6e99c17157a01aeb3fad2b..8618376f252f68cbe30726b60dc64141d3521573 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -3,6 +3,7 @@ menu "Environment"
 config ENV_IS_NOWHERE
        bool "Environment is not stored"
        depends on !ENV_IS_IN_EEPROM
+       depends on !ENV_IS_IN_EXT4
        depends on !ENV_IS_IN_FAT
        depends on !ENV_IS_IN_FLASH
        depends on !ENV_IS_IN_MMC
@@ -15,7 +16,7 @@ config ENV_IS_NOWHERE
        default y
        help
          Define this if you don't want to or can't have an environment stored
-         on a storage medium. In this case the environemnt will still exist
+         on a storage medium. In this case the environment will still exist
          while U-Boot is running, but once U-Boot exits it will not be
          stored. U-Boot will therefore always start up with a default
          environment.
@@ -391,7 +392,7 @@ config ENV_FAT_DEVICE_AND_PART
                           partition table then means device D.
 
 config ENV_FAT_FILE
-       string "Name of the FAT file to use for the environemnt"
+       string "Name of the FAT file to use for the environment"
        depends on ENV_IS_IN_FAT
        default "uboot.env"
        help
@@ -423,7 +424,7 @@ config ENV_EXT4_DEVICE_AND_PART
                           partition table then means device D.
 
 config ENV_EXT4_FILE
-       string "Name of the EXT4 file to use for the environemnt"
+       string "Name of the EXT4 file to use for the environment"
        depends on ENV_IS_IN_EXT4
        default "uboot.env"
        help