diff --git a/Kbuild b/Kbuild
index eda2e78b12fa..7bc45aab680f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -69,7 +69,11 @@ ifeq ($(KERNEL_BUILD), 0)
 	# builds. Other OEMs are also protected using the TARGET_BUILD_VARIANT
 	# config.
 	ifneq ($(TARGET_BUILD_VARIANT),user)
-		CONFIG_FEATURE_PKTLOG := y
+		ifeq ($(CONFIG_LITHIUM),y)
+			CONFIG_FEATURE_PKTLOG := n
+		else
+			CONFIG_FEATURE_PKTLOG := y
+		endif
 		ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
 			CONFIG_FEATURE_DP_TRACE := y
 		else
@@ -1630,12 +1634,13 @@ CDEFINES += -DQCA6290_HEADERS_DEF
 CDEFINES += -DQCA_WIFI_QCA8074
 CDEFINES += -DQCA_WIFI_NAPIER_EMULATION
 CDEFINES += -DQCA_WIFI_QCA8074_VP
+CDEFINES += -DDP_INTR_POLL_BASED
 endif
 
 # Dummy flag for WIN/MCL converged data path compilation
 CDEFINES += -DDP_PRINT_ENABLE=0
 CDEFINES += -DATH_SUPPORT_WRAP=0
-CDEFINES += -DQCA_HOST2FW_RXBUF_RING=0
+#CDEFINES += -DQCA_HOST2FW_RXBUF_RING=0
 #endof dummy flags
 
 KBUILD_CPPFLAGS += $(CDEFINES)
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index c9e4ba20019b..5634f2317fa9 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -402,7 +402,12 @@ QDF_STATUS cds_open(void)
 	bmi_target_ready(scn, gp_cds_context->cfg_ctx);
 	/* Now proceed to open the MAC */
 
-	if (TARGET_TYPE_QCA8074 == pHddCtx->target_type)
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG,
+		"%s: target_type %d 8074:%d 6290:%d",
+		__func__, pHddCtx->target_type,
+		TARGET_TYPE_QCA8074, TARGET_TYPE_QCA6290);
+
+	if (TARGET_TYPE_QCA6290 == pHddCtx->target_type)
 		gp_cds_context->dp_soc = cdp_soc_attach(LITHIUM_DP,
 			gp_cds_context->pHIFContext, scn,
 			gp_cds_context->htc_ctx, gp_cds_context->qdf_ctx,