Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kirkstone migration: fix kernel-module-qualcomm build 

Yocto is becoming more strict on not using tags in the SRCREV, as that
may lead to problems in the different tasks of a bitbake recipe.

As of Yocto 4.0, bitbake errors when such condition happens, with:

"Recipe uses a floating tag/branch without a fixed SRCREV"

So convert the SRCREV of all tags to the proper SHA1 revision.

Also, extend the 'fix-build-issues' to delete '-Werror' from the
compilation flags. Newer versions of GCC (as the one used in Yocto 4.0)
throw more (new) warnings, and the '-Werror' flag was making the build
to fail.

cc1: all warnings being treated as errors
lim_api.c:1057:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
lim_admit_control.c:169:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation]

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2022-05-25 14:24:35 +02:00
parent 348da0bc12
commit 18a2a93b02
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
View File

@ -13,11 +13,6 @@ QCA_WIFI_HOST_CMN_SRCBRANCH = "wlan-cmn.driver.lnx.2.0.r51-rel"
FW_API_SRCBRANCH = "wlan-api.lnx.1.0.c21.2"
MDM_INIT_SRCBRANCH = "wlan-tools.lnx.1.0.c21.2"
SRCREV_qcacld = "CHSS.LNX_FSL.5.0-01200-QCA6574AUARMSDIOHZ"
SRCREV_qca-wifi-host = "CHSS.LNX_FSL.5.0-01200-QCA6574AUARMSDIOHZ"
SRCREV_fw-api = "CHSS.LNX_FSL.5.0-01200-QCA6574AUARMSDIOHZ"
SRCREV_mdm-init = "CHSS.LNX_FSL.5.0-01200-QCA6574AUARMSDIOHZ"
SRC_URI = " \
git://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0.git;protocol=https;branch=${QCACLD_SRCBRANCH};name=qcacld \
git://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn.git;protocol=https;branch=${QCA_WIFI_HOST_CMN_SRCBRANCH};destsuffix=qca-wifi-host-cmn;name=qca-wifi-host \
@ -30,6 +25,12 @@ SRC_URI = " \
file://0002-qca-wifi-host-cmn-fix-build-issue-enabling-debug-for-.patch;patchdir=${WORKDIR}/qca-wifi-host-cmn; \
"
# Tag 'CHSS.LNX_FSL.5.0-01200-QCA6574AUARMSDIOHZ' in all repos
SRCREV_qcacld = "f1dae2986ae58c68ea740e2c505be9c369547916"
SRCREV_qca-wifi-host = "ca5e999f4f692a45ae9974a7ad92726deaf7497f"
SRCREV_fw-api = "62b94874003ef7aced22bba1a076c1e4b5d5a9a9"
SRCREV_mdm-init = "3fb3bcb9f054eeeb1083bd4f6dbaf733061c5af3"
inherit module
DEPENDS = "virtual/kernel"

54
meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0001-qcacld-3.0-fix-build-issues.patch
View File

@ -1,21 +1,39 @@
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 2 May 2022 12:01:12 +0200
Subject: [PATCH] qcacld-3.0: Fix build issues
Subject: [PATCH] qcacld-3.0: fix build issues
Removed '-Werror' as this makes the driver build fail using newer versions
of the compiler. For example building with gcc 11 there are new warnings:
lim_api.c:1057:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
lim_admit_control.c:169:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
Kbuild | 1 -
core/bmi/src/ol_fw.c | 3 +++
core/dp/htt/htt_rx_hl.c | 2 ++
core/dp/txrx/ol_txrx.c | 1 +
3 files changed, 6 insertions(+)
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Kbuild b/Kbuild
index ad086656cca2..50c01ef223c1 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2804,7 +2804,6 @@ ccflags-y += $(INCS)
cppflags-y += -DANI_OS_TYPE_ANDROID=6 \
-Wall\
- -Werror\
-D__linux__
cppflags-$(CONFIG_PTT_SOCK_SVC_ENABLE) += -DPTT_SOCK_SVC_ENABLE
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index 52513fff23..c69420734b 100644
index 52513fff23b2..c69420734be7 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -609,11 +609,13 @@ int ol_copy_ramdump(struct hif_opaque_softc *scn)
return ret;
}
@@ -611,7 +611,9 @@ int ol_copy_ramdump(struct hif_opaque_softc *scn)
static void __ramdump_work_handler(void *data)
{
@ -25,11 +43,7 @@ index 52513fff23..c69420734b 100644
uint32_t host_interest_address;
uint32_t dram_dump_values[4];
uint32_t target_type;
struct hif_target_info *tgt_info;
struct ol_context *ol_ctx = data;
@@ -1044,10 +1046,11 @@ static QDF_STATUS ol_fw_populate_clk_settings(enum a_refclk_speed_t refclk,
clock_s->wlan_pll.div = 0;
clock_s->wlan_pll.rnfrac = 0;
@@ -1046,6 +1048,7 @@ static QDF_STATUS ol_fw_populate_clk_settings(enum a_refclk_speed_t refclk,
clock_s->wlan_pll.outdiv = 0;
clock_s->pll_settling_time = 1024;
clock_s->refclk_hz = 0;
@ -37,15 +51,11 @@ index 52513fff23..c69420734b 100644
default:
return QDF_STATUS_E_FAILURE;
}
clock_s->refclk_hz = refclk_speed_to_hz[refclk];
diff --git a/core/dp/htt/htt_rx_hl.c b/core/dp/htt/htt_rx_hl.c
index 9cb2047e3d..e0cbac5ac0 100644
index 9cb2047e3d1b..e0cbac5ac004 100644
--- a/core/dp/htt/htt_rx_hl.c
+++ b/core/dp/htt/htt_rx_hl.c
@@ -419,15 +419,17 @@ htt_rx_mpdu_desc_pn_hl(
case 128:
/* bits 128:64 */
@@ -421,11 +421,13 @@ htt_rx_mpdu_desc_pn_hl(
*(word_ptr + 3) = rx_desc->pn_127_96;
/* bits 63:0 */
*(word_ptr + 2) = rx_desc->pn_95_64;
@ -59,15 +69,11 @@ index 9cb2047e3d..e0cbac5ac0 100644
case 24:
/* bits 23:0
* copy 32 bits
*/
*(word_ptr + 0) = rx_desc->pn_31_0;
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 2f20d49793..303f47c86d 100644
index 2f20d497936c..303f47c86d8e 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -4240,10 +4240,11 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev,
case HTT_DBG_STATS_TX_PPDU_LOG:
@@ -4242,6 +4242,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev,
bytes = 0;
/* TO DO: specify how many bytes are present */
/* TO DO: add copying to the requestor's buf */
@ -75,5 +81,3 @@ index 2f20d49793..303f47c86d 100644
case HTT_DBG_STATS_RX_REMOTE_RING_BUFFER_INFO:
bytes = sizeof(struct
rx_remote_buffer_mgmt_stats);
if (req->base.copy.buf) {