From 2cd5b0960aabf248a46c0f8c0479731033fd27ba Mon Sep 17 00:00:00 2001 From: Maciej Pijanowski Date: Fri, 21 Jun 2024 16:44:50 +0200 Subject: [PATCH] modules: drop iotools As discussed in: linuxboot#1704 there is no need to include iotools module for nitropads. Since there is no board using it, and we see no reason to use it in the future (the EC udpate will not require it, as update will be server by coreboot in the future), drop the module as well. Signed-off-by: Maciej Pijanowski --- Makefile | 1 - boards/nitropad-ns50/nitropad-ns50.config | 2 -- boards/nitropad-nv41/nitropad-nv41.config | 2 -- .../qemu-coreboot-fbwhiptail-tpm1-hotp.config | 3 +-- .../qemu-coreboot-fbwhiptail-tpm1.config | 3 +-- .../qemu-coreboot-fbwhiptail-tpm2-hotp.config | 3 +-- .../qemu-coreboot-fbwhiptail-tpm2.config | 3 +-- .../qemu-coreboot-whiptail-tpm1-hotp.config | 3 +-- .../qemu-coreboot-whiptail-tpm1.config | 3 +-- .../qemu-coreboot-whiptail-tpm2-hotp.config | 3 +-- .../qemu-coreboot-whiptail-tpm2.config | 3 +-- .../x230-hotp-maximized.config | 3 +-- modules/iotools | 22 ------------------- 13 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 modules/iotools diff --git a/Makefile b/Makefile index 38cc9f6858..e10c7b5855 100644 --- a/Makefile +++ b/Makefile @@ -617,7 +617,6 @@ bin_modules-$(CONFIG_KBD) += kbd bin_modules-$(CONFIG_ZSTD) += zstd bin_modules-$(CONFIG_E2FSPROGS) += e2fsprogs bin_modules-$(CONFIG_EXFATPROGS) += exfatprogs -bin_modules-$(CONFIG_IOTOOLS) += iotools $(foreach m, $(bin_modules-y), \ $(call map,initrd_bin_add,$(call bins,$m)) \ diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config index 16490feb5f..2c9e2b284a 100644 --- a/boards/nitropad-ns50/nitropad-ns50.config +++ b/boards/nitropad-ns50/nitropad-ns50.config @@ -29,8 +29,6 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config index 7ba4d58963..ff68302fb7 100644 --- a/boards/nitropad-nv41/nitropad-nv41.config +++ b/boards/nitropad-nv41/nitropad-nv41.config @@ -29,8 +29,6 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config index da5e200f7c..1b4e306443 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config @@ -47,8 +47,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -#CONFIG_IOTOOLS=y +#Runtime tools to write to MSR #CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config index fe12a429bc..f574b2e939 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config @@ -45,8 +45,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y +#Runtime tools to write to MSR CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config index 0e158c57e1..b091298bec 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config @@ -46,8 +46,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y +#Runtime tools to write to MSR CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config index cf5b2d01a5..3d50243681 100644 --- a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config +++ b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config @@ -45,8 +45,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y +#Runtime tools to write to MSR CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config index 4432636765..b5a00801c1 100644 --- a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config @@ -47,8 +47,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y +#Runtime tools to write to MSR CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config index 3365eea419..8d3c7440ec 100644 --- a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config +++ b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config @@ -45,8 +45,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -CONFIG_IOTOOLS=y +#Runtime tools to write to MSR CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config index a6095caeff..9c7f557eff 100644 --- a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config +++ b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config @@ -46,8 +46,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -#CONFIG_IOTOOLS=y +#Runtime tools to write to MSR #CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config index 881342ed65..1397cbc64b 100644 --- a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config +++ b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config @@ -45,8 +45,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -#CONFIG_IOTOOLS=y +#Runtime tools to write to MSR #CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index 00e1db64a7..bca5c5ade1 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -32,8 +32,7 @@ CONFIG_UTIL_LINUX=y CONFIG_LVM2=y CONFIG_MBEDTLS=y CONFIG_PCIUTILS=y -#Runtime tools to write to EC/MSR -#CONFIG_IOTOOLS=y +#Runtime tools to write to MSR #CONFIG_MSRTOOLS=y #Remote attestation support # TPM2 requirements diff --git a/modules/iotools b/modules/iotools deleted file mode 100644 index ca0df81646..0000000000 --- a/modules/iotools +++ /dev/null @@ -1,22 +0,0 @@ -modules-$(CONFIG_IOTOOLS) += iotools - -iotools_depends := pciutils $(musl_dep) - -iotools_version := 18949fdc4dedb1da3f51ee83a582b112fb9f2c71 -iotools_dir := iotools-$(iotools_version) -iotools_tar := $(iotools_dir).tar.gz -iotools_url := https://github.com/adurbin/iotools/archive/$(iotools_version).tar.gz -iotools_hash := 8df266f55cd8e79328faa0e274edc082de3f6c240617a28ace93abdace324ec2 - -iotools_cfg := \ - -iotools_target := \ - $(MAKE_JOBS) \ - $(CROSS_TOOLS) \ - -iotools_output := \ - iotools - -iotools_libraries := \ - -iotools_configure :=