arm: imx: make bmode command work with SPL/U-Boot combo

[karo-tx-uboot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index cbb691e160868a16293229854cd13517c79bcde4..f34f341dd72777151faeacb76d70e8e838c702ee 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -70,8 +70,15 @@ config TPL_BUILD
        depends on $KCONFIG_OBJDIR="tpl"
        default y
 
        depends on $KCONFIG_OBJDIR="tpl"
        default y
 

+config SUPPORT_SPL
+       bool
+
+config SUPPORT_TPL
+       bool
+

 config SPL
        bool
 config SPL
        bool

+       depends on SUPPORT_SPL

        prompt "Enable SPL" if !SPL_BUILD
        default y if SPL_BUILD
        help
        prompt "Enable SPL" if !SPL_BUILD
        default y if SPL_BUILD
        help


@@ -79,7 +86,7 @@ config SPL
 
 config TPL
        bool
 
 config TPL
        bool

-       depends on SPL
+       depends on SPL && SUPPORT_TPL

        prompt "Enable TPL" if !SPL_BUILD
        default y if TPL_BUILD
        default n
        prompt "Enable TPL" if !SPL_BUILD
        default y if TPL_BUILD
        default n


@@ -91,7 +98,7 @@ config SYS_EXTRA_OPTIONS
        depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)
        depends on !SPL_BUILD
        help
          The old configuration infrastructure (= mkconfig + boards.cfg)

-         provided the extra options field. It you have something like
+         provided the extra options field. If you have something like

          "HAS_BAR,BAZ=64", the optional options
            #define CONFIG_HAS
            #define CONFIG_BAZ  64
          "HAS_BAR,BAZ=64", the optional options
            #define CONFIG_HAS
            #define CONFIG_BAZ  64


@@ -100,6 +107,24 @@ config SYS_EXTRA_OPTIONS
          configuration to Kconfig. Since this option will be removed sometime,
          new boards should not use this option.
 
          configuration to Kconfig. Since this option will be removed sometime,
          new boards should not use this option.
 

+config SYS_TEXT_BASE
+       depends on SPARC
+       hex "Text Base"
+       help
+         TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
+

 endmenu                # Boot images
 
 source "arch/Kconfig"
 endmenu                # Boot images
 
 source "arch/Kconfig"

+
+source "common/Kconfig"
+
+source "dts/Kconfig"
+
+source "net/Kconfig"
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "lib/Kconfig"