efi: fix generation for non !EFI_STUB configurations The if currently always succeeded and trying to build the payload code on sandbox unearthes another issue, so fix both.
Signed-off-by: Ahmad Fatoum <[email protected]> --- efi/payload/Kconfig | 1 + images/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/efi/payload/Kconfig b/efi/payload/Kconfig index 69dc50a7c6dd..01f54ee7cf10 100644 --- a/efi/payload/Kconfig +++ b/efi/payload/Kconfig @@ -2,6 +2,7 @@ config EFI_PAYLOAD_ESP_IMAGE bool "Generate barebox.esp image from payload" + depends on EFI_STUB || !PBL_IMAGE config EFI_HANDOVER_PROTOCOL bool "EFI Handover protocol (DEPRECATED)" diff --git a/images/Makefile b/images/Makefile index 119e7a6e2b8e..69447fd64541 100644 --- a/images/Makefile +++ b/images/Makefile @@ -215,7 +215,7 @@ FILE_barebox.img = start_pbl.pblb image-$(CONFIG_PBL_SINGLE_IMAGE) += barebox.img endif -FILE_barebox.vfat = $(if CONFIG_EFI_STUB,barebox-dt-2nd.img,../barebox.efi) +FILE_barebox.vfat = $(if $(CONFIG_EFI_STUB),barebox-dt-2nd.img,../barebox.efi) FILE_barebox.esp = barebox.vfat image-$(CONFIG_EFI_PAYLOAD_ESP_IMAGE) += barebox.esp barebox.vfat -- 2.47.3
