Merge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze

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

diff --git a/Kconfig b/Kconfig
index 73f820a6de51cd3d47c531b960f25f28c71d8436..e57fad45922b07d01789296cfa474492baac5a81 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -14,6 +14,12 @@ source "arch/Kconfig"
 
 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
@@ -158,6 +164,15 @@ config PHYS_64BIT
          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"