[PATCH 1/2] efi: payload: iomem: use efi_uintn_t for the memory map key

[PATCH 1/2] efi: payload: iomem: use efi_uintn_t for the memory map key

[Ahmad Fatoum]

The GetMemoryMap() boot service takes a pointer to an efi_uintn_t for
the map key. Passing a pointer to an unsigned long fails to compile on
32-bit architectures, where efi_uintn_t is 32-bit:

  efi/payload/iomem.c:161:45: error: passing argument 3 of
  'BS->get_memory_map' from incompatible pointer type

Use the correct type.

Assisted-by: Claude:fable-5
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 efi/payload/iomem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/efi/payload/iomem.c b/efi/payload/iomem.c
index 8b92dc47a7b9..515bf05233f8 100644
--- a/efi/payload/iomem.c
+++ b/efi/payload/iomem.c
@@ -148,7 +148,7 @@ static int efi_barebox_populate_mmap(void)
 	void *mmap_buf = NULL, *desc;
 	efi_status_t efiret;
 	size_t mmap_size;
-	ulong mapkey;
+	efi_uintn_t mapkey;
 	size_t descsz;
 	u32 descver;
 	int ret = 0;
-- 
2.47.3

[PATCH 2/2] efi: payload: env: don't execute unmatched network driver glob

[Ahmad Fatoum]

When /boot/network-drivers/ doesn't exist, the glob remains unexpanded
and the script tries to execute the literal pattern, so every ifup
without a firmware provided network device printed:

  /boot/network-drivers/*: No such file or directory
  ERROR: ifup: Running '/env/network/eth0-discover' failed with 127

Skip non-existent entries.

Assisted-by: Claude:fable-5
Reported-by: Chali Anis <chalianis1@gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 efi/payload/env-efi/network/eth0-discover | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/efi/payload/env-efi/network/eth0-discover b/efi/payload/env-efi/network/eth0-discover
index 62c31a553c2b..0d865a5c5528 100644
--- a/efi/payload/env-efi/network/eth0-discover
+++ b/efi/payload/env-efi/network/eth0-discover
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 for i in /boot/network-drivers/*; do
-	$i;
+	if [ -e "$i" ]; then
+		$i
+	fi
 done
-- 
2.47.3

Re: [PATCH 1/2] efi: payload: iomem: use efi_uintn_t for the memory map key

[Sascha Hauer]

On Wed, 26 Aug 2026 11:30:51 +0200, Ahmad Fatoum wrote:
> The GetMemoryMap() boot service takes a pointer to an efi_uintn_t for
> the map key. Passing a pointer to an unsigned long fails to compile on
> 32-bit architectures, where efi_uintn_t is 32-bit:
> 
>   efi/payload/iomem.c:161:45: error: passing argument 3 of
>   'BS->get_memory_map' from incompatible pointer type
> 
> [...]

Applied, thanks!

[1/2] efi: payload: iomem: use efi_uintn_t for the memory map key
      https://git.pengutronix.de/cgit/barebox/commit/?id=b94b47402195 (link may not be stable)
[2/2] efi: payload: env: don't execute unmatched network driver glob
      https://git.pengutronix.de/cgit/barebox/commit/?id=a03232518068 (link may not be stable)

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