[PATCH 1/2] fixup! efi: add option to generate vfat file for barebox.efi

[PATCH 1/2] fixup! efi: add option to generate vfat file for barebox.efi

[Ahmad Fatoum]

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 <a.fatoum@pengutronix.de>
---
 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

[PATCH 2/2] efi: payload: enable build for sandbox

[Ahmad Fatoum]

For some extra coverage, let's allow building the EFI payload code as
part of the allyesconfig build.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 efi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/efi/Kconfig b/efi/Kconfig
index 3fb696f70dc2..23ac601af647 100644
--- a/efi/Kconfig
+++ b/efi/Kconfig
@@ -4,7 +4,7 @@ menu "EFI (Extensible Firmware Interface) Support"
 
 config EFI_PAYLOAD
 	bool "barebox as EFI payload/app (consumer)"
-	depends on HAVE_EFI_PAYLOAD
+	depends on HAVE_EFI_PAYLOAD || COMPILE_TEST
 	select PBL_FULLY_PIC if ARM64
 	select EFI
 	select EFI_GUID
-- 
2.47.3

Re: [PATCH 1/2] fixup! efi: add option to generate vfat file for barebox.efi

[Sascha Hauer]

On Thu, 11 Dec 2025 20:33:12 +0100, Ahmad Fatoum wrote:
> 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.
> 
> 

Applied, thanks!

[1/2] fixup! efi: add option to generate vfat file for barebox.efi
      https://git.pengutronix.de/cgit/barebox/commit/?id=b3ab8e3976c2 (link may not be stable)
[2/2] efi: payload: enable build for sandbox
      (no commit info)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>

Re: [PATCH 1/2] fixup! efi: add option to generate vfat file for barebox.efi

[Sascha Hauer]

On Thu, 11 Dec 2025 20:33:12 +0100, Ahmad Fatoum wrote:
> 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.
> 
> 

Applied, thanks!

[1/2] fixup! efi: add option to generate vfat file for barebox.efi
      (no commit info)
[2/2] efi: payload: enable build for sandbox
      https://git.pengutronix.de/cgit/barebox/commit/?id=8177be1f9bcd (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>