1From 12d3b3c01b0ec28d45427754541a8156939346d9 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Thu, 13 Aug 2020 23:24:05 +0200 4Subject: [PATCH] plt.h: fix build with gcc 10 5 6Drop EFUSE_PARAMETER_TYPE_ENM to fix the following build failure with 7gcc 10: 8 9/home/buildroot/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -L/home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/lib nvs.o misc_cmds.o calibrator.o plt.o wl18xx_plt.o ini.o -lm -lnl-3 -lnl-genl-3 -o calibrator 10/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: misc_cmds.o:(.bss+0x0): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here 11/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: calibrator.o: in function `.LANCHOR0': 12calibrator.c:(.bss+0xc): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here 13 14Fixes: 15 - http://autobuild.buildroot.org/results/df2d04de4b2e5003f3fc56c9e84db5054bd4d499 16 17Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 18[Upstream status: sent to sudharshan <sudharshan@ti.com>] 19--- 20 plt.h | 2 +- 21 1 file changed, 1 insertion(+), 1 deletion(-) 22 23diff --git a/plt.h b/plt.h 24index 8b534a9..43d5dbc 100644 25--- a/plt.h 26+++ b/plt.h 27@@ -399,7 +399,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT { 28 TX_BIP_PD_BUFFER_VBIAS_ERROR_E, 29 EFUSE_NUMBER_OF_PARAMETERS_E, 30 EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1) 31-} EFUSE_PARAMETER_TYPE_ENM; 32+}; 33 34 int get_mac_addr(int ifc_num, unsigned char *mac_addr); 35 36-- 372.27.0 38 39