diff options
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 \ |