commit b587bd1a153c17160288ffbf16cfd4a8e64661c5
author Simon Glass <sjg@chromium.org> Sun Jul 19 13:56:04 2020 -0600
committer Simon Glass <sjg@chromium.org> Tue Jul 28 19:30:39 2020 -0600
tree 103d6f16b8a9828a7f6d2ceea9b142a011fc161b
parent c5b3fb8860b256a2fa578d183af4159364a829f9

x86: Drop CONFIG_BUILD_ROM and repurpose BUILD_ROM

This Kconfig is not needed anymore since U-Boot will build the ROM if the
required binary blobs exist.

The BUILD_ROM environment variable used to request that the ROM be built.
Now this always happens if the required binary blobs are available. Update
it to mean that U-Boot should fail if the ROM cannot be built. This
behaviour should be compatible with how it used to work.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Kconfig

diff --git a/Kconfig b/Kconfig
index b390c48..c2cba69 100644
--- a/Kconfig
+++ b/Kconfig
@@ -288,8 +288,11 @@
 	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, pass BUILD_ROM=1 to make
-	  to tell U-Boot to build the ROM.
+	  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"

Makefile

diff --git a/Makefile b/Makefile
index 2143799..4274715 100644
--- a/Makefile
+++ b/Makefile
@@ -1312,7 +1312,8 @@
 cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
                 --toolpath $(objtree)/tools \
 		$(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \
-		build -u -d u-boot.dtb -O . -m --allow-missing \
+		build -u -d u-boot.dtb -O . \
+		$(if $(BUILD_ROM),,-m --allow-missing) \
 		-I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
 		$(BINMAN_$(@F))
 

configs/qemu-x86_64_defconfig

diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 59d55b7..474396b 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -18,7 +18,6 @@
 CONFIG_GENERATE_ACPI_TABLE=y
 CONFIG_X86_OFFSET_U_BOOT=0xfff00000
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BUILD_ROM=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTSTAGE=y

configs/qemu-x86_defconfig

diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index ec93390..a9bf0be 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -9,7 +9,6 @@
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_ACPI_TABLE=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BUILD_ROM=y
 CONFIG_FIT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y