[linux-yocto] [PATCH 2/7] mohonpeak: Replace QAT in mohonpeak.cfg with qat feature

[Tom Zanussi]

Remove the QAT configuration from mohonpeak.cfg, as it breaks -rt for
everything else, and instead have the mohonpeak standard BSPs use the
new qat feature.

Note that as defined, the QAT configuration is incompatible with -rt,
so it isn't added back to those.

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak-standard.scc   |  2 ++
 meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak.cfg            | 10 ----------
 meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak32-standard.scc |  2 ++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak-standard.scc b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak-standard.scc
index 209ea6e..343b624 100644
--- a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak-standard.scc
@@ -6,6 +6,8 @@ include ktypes/standard/standard.scc
 
 include mohonpeak.scc
 
+include features/qat/qat.scc
+
 include cfg/efi-ext.scc
 
 # default policy for standard kernels
diff --git a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak.cfg b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak.cfg
index 467b75c..df953e5 100644
--- a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak.cfg
+++ b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak.cfg
@@ -26,16 +26,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_LPC_ICH=m
 CONFIG_ITCO_WDT=y
 
-# Intel QAT Support
-CONFIG_PREEMPT=n
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_CTS=m
-
 # Replace intree igb driver with
 # igb driver bundled with BSP
 CONFIG_IGB=n
diff --git a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak32-standard.scc b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak32-standard.scc
index 2654bb7..0882bf0 100644
--- a/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak32-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/mohonpeak/mohonpeak32-standard.scc
@@ -6,6 +6,8 @@ include ktypes/standard/standard.scc
 
 include mohonpeak32.scc
 
+include features/qat/qat.scc
+
 include cfg/efi-ext.scc
 
 # default policy for standard kernels
-- 
1.8.3.1