Skip to contentSkip to conversation

fwts: Enable optional efi_runtime kernel module build

PATCH New Sumit Garg 3 participants 3 messages Nov 5, 2018 – Nov 7, 2018

lore
Share & tools
lore

Sumit Garg

author
#0 lore raw

PATCH v2 1/1 fwts: Enable optional efi_runtime kernel module build

Firmware test suite does provides efi_runtime kernel module required to run UEFI tests. So optionally enable this module build.

Signed-off-by Sumit Garg <[email protected]>

---

Changes in v2:
1. Keep efi_runtime config option inside if block.
2. Remove linux dependency as $(kernel-module) takes care of this.
3. Correct placement of config and $(kernel-module) blocks.

 package/fwts/Config.in | 12 ++++++++++++
 package/fwts/fwts.mk   |  5 +++++
 2 files changed, 17 insertions(+)
package/fwts/Config.in +12 -0
index 959d871..930f078 100644
@@ -21,6 +21,18 @@ config BR2_PACKAGE_FWTS
 
 	  https://wiki.ubuntu.com/FirmwareTestSuite
 
+if BR2_PACKAGE_FWTS
+config BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE
+	bool "efi_runtime module"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Firmware Test Suite (FWTS) also provides EFI runtime kernel
+	  module required to run UEFI tests.
+
+comment "efi-runtime module needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
+endif
+
 comment "fwts needs a glibc toolchain w/ wchar, threads"
 	depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd
package/fwts/fwts.mk +5 -0
index 15f0afc..aa006f3 100644
@@ -13,4 +13,9 @@ FWTS_AUTORECONF = YES
 FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 libbsd \
 	$(if $(BR2_PACKAGE_DTC),dtc)
 
+ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE
+FWTS_MODULE_SUBDIRS = efi_runtime
+$(eval $(kernel-module))
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/1 fwts: Enable optional efi_runtime kernel module build

Quoted 11 lines · Sumit Garg

Firmware test suite does provides efi_runtime kernel module required to run UEFI tests. So optionally enable this module build.

Signed-off-by Sumit Garg <[email protected]>

---

Changes in v2:
1. Keep efi_runtime config option inside if block.
2. Remove linux dependency as $(kernel-module) takes care of this.
3. Correct placement of config and $(kernel-module) blocks.

v2 looks good to me and I gave it a quick test, seems to work fine.

package/fwts/Config.in config BR2_PACKAGE_FWTS · line 33

Quoted 9 lines
package/fwts/Config.in +9 -0
+config BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE
+       bool "efi_runtime module"
+       depends on BR2_LINUX_KERNEL
+       help
+         Firmware Test Suite (FWTS) also provides EFI runtime kernel
+         module required to run UEFI tests.
+
+comment "efi-runtime module needs a Linux kernel to be built"
+       depends on !BR2_LINUX_KERNEL

These efi_runtime and efi-runtime strings should at least be consistent in the menu, either with dash or underscore. If nobody has other issues, maybe this can be fixed while applying?

Other than that:

Reviewed-by Erico Nunes <[email protected]>
#2 lore raw

PATCH v2 1/1 fwts: Enable optional efi_runtime kernel module build

In reply to Sumit Garg
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sumit" == Sumit Garg <[email protected]> writes:

Firmware test suite does provides efi_runtime kernel module required to run UEFI tests. So optionally enable this module build.

Quoted 7 lines
Signed-off-by Sumit Garg <[email protected]>

---

Changes in v2:
1. Keep efi_runtime config option inside if block.
2. Remove linux dependency as $(kernel-module) takes care of this.
3. Correct placement of config and $(kernel-module) blocks.

Committed after changing the -/_ inconsistency as suggested by Erico, thanks.

Signature · 1 line
Bye, Peter Korsgaard