aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2021-06-28 07:53:40 -0700
committerGitHub <noreply@github.com>2021-06-28 07:53:40 -0700
commitdfb437f537a665afe8465670409f4216360823e9 (patch)
tree6611e5d82ac0503075646d1a1c646307fa035d92
parentd030db6b17ba417b41b269589dce7aca679b5003 (diff)
parent2a57fdc5c1839c74afbee1672a793d412589ed09 (diff)
downloadmeta-amd-dfb437f537a665afe8465670409f4216360823e9.tar.gz
meta-amd-dfb437f537a665afe8465670409f4216360823e9.tar.bz2
meta-amd-dfb437f537a665afe8465670409f4216360823e9.zip
Merge pull request #708 from ArsalanHAwan/hardknott-ethanolx-disable-ccp
hardknott/ethanolx: disable ccp
-rw-r--r--meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf2
-rw-r--r--meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend8
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg4
3 files changed, 12 insertions, 2 deletions
diff --git a/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf b/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
new file mode 100644
index 00000000..3389f0c7
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
@@ -0,0 +1,2 @@
+blacklist ccp
+blacklist ccp_crypto
diff --git a/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend b/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend
new file mode 100644
index 00000000..3ce16fe9
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://blacklist-ccp.conf"
+
+do_install_append_ethanolx () {
+ install -m755 ${WORKDIR}/blacklist-ccp.conf \
+ ${D}${sysconfdir}/modprobe.d/blacklist-ccp.conf
+}
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg
index cc9d9e10..109cda5c 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg
@@ -21,7 +21,7 @@ CONFIG_HSU_DMA=y
# CONFIG_ASYNC_TX_DMA is not set
# CONFIG_DMATEST is not set
CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
CONFIG_CRYPTO_DEV_SP_CCP=y
CONFIG_CRYPTO_DEV_SP_PSP=y