浏览代码

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>
Thomas Petazzoni 6 年之前
父节点
当前提交
8064b12ff9
共有 3 个文件被更改,包括 11 次插入2 次删除
  1. 1 0
      boot/gummiboot/Config.in
  2. 1 0
      boot/syslinux/Config.in
  3. 9 2
      package/gnu-efi/Config.in

+ 1 - 0
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

+ 1 - 0
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.

+ 9 - 2
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