package/gnu-efi: introduce BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS option

This will be used in packages that depend on gnu-efi, and we take this
opportunity to propagate this dependency where it was missing in
gummiboot and syslinux. In practice, it was not a problem because
gummiboot and syslinux are only available on i386 and x86-64, which is
a subset of the architectures supported by gnu-efi.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in
index 11dbc4f6b724c1ff617a61363680ef9654c290af..1b5c4279f7146e2b9675f9349d1369ed60301e5e 100644 (file)
--- a/boot/gummiboot/Config.in
+++ b/boot/gummiboot/Config.in
@@ -1,6 +1,7 @@
 config BR2_TARGET_GUMMIBOOT
        bool "gummiboot"
        depends on BR2_i386 || BR2_x86_64
+       depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
        select BR2_PACKAGE_GNU_EFI
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index e969d53fd0c642907859a755140addf9e6d368ce..339a97f0e44c70c49e381b7b83d5763b3cb4c99e 100644 (file)
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -44,6 +44,7 @@ config BR2_TARGET_SYSLINUX_MBR
 
 config BR2_TARGET_SYSLINUX_EFI
        bool "install efi"
+       depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
        select BR2_PACKAGE_GNU_EFI
        help
          Install the 'efi' image, to boot from an EFI environment.

diff --git a/package/gnu-efi/Config.in b/package/gnu-efi/Config.in
index d8d92c2c17b901f311af300e0b2328e407effecb..d456a23837d5d7316fb2e5739069b16e8e9fad18 100644 (file)
--- a/package/gnu-efi/Config.in
+++ b/package/gnu-efi/Config.in
@@ -1,7 +1,14 @@
+config BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
+       bool
+       default y if BR2_ARM_CPU_HAS_ARM
+       default y if BR2_aarch64
+       default y if BR2_aarch64_be
+       default y if BR2_i386
+       default y if BR2_x86_64
+
 config BR2_PACKAGE_GNU_EFI
        bool "gnu-efi"
-       depends on BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || \
-               BR2_aarch64_be || BR2_i386 || BR2_x86_64
+       depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS
        help
          Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64
          (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain