summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42b18df)
raw | patch | inline | side by side (parent: 42b18df)
author | Simon Glass <sjg@chromium.org> | |
Sun, 19 Jul 2020 19:56:04 +0000 (13:56 -0600) | ||
committer | Simon Glass <sjg@chromium.org> | |
Wed, 29 Jul 2020 01:30:39 +0000 (19:30 -0600) |
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>
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 | patch | blob | history | |
Makefile | patch | blob | history | |
configs/qemu-x86_64_defconfig | patch | blob | history | |
configs/qemu-x86_defconfig | patch | blob | history |
index b390c481fcf3c8aa8fcffaea1d8718b2f70b6288..c2cba69231bb1ad912e67b63c1c3c2052c636bd4 100644 (file)
--- a/Kconfig
+++ b/Kconfig
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"
diff --git a/Makefile b/Makefile
index 214379928dbbdf3e49fcef535bad9787a614c566..4274715a29db4f06ed9abeb832769b066fb02fce 100644 (file)
--- a/Makefile
+++ b/Makefile
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))
index 59d55b79ee1f9351e339917bf31d864809ddc23e..474396bf215ca0d8fb6e4a6403edd855a6757f68 100644 (file)
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
index ec93390ee2869ca1ceda9073cef11fd71f56180b..a9bf0be7eed16597d39f34a1100eacbbd64c6125 100644 (file)
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