From 082e96d5465afd62fb63cf48ada775eaa607bf54 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 11 Apr 2023 14:51:55 +0200 Subject: [PATCH] ip807x: fix ath11k-fwtest on cig wf196 Signed-off-by: John Crispin --- feeds/ipq807x_v5.4/ipq807x/modules.mk | 18 ++++++++++++++++++ feeds/ipq807x_v5.4/qca-diag/src/Makefile | 2 +- profiles/cig_wf196-ca-ath12.yml | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/feeds/ipq807x_v5.4/ipq807x/modules.mk b/feeds/ipq807x_v5.4/ipq807x/modules.mk index 690e06bf8..1bffce639 100644 --- a/feeds/ipq807x_v5.4/ipq807x/modules.mk +++ b/feeds/ipq807x_v5.4/ipq807x/modules.mk @@ -39,3 +39,21 @@ define KernelPackage/usb-dwc3-qcom-internal/description endef $(eval $(call KernelPackage,usb-dwc3-qcom-internal)) + +define KernelPackage/diag-char + TITLE:=CHAR DIAG + KCONFIG:= CONFIG_DIAG_MHI=y@ge5.4 \ + CONFIG_DIAG_OVER_PCIE=n@ge5.4 \ + CONFIG_DIAGFWD_BRIDGE_CODE=y \ + CONFIG_DIAG_CHAR=m + DEPENDS:=+kmod-lib-crc-ccitt + FILES:=$(LINUX_DIR)/drivers/char/diag/diagchar.ko +endef + +define KernelPackage/diag-char/description + CHAR DIAG +endef + +$(eval $(call KernelPackage,diag-char)) + + diff --git a/feeds/ipq807x_v5.4/qca-diag/src/Makefile b/feeds/ipq807x_v5.4/qca-diag/src/Makefile index 85ddbf57d..c87543f94 100755 --- a/feeds/ipq807x_v5.4/qca-diag/src/Makefile +++ b/feeds/ipq807x_v5.4/qca-diag/src/Makefile @@ -2,7 +2,7 @@ INCLUDE_DIR += include -I src LIB := -lpthread -shared LDFLAGS += -Llib/ -ldiag -lpthread -pie FLAGS = -fPIC -g -DUSE_MUSL -EXTRA_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(TARGET_CPPFLAGS) -fstack-protector-all -znow -zrelro -Werror +EXTRA_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(TARGET_CPPFLAGS) -fstack-protector-all -znow -zrelro -Werror -Wno-error=attributes sample_cliobj := dci_client/diag_dci_sample.c klogobj := klog/diag_klog.c mdobj := mdlog/diag_mdlog.c diff --git a/profiles/cig_wf196-ca-ath12.yml b/profiles/cig_wf196-ca-ath12.yml index efe772fc1..51a44c6fd 100644 --- a/profiles/cig_wf196-ca-ath12.yml +++ b/profiles/cig_wf196-ca-ath12.yml @@ -9,5 +9,10 @@ feeds: path: ../../feeds/ipq807x_v5.4 include: - ucentral-ap +packages: + - ipq807x + - qca-diag + - ath11k-fwtest + - ftm diffconfig: | CONFIG_KERNEL_IPQ_MEM_PROFILE=0