diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-11-08 12:45:30 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-11-11 14:30:09 +0100 |
| commit | 05dfa22b5b6b6358b0b2c0b09a180f6249ced0a4 (patch) | |
| tree | ec45ca22ac2b943eab1a44ced2cd3e0036f7cfa6 | |
| parent | 84b2c7e59afc37e2146ae5ce3768cb8c439e979d (diff) | |
| download | qemu-05dfa22b5b6b6358b0b2c0b09a180f6249ced0a4.zip qemu-05dfa22b5b6b6358b0b2c0b09a180f6249ced0a4.tar.gz qemu-05dfa22b5b6b6358b0b2c0b09a180f6249ced0a4.tar.bz2 | |
configure: Only decompress EDK2 blobs for X86/ARM targets
The EDK2 firmware blobs only target the X86/ARM architectures.
Define the DECOMPRESS_EDK2_BLOBS variable and only decompress
the blobs when the variable exists.
See also: 536d2173b2b ("roms: build edk2 firmware binaries ...")
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191108114531.21518-2-philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 13 |
2 files changed, 15 insertions, 0 deletions
@@ -480,7 +480,9 @@ $(SOFTMMU_ALL_RULES): $(chardev-obj-y) $(SOFTMMU_ALL_RULES): $(crypto-obj-y) $(SOFTMMU_ALL_RULES): $(io-obj-y) $(SOFTMMU_ALL_RULES): config-all-devices.mak +ifdef DECOMPRESS_EDK2_BLOBS $(SOFTMMU_ALL_RULES): $(edk2-decompressed) +endif .PHONY: $(TARGET_DIRS_RULES) # The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that @@ -427,6 +427,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +edk2_blobs="no" pkgversion="" pie="" qom_cast_debug="yes" @@ -2146,6 +2147,14 @@ case " $target_list " in ;; esac +for target in $target_list; do + case "$target" in + arm-softmmu | aarch64-softmmu | i386-softmmu | x86_64-softmmu) + edk2_blobs="yes" + ;; + esac +done + feature_not_found() { feature=$1 remedy=$2 @@ -7526,6 +7535,10 @@ if test "$libudev" != "no"; then echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak fi +if test "$edk2_blobs" = "yes" ; then + echo "DECOMPRESS_EDK2_BLOBS=y" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers |