| Message ID | 20211124145420.4388-1-vincent.stehle@arm.com |
|---|---|
| State | Accepted |
| Commit | 270eeb6871a995abb89b51273dbf531efe7524ea |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | qemu: common: Fix build with update capsule | expand |
On Wed, Nov 24, 2021 at 03:54:20PM +0100, Vincent Stehlé wrote: > The common emulation Makefile has a dependency on a non-existent > qemu_capsule.o when building with support for capsule update enabled > (CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y). > The code which was in qemu_capsule.c has been completely moved to > lib/efi_loader/efi_capsule.c by commit 7a6fb28c8e4b ("efi_loader: capsule: > add back efi_get_public_key_data()"). > Remove the false dependency. > > This fixes the following build error: > > make[1]: *** No rule to make target 'board/emulation/common/qemu_capsule.o', needed by 'board/emulation/common/built-in.o'. Stop. > > Fixes: commit 47a25e81d35c ("Revert "efi_capsule: Move signature from DTB to .rodata"") > Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com> > Cc: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/board/emulation/common/Makefile b/board/emulation/common/Makefile index 7ed447a69dc..c5b452e7e34 100644 --- a/board/emulation/common/Makefile +++ b/board/emulation/common/Makefile @@ -2,4 +2,3 @@ obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += qemu_mtdparts.o obj-$(CONFIG_SET_DFU_ALT_INFO) += qemu_dfu.o -obj-$(CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT) += qemu_capsule.o
The common emulation Makefile has a dependency on a non-existent qemu_capsule.o when building with support for capsule update enabled (CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y). The code which was in qemu_capsule.c has been completely moved to lib/efi_loader/efi_capsule.c by commit 7a6fb28c8e4b ("efi_loader: capsule: add back efi_get_public_key_data()"). Remove the false dependency. This fixes the following build error: make[1]: *** No rule to make target 'board/emulation/common/qemu_capsule.o', needed by 'board/emulation/common/built-in.o'. Stop. Fixes: commit 47a25e81d35c ("Revert "efi_capsule: Move signature from DTB to .rodata"") Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com> Cc: Simon Glass <sjg@chromium.org> --- board/emulation/common/Makefile | 1 - 1 file changed, 1 deletion(-)