diff --git a/Makefile b/Makefile index 38cc9f68..e10c7b58 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 16490feb..2c9e2b28 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 7ba4d589..ff68302f 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 da5e200f..1b4e3064 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 fe12a429..f574b2e9 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 0e158c57..b091298b 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 cf5b2d01..3d502436 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 44326367..b5a00801 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 3365eea4..8d3c7440 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 a6095cae..9c7f557e 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 881342ed..1397cbc6 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 00e1db64..bca5c5ad 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 ca0df816..00000000 --- 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 :=