Makefile: drop unused cpp_cfg macro

[u-boot] / env / Kconfig

diff --git a/env/Kconfig b/env/Kconfig
index a3c6298273ed8709e51e1d2b97cbac37484a8520..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
 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
        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
        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.
          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.


@@ -152,7 +153,6 @@ config ENV_IS_IN_MMC
        bool "Environment in an MMC device"
        depends on !CHAIN_OF_TRUST
        depends on MMC
        bool "Environment in an MMC device"
        depends on !CHAIN_OF_TRUST
        depends on MMC

-       default y if ARCH_SUNXI

        default y if ARCH_EXYNOS4
        default y if MX6SX || MX7D
        default y if TEGRA30 || TEGRA124
        default y if ARCH_EXYNOS4
        default y if MX6SX || MX7D
        default y if TEGRA30 || TEGRA124


@@ -360,12 +360,6 @@ config ENV_IS_IN_UBI
          the environment in.  This will enable redundant environments in UBI.
          It is assumed that both volumes are in the same MTD partition.
 
          the environment in.  This will enable redundant environments in UBI.
          It is assumed that both volumes are in the same MTD partition.
 

-         - CONFIG_UBI_SILENCE_MSG
-         - CONFIG_UBIFS_SILENCE_MSG
-
-         You will probably want to define these to avoid a really noisy system
-         when storing the env in UBI.
-

 config ENV_FAT_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_FAT
 config ENV_FAT_INTERFACE
        string "Name of the block device for the environment"
        depends on ENV_IS_IN_FAT


@@ -398,7 +392,7 @@ config ENV_FAT_DEVICE_AND_PART
                           partition table then means device D.
 
 config ENV_FAT_FILE
                           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
        depends on ENV_IS_IN_FAT
        default "uboot.env"
        help


@@ -430,7 +424,7 @@ config ENV_EXT4_DEVICE_AND_PART
                           partition table then means device D.
 
 config ENV_EXT4_FILE
                           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
        depends on ENV_IS_IN_EXT4
        default "uboot.env"
        help


@@ -486,4 +480,29 @@ config ENV_SIZE
 
 endif
 
 
 endif
 

+config USE_DEFAULT_ENV_FILE
+       bool "Create default environment from file"
+       help
+         Normally, the default environment is automatically generated
+         based on the settings of various CONFIG_* options, as well
+         as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
+         you can instead define the entire default environment in an
+         external file.
+
+config DEFAULT_ENV_FILE
+       string "Path to default environment file"
+       depends on USE_DEFAULT_ENV_FILE
+       help
+         The path containing the default environment. The format is
+         the same as accepted by the mkenvimage tool: lines
+         containing key=value pairs, blank lines and lines beginning
+         with # are ignored.
+
+config ENV_VARS_UBOOT_RUNTIME_CONFIG
+       bool "Add run-time information to the environment"
+       help
+         Enable this in order to add variables describing certain
+         run-time determined information about the hardware to the
+         environment.  These will be named board_name, board_rev.
+

 endmenu
 endmenu