Kconfig: Test for !COMPILE_TEST in some locations

We have a few options that we cannot enable in a "allyesconfig" type
build because we cannot use zero as a default value.

- The logic around HAS_BOARD_SIZE_LIMIT assumes that if we have set this
  then we compare with it. Similarly, we need to set SPL_NO_BSS_LIMIT as
  the default there.
- Both SYS_CUSTOM_LDSCRIPT and ENV_USE_DEFAULT_ENV_TEXT_FILE then prompt
  for a file name to use.
- The SYS_I2C_SOFT driver is a legacy driver which requires a lot of
  configuration within the board config. file instead, so disable it.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index 3571f5214e67c6a3907f9f7cc7ee0041364edf4b..c883f11545952588aff574fdceb88b43407352d9 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -537,6 +537,7 @@ config BUILD_TARGET
 
 config HAS_BOARD_SIZE_LIMIT
        bool "Define a maximum size for the U-Boot image"
+       depends on !COMPILE_TEST
        default y if RCAR_32 || RCAR_64
        help
          In some cases, we need to enforce a hard limit on how big the U-Boot
@@ -555,6 +556,7 @@ config BOARD_SIZE_LIMIT
 
 config SYS_CUSTOM_LDSCRIPT
        bool "Use a custom location for the U-Boot linker script"
+       depends on !COMPILE_TEST
        help
          Normally when linking U-Boot we will look in the board directory,
          the CPU directory and finally the "cpu" directory of the architecture

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 4e26b3940d80c5287dfd2ec19d23040b595c547b..f69eff2110708c4af5799d83a86fe5d5a414f902 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -132,6 +132,7 @@ config SPL_BSS_START_ADDR
 choice
        prompt "Enforce SPL BSS limit"
        depends on !PPC
+       default SPL_NO_BSS_LIMIT if COMPILE_TEST
        default SPL_BSS_LIMIT
        help
          In some platforms we only want to enforce a limit on the size of the

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 146bc621c7e41d004508ac0737807d223db2d47e..775b2b4e9af1902db8c51a58c39231b962436c4e 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -615,6 +615,7 @@ endif
 
 config SYS_I2C_SOFT
        bool "Legacy software I2C interface"
+       depends on !COMPILE_TEST
        help
          Enable the legacy software defined I2C interface
 

diff --git a/env/Kconfig b/env/Kconfig
index c30785de48b176d5760ee69175f87237394892ca..c667e8f2da197d149545f582fabe85068c77494d 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -759,6 +759,7 @@ config SCSI_ENV_PART_UUID
 
 config ENV_USE_DEFAULT_ENV_TEXT_FILE
        bool "Create default environment from file"
+       depends on !COMPILE_TEST
        help
          Normally, the default environment is automatically generated
          based on the settings of various CONFIG_* options, as well