aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/wl18xx-calibrator
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-12 07:17:11 +0000
committerDenys Dmytriyenko <denys@ti.com>2020-08-14 22:37:03 +0000
commit263b1fec3840db1bf6b5d3ba60e6f81c6fcd6219 (patch)
tree2d3335ddbb6b8a656810f170b357897a79440df8 /recipes-connectivity/wl18xx-calibrator
parent99935ce71bda80b8013febf54e94055c92d10eb1 (diff)
downloadmeta-ti-263b1fec3840db1bf6b5d3ba60e6f81c6fcd6219.tar.gz
meta-ti-263b1fec3840db1bf6b5d3ba60e6f81c6fcd6219.tar.bz2
meta-ti-263b1fec3840db1bf6b5d3ba60e6f81c6fcd6219.zip
wl18xx-calibrator: Fix build with -fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-connectivity/wl18xx-calibrator')
-rw-r--r--recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator/0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch35
-rw-r--r--recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb4
2 files changed, 38 insertions, 1 deletions
diff --git a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator/0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator/0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch
new file mode 100644
index 000000000..fc5542e04
--- /dev/null
+++ b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator/0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch
@@ -0,0 +1,35 @@
+From e3f694496322d3679dd9b007dc3caa4343f0f376 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 11 Aug 2020 18:12:58 -0700
+Subject: [PATCH] plt.h: Do not define EFUSE_PARAMETER_TYPE_ENMT type enum in
+ header file
+
+gcc10 uses -fno-common by default and this causes multiple definitions
+of this enum in all files including plt.h file, therefore just define
+the type in header file
+
+Fixes
+arm-yoe-linux-musleabi-ld: misc_cmds.o:/usr/src/debug/wl18xx-calibrator/8.7.3-r0/git/./plt.h:402: multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:/usr/src/debug/wl18xx-calibrator/8.7.3-r0/git/./plt.h:402: first defined here
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plt.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plt.h b/plt.h
+index 8b534a9..43d5dbc 100644
+--- a/plt.h
++++ b/plt.h
+@@ -399,7 +399,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT {
+ TX_BIP_PD_BUFFER_VBIAS_ERROR_E,
+ EFUSE_NUMBER_OF_PARAMETERS_E,
+ EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1)
+-} EFUSE_PARAMETER_TYPE_ENM;
++};
+
+ int get_mac_addr(int ifc_num, unsigned char *mac_addr);
+
+--
+2.28.0
+
diff --git a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
index 8a759ed88..f9a4448fa 100644
--- a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
+++ b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
@@ -7,7 +7,9 @@ RDEPENDS_${PN} = "wl18xx-fw"
#Tag: R8.7_SP3 (8.7.3)
SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
+SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git \
+ file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \
+ "
S = "${WORKDIR}/git"