These 2 options are no longer needed as now binman is used to build
u-boot.rom.
Signed-off-by: Bin Meng <bmeng...@gmail.com>
---
Kconfig | 21 ---------------------
arch/x86/Kconfig | 2 --
arch/x86/cpu/quark/Kconfig | 1 -
doc/arch/x86.rst | 13 ++-----------
4 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/Kconfig b/Kconfig
index 76c0cdacb0..a6c42b902f 100644
--- a/Kconfig
+++ b/Kconfig
@@ -343,27 +343,6 @@ config HAS_ROM
Enables building of a u-boot.rom target. This collects U-Boot and
any necessary binary blobs.
-config ROM_NEEDS_BLOBS
- bool
- depends on HAS_ROM
- help
- Enable this if building the u-boot.rom target needs binary blobs, and
- so cannot be done normally. In this case, U-Boot will only build the
- ROM if the required blobs exist. If not, you will see an warning like:
-
- Image 'main-section' is missing external blobs and is
non-functional:
- intel-descriptor intel-me intel-refcode intel-vga intel-mrc
-
-config BUILD_ROM
- bool "Build U-Boot as BIOS replacement"
- depends on HAS_ROM
- default y if !ROM_NEEDS_BLOBS
- 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/arch/x86.rst for details.
-
config SPL_IMAGE
string "SPL image used in the combined SPL+U-Boot image"
default "spl/boot.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 970bdff37f..300b48505e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -364,7 +364,6 @@ config HAVE_FSP
depends on !EFI
select USE_HOB
select HAS_ROM
- select ROM_NEEDS_BLOBS
help
Select this option to add an Firmware Support Package binary to
the resulting U-Boot image. It is a binary blob which U-Boot uses
@@ -525,7 +524,6 @@ config ENABLE_MRC_CACHE
config HAVE_MRC
bool "Add a System Agent binary"
select HAS_ROM
- select ROM_NEEDS_BLOBS
depends on !HAVE_FSP
help
Select this option to add a System Agent binary to
diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig
index 2fee38aed7..430cce184d 100644
--- a/arch/x86/cpu/quark/Kconfig
+++ b/arch/x86/cpu/quark/Kconfig
@@ -24,7 +24,6 @@ if INTEL_QUARK
config HAVE_RMU
bool "Add a Remote Management Unit (RMU) binary"
- select ROM_NEEDS_BLOBS
help
Select this option to add a Remote Management Unit (RMU) binary
to the resulting U-Boot image. It is a data block (up to 64K) of
diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst
index 2ebfed871b..0fdd43be80 100644
--- a/doc/arch/x86.rst
+++ b/doc/arch/x86.rst
@@ -42,17 +42,8 @@ Build Instructions for U-Boot as BIOS replacement (bare mode)
-------------------------------------------------------------
Building a ROM version of U-Boot (hereafter referred to as u-boot.rom) is a
little bit tricky, as generally it requires several binary blobs which are not
-shipped in the U-Boot source tree. Due to this reason, the u-boot.rom build is
-not turned on by default in the U-Boot source tree. Firstly, you need turn it
-on by enabling the ROM build either via an environment variable::
-
- $ export BUILD_ROM=y
-
-or via configuration::
-
- CONFIG_BUILD_ROM=y
-
-Both tell the Makefile to build u-boot.rom as a target.
+shipped in the U-Boot source tree. Due to this reason, the u-boot.rom build may
+print some warnings if required binary blobs (e.g.: FSP) are not present.
CPU Microcode
-------------
--
2.25.1
