Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index c1451bceda1bdd2f8e76c190a2c9c6fa84026c43..efd77f3129f9f1fe08eb72669a7ca92ae951d553 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -14,6 +14,12 @@ source "arch/Kconfig"
 
 menu "General setup"
 
 
 menu "General setup"
 

+config BROKEN
+       bool
+       help
+         This option cannot be enabled. It is used as dependency
+         for broken and incomplete features.
+

 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help


@@ -60,22 +66,59 @@ config DISTRO_DEFAULTS
        default y if ARCH_MESON
        default y if ARCH_ROCKCHIP
        default n
        default y if ARCH_MESON
        default y if ARCH_ROCKCHIP
        default n

+       imply USE_BOOTCOMMAND

        select CMD_BOOTZ if ARM && !ARM64
        select CMD_BOOTI if ARM64
        select CMD_BOOTZ if ARM && !ARM64
        select CMD_BOOTI if ARM64

-       select CMD_DHCP
-       select CMD_PXE
+       select CMD_DHCP if NET
+       select CMD_PXE if NET

        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
        select CMD_FS_GENERIC
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
        select CMD_FS_GENERIC

-       select CMD_MII
-       select CMD_PING
-       select CMD_PART
+       select CMD_MII if NET
+       select CMD_PING if NET
+       select CMD_PART if PARTITIONS

        select HUSH_PARSER
        select HUSH_PARSER

+       select BOOTP_BOOTPATH if NET
+       select BOOTP_DNS if NET
+       select BOOTP_GATEWAY if NET
+       select BOOTP_HOSTNAME if NET
+       select BOOTP_PXE if NET
+       select BOOTP_SUBNETMASK if NET
+       select CMDLINE_EDITING
+       select AUTO_COMPLETE
+       select SYS_LONGHELP
+       select SUPPORT_RAW_INITRD
+       select ENV_VARS_UBOOT_CONFIG

        help
          Select this to enable various options and commands which are suitable
          for building u-boot for booting general purpose Linux distributions.
 
        help
          Select this to enable various options and commands which are suitable
          for building u-boot for booting general purpose Linux distributions.
 

+config ENV_VARS_UBOOT_CONFIG
+       bool "Add arch, board, vendor and soc variables to default environment"
+       help
+         Define this in order to add variables describing the
+         U-Boot build configuration to the default environment.
+         These will be named arch, cpu, board, vendor, and soc.
+         Enabling this option will cause the following to be defined:
+         - CONFIG_SYS_ARCH
+         - CONFIG_SYS_CPU
+         - CONFIG_SYS_BOARD
+         - CONFIG_SYS_VENDOR
+         - CONFIG_SYS_SOC
+
+config SYS_BOOT_GET_CMDLINE
+       bool "Enable kernel command line setup"
+       help
+         Enables allocating and saving kernel cmdline in space between
+         "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
+config SYS_BOOT_GET_KBD
+       bool "Enable kernel board information setup"
+       help
+         Enables allocating and saving a kernel copy of the bd_info in
+         space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
+

 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM


@@ -96,7 +139,17 @@ config SYS_MALLOC_F_LEN
          initial serial device and any others that are needed.
 
 config SPL_SYS_MALLOC_F_LEN
          initial serial device and any others that are needed.
 
 config SPL_SYS_MALLOC_F_LEN

-        hex "Size of malloc() pool in spl before relocation"
+        hex "Size of malloc() pool in SPL before relocation"
+        depends on SYS_MALLOC_F
+        default SYS_MALLOC_F_LEN
+        help
+          Before relocation, memory is very limited on many platforms. Still,
+          we can provide a small malloc() pool if needed. Driver model in
+          particular needs this to operate, so that it can allocate the
+          initial serial device and any others that are needed.
+
+config TPL_SYS_MALLOC_F_LEN
+        hex "Size of malloc() pool in TPL before relocation"

         depends on SYS_MALLOC_F
         default SYS_MALLOC_F_LEN
         help
         depends on SYS_MALLOC_F
         default SYS_MALLOC_F_LEN
         help


@@ -148,10 +201,26 @@ config PHYS_64BIT
          This can be used not only for 64bit SoCs, but also for
          large physical address extention on 32bit SoCs.
 
          This can be used not only for 64bit SoCs, but also for
          large physical address extention on 32bit SoCs.
 

+config BUILD_ROM
+       bool "Build U-Boot as BIOS replacement"
+       depends on X86
+       help
+         This option allows to build a ROM version of U-Boot.
+         The build process generally requires several binary blobs
+         which are not shipped in the U-Boot source tree.
+         Please, see doc/README.x86 for details.
+

 endmenu                # General setup
 
 menu "Boot images"
 
 endmenu                # General setup
 
 menu "Boot images"
 

+config ANDROID_BOOT_IMAGE
+       bool "Enable support for Android Boot Images"
+       default y if FASTBOOT
+       help
+         This enables support for booting images which use the Android
+         image format header.
+

 config FIT
        bool "Support Flattened Image Tree"
        select MD5
 config FIT
        bool "Support Flattened Image Tree"
        select MD5


@@ -256,7 +325,7 @@ config SPL_LOAD_FIT
 
 config SPL_FIT_IMAGE_POST_PROCESS
        bool "Enable post-processing of FIT artifacts after loading by the SPL"
 
 config SPL_FIT_IMAGE_POST_PROCESS
        bool "Enable post-processing of FIT artifacts after loading by the SPL"

-       depends on SPL_LOAD_FIT && TI_SECURE_DEVICE
+       depends on SPL_LOAD_FIT

        help
          Allows doing any sort of manipulation to blobs after they got extracted
          from the U-Boot FIT image like stripping off headers or modifying the
        help
          Allows doing any sort of manipulation to blobs after they got extracted
          from the U-Boot FIT image like stripping off headers or modifying the


@@ -333,13 +402,13 @@ config SYS_EXTRA_OPTIONS
          new boards should not use this option.
 
 config SYS_TEXT_BASE
          new boards should not use this option.
 
 config SYS_TEXT_BASE

-       depends on ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
-               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \
-               ARCH_ZYNQ || ARCH_KEYSTONE
+       depends on !NIOS2 && !XTENSA

        depends on !EFI_APP
        depends on !EFI_APP

+       default 0x80800000 if ARCH_OMAP2PLUS

        hex "Text Base"
        help
        hex "Text Base"
        help

-         TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
+         The address in memory that U-Boot will be running from, initially.
+

 
 
 config SYS_CLK_FREQ
 
 
 config SYS_CLK_FREQ


@@ -368,6 +437,8 @@ source "disk/Kconfig"
 
 source "dts/Kconfig"
 
 
 source "dts/Kconfig"
 

+source "env/Kconfig"
+

 source "net/Kconfig"
 
 source "drivers/Kconfig"
 source "net/Kconfig"
 
 source "drivers/Kconfig"


@@ -377,5 +448,3 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"

-
-source "scripts/Kconfig"