aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArsalan H. Awan <Arsalan_Awan@mentor.com>2021-09-06 20:12:13 +0500
committerArsalan H. Awan <Arsalan_Awan@mentor.com>2021-09-06 20:12:13 +0500
commit3654471c2fd9b508f6aeb9623682d0c7287adb68 (patch)
treec6fab9dca157f6851baf2175dc081f27261dc1e1
parent6ed58d0956ff9cad5379d144c6e808206ca68190 (diff)
downloadmeta-amd-3654471c2fd9b508f6aeb9623682d0c7287adb68.tar.gz
meta-amd-3654471c2fd9b508f6aeb9623682d0c7287adb68.tar.bz2
meta-amd-3654471c2fd9b508f6aeb9623682d0c7287adb68.zip
kernel: create MACHINE_FEATURE for ccp drivers & enable on e3000 only
Lets control the ccp driver enablement via MACHINE_FEATURES. This way, the ccp drivers are enabled in the kernel only if a machine specifies it. Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com>
-rw-r--r--meta-amd-bsp/conf/machine/e3000.conf3
-rw-r--r--meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf2
-rw-r--r--meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend13
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc2
4 files changed, 4 insertions, 16 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index b21680b3..8ad98f06 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -14,3 +14,6 @@ KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
# Add machine specific AMD features and feature pkgs here
EXTRA_IMAGE_FEATURES += "amd-feature-networking"
+
+# Enable AMD Cryptographic Co-processor Encryption Controller drivers
+MACHINE_FEATURES_append = " ccp"
diff --git a/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf b/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
deleted file mode 100644
index 3389f0c7..00000000
--- a/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 2610bf0a..00000000
--- a/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-}
-
-do_install_append_vermeer () {
- 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-amdx86_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
index cbe572ac..f37e5a81 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
@@ -6,7 +6,7 @@ SRC_URI_append_amdx86 += "file://amdx86-user-features.scc \
file://amdx86-user-config.cfg \
file://amdx86-extra-config.cfg \
file://amd-xgbe.cfg \
- file://amd-ccp.cfg \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'ccp', 'file://amd-ccp.cfg', '', d)} \
file://kvm.cfg \
${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'amd-feature-networking', 'file://dpdk.cfg', '', d)} \
file://afalg.cfg \