1*4882a593SmuzhiyunFrom 12d3b3c01b0ec28d45427754541a8156939346d9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 13 Aug 2020 23:24:05 +0200 4*4882a593SmuzhiyunSubject: [PATCH] plt.h: fix build with gcc 10 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDrop EFUSE_PARAMETER_TYPE_ENM to fix the following build failure with 7*4882a593Smuzhiyungcc 10: 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/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*4882a593Smuzhiyun/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*4882a593Smuzhiyun/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': 12*4882a593Smuzhiyuncalibrator.c:(.bss+0xc): multiple definition of `EFUSE_PARAMETER_TYPE_ENM'; nvs.o:(.bss+0x0): first defined here 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunFixes: 15*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/df2d04de4b2e5003f3fc56c9e84db5054bd4d499 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 18*4882a593Smuzhiyun[Upstream status: sent to sudharshan <sudharshan@ti.com>] 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun plt.h | 2 +- 21*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/plt.h b/plt.h 24*4882a593Smuzhiyunindex 8b534a9..43d5dbc 100644 25*4882a593Smuzhiyun--- a/plt.h 26*4882a593Smuzhiyun+++ b/plt.h 27*4882a593Smuzhiyun@@ -399,7 +399,7 @@ enum EFUSE_PARAMETER_TYPE_ENMT { 28*4882a593Smuzhiyun TX_BIP_PD_BUFFER_VBIAS_ERROR_E, 29*4882a593Smuzhiyun EFUSE_NUMBER_OF_PARAMETERS_E, 30*4882a593Smuzhiyun EFUSE_LAST_PARAMETER_E = (EFUSE_NUMBER_OF_PARAMETERS_E - 1) 31*4882a593Smuzhiyun-} EFUSE_PARAMETER_TYPE_ENM; 32*4882a593Smuzhiyun+}; 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun int get_mac_addr(int ifc_num, unsigned char *mac_addr); 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun-- 37*4882a593Smuzhiyun2.27.0 38*4882a593Smuzhiyun 39