From: Jerry Snitselaar jsnitsel@redhat.com
redhat: configs: Disable TPM 1.2 specific drivers
TPM 1.2 is not supported in RHEL9, so disable the TPM 1.2 specific drivers.
Signed-off-by: Jerry Snitselaar jsnitsel@redhat.com
diff --git a/redhat/configs/ark/generic/CONFIG_TCG_ATMEL b/redhat/configs/ark/generic/CONFIG_TCG_ATMEL new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_ATMEL @@ -0,0 +1 @@ +# CONFIG_TCG_ATMEL is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_INFINEON b/redhat/configs/ark/generic/CONFIG_TCG_INFINEON index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_TCG_INFINEON +++ b/redhat/configs/ark/generic/CONFIG_TCG_INFINEON @@ -1 +1 @@ -CONFIG_TCG_INFINEON=m +# CONFIG_TCG_INFINEON is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_NSC b/redhat/configs/ark/generic/CONFIG_TCG_NSC new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_NSC @@ -0,0 +1 @@ +# CONFIG_TCG_NSC is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_ATMEL @@ -0,0 +1 @@ +# CONFIG_TCG_TIS_I2C_ATMEL is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_TCG_TIS_I2C_INFINEON @@ -0,0 +1 @@ +# CONFIG_TCG_TIS_I2C_INFINEON is not set diff --git a/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_TCG_TIS_ST33ZP24_I2C +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_ST33ZP24_I2C=m diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL b/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_ATMEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_I2C_ATMEL=y diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON b/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/powerpc/CONFIG_TCG_TIS_I2C_INFINEON +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TCG_TIS_I2C_INFINEON=y diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C rename to redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TCG_TIS_ST33ZP24_I2C +++ b/redhat/configs/common/generic/CONFIG_TCG_TIS_ST33ZP24_I2C diff --git a/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C b/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_TCG_TIS_ST33ZP24_I2C +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713#note_9058063...
@jmflinuxtx can you take a look at this one?
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713#note_9059572...
I have a feeling that someone in Fedora might complain, but happy to turn it off and see. I can always flip it back if needed.
From: Jerry Snitselaar on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713#note_9062968...
@jmflinuxtx - I didn't intend for the Fedora config to change and I thought I did a diff of before and after to verify that. CONFIG_TCG_TIS_ST33ZP24_I2C was disabled already on Fedora, and was being disabled for ark so I moved it to common. That should be getting picked up by Fedora and ark, correct? If I screwed up the Fedora config I can place it back.
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713#note_9063073...
@jsnitsel Actually, you are correct. I misread the common and ark bits, so no change there. I have been toying around with some sort of a configdiff make target to make some of this easier to checkup on, but it is slightly more difficult to get correct as we don't track the generated configs in git.
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1713#note_9063568...
@jmflinuxtx - hehe a good use for test case under the selftest work Prarit is doing. :-)
kernel@lists.fedoraproject.org