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

[PATCH v2 1/3] 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>
---
v1 -> v2:
  - no change
---
 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 871395b69683..2c47e6cb1805 100644
--- a/efi/payload/Kconfig
+++ b/efi/payload/Kconfig
@@ -27,6 +27,7 @@ config EFI_STUB
 
 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 v2 2/3] malloc: define malloc_add_pool outside of TLSF

[Ahmad Fatoum]

This function is currently being used by the EFI payload init ode.
Define a stub to allow allyesconfig to build it.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
  - new change
---
 include/malloc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/malloc.h b/include/malloc.h
index 31a2ff1b3d8e..bee998cd9079 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -26,6 +26,9 @@ void *malloc_add_pool(void *mem, size_t bytes);
 void malloc_register_store(void (*cb)(size_t bytes));
 bool malloc_store_is_registered(void);
 #else
+#include <linux/bug.h>
+static inline void *malloc_add_pool(void *mem, size_t bytes) { BUG(); }
+static inline void malloc_register_store(void (*cb)(size_t bytes)) { BUG(); }
 static inline bool malloc_store_is_registered(void) { return false; }
 #endif
 
-- 
2.47.3

[PATCH v2 3/3] 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>
---
v1 -> v2:
  - rebase on next instead of basing on non-upstream patch
---
 efi/payload/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/efi/payload/Kconfig b/efi/payload/Kconfig
index 2c47e6cb1805..275e053ca868 100644
--- a/efi/payload/Kconfig
+++ b/efi/payload/Kconfig
@@ -5,7 +5,7 @@ config HAVE_EFI_PAYLOAD
 
 config EFI_PAYLOAD
 	bool "Build as EFI payload"
-	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 v2 1/3] fixup! efi: add option to generate vfat file for barebox.efi

[Sascha Hauer]

On Thu, 11 Dec 2025 21:24:27 +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/3] fixup! efi: add option to generate vfat file for barebox.efi
      (no commit info)
[2/3] malloc: define malloc_add_pool outside of TLSF
      https://git.pengutronix.de/cgit/barebox/commit/?id=2a0cb4bac832 (link may not be stable)
[3/3] 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>