* [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21
@ 2025-07-01 19:08 Giulio Benetti
2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189fs: " Giulio Benetti
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw)
To: buildroot
Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat,
Sergey Matyukevich
With this version we can build with Linux 6.15.
Fixes:
still not occured.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
package/rtl8189es/rtl8189es.hash | 3 ++-
package/rtl8189es/rtl8189es.mk | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash
index 28dedca8d3..c0c7a7a0ea 100644
--- a/package/rtl8189es/rtl8189es.hash
+++ b/package/rtl8189es/rtl8189es.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 85aa06192594d8e5885eaec72e3792c7816f714d682897ff0cbd0ba48a134dcc rtl8189es-fcf2a5746e6fe11d9d71337ee5dac6cf43423a97.tar.gz
+sha256 a6a7455bb1533add9ebb3afa8634d85644bcdb76279020b663e6a3f03681aaff rtl8189es-07f03cf721f5e0317012ece4159834327680ba8b.tar.gz
+
diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk
index 49a6ddfd1a..b60b08fe34 100644
--- a/package/rtl8189es/rtl8189es.mk
+++ b/package/rtl8189es/rtl8189es.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RTL8189ES_VERSION = fcf2a5746e6fe11d9d71337ee5dac6cf43423a97
+RTL8189ES_VERSION = 07f03cf721f5e0317012ece4159834327680ba8b
RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION))
RTL8189ES_LICENSE = GPL-2.0
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH] package/rtl8189fs: bump to version 2025-06-21 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti @ 2025-07-01 19:08 ` Giulio Benetti 2025-07-21 21:03 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version Giulio Benetti ` (4 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw) To: buildroot Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich With this version we can build with Linux 6.14. Fixes: still not occured. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index eedbb46bea..1e1691e535 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 40a0890d3ea2d6d2b58748a9e05e20a14942c0f7652a0178e7466e8279106345 rtl8189fs-3f34f380715b88e4a3ef049b3a60e2fc69ccc9bd.tar.gz +sha256 8209950e00716c4731675bbf5ee6ee8d54b010e70f86245c70d5c85fddee5694 rtl8189fs-d0f15f392570499f3e48f6d157c89cadf393a739.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 800956a927..abd159f22f 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 3f34f380715b88e4a3ef049b3a60e2fc69ccc9bd +RTL8189FS_VERSION = d0f15f392570499f3e48f6d157c89cadf393a739 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8189fs: bump to version 2025-06-21 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189fs: " Giulio Benetti @ 2025-07-21 21:03 ` Julien Olivain via buildroot 0 siblings, 0 replies; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 21:03 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich On 01/07/2025 21:08, Giulio Benetti wrote: > With this version we can build with Linux 6.14. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189fs: " Giulio Benetti @ 2025-07-01 19:08 ` Giulio Benetti 2025-07-21 21:03 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 Giulio Benetti ` (3 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw) To: buildroot Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich This version allows to build with Linux 6.16. Fixes: still not occured. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 0c6009f05e..847a0d4fc6 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 04cd204046bae15cfd64643d1f2d15d215acc0bd0b6b3da2404f001d5e172557 rtl8192eu-c014d0970c8052e8b2306e24ccc92f6fe738458d.tar.gz +sha256 6cb82ae3c5c5cf783b9150035459ecb4a13aaa614d0a8bb3ab938d54f4feeb74 rtl8192eu-0a170fe9a9cd75ea4df3c209fa4a02f9858483e5.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 48c1217300..ebd376c475 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = c014d0970c8052e8b2306e24ccc92f6fe738458d +RTL8192EU_VERSION = 0a170fe9a9cd75ea4df3c209fa4a02f9858483e5 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version Giulio Benetti @ 2025-07-21 21:03 ` Julien Olivain via buildroot 0 siblings, 0 replies; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 21:03 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich On 01/07/2025 21:08, Giulio Benetti wrote: > This version allows to build with Linux 6.16. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189fs: " Giulio Benetti 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version Giulio Benetti @ 2025-07-01 19:08 ` Giulio Benetti 2025-07-21 20:59 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build " Giulio Benetti ` (2 subsequent siblings) 5 siblings, 1 reply; 14+ messages in thread From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw) To: buildroot Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Add local patch pending upstream to fix build failure with Linux 6.15 Fixes: still not occured. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- .../0001-Fix-build-with-Linux-6.15.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch diff --git a/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch new file mode 100644 index 0000000000..ce0b3f3908 --- /dev/null +++ b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch @@ -0,0 +1,38 @@ +From 6e170c96bf50a1088d5dd85fdfd67dc7f83e4eb9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <giulio.benetti@benettiengineering.com> +Date: Tue, 1 Jul 2025 20:51:40 +0200 +Subject: [PATCH] Fix build with Linux 6.15 + +Commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8fa7292fee5c5240402371ea89 +ab285ec856c916 +drops del_timer_sync() in favor of timer_delete_sync() so let's backport +locally functions del_timer_sync() when Linux version is 6.15.0 or later. + +Upstream: https://github.com/fifteenhex/xradio/pull/26 +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +--- + xradio.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/xradio.h b/xradio.h +index e7f60f6..9506986 100644 +--- a/xradio.h ++++ b/xradio.h +@@ -47,6 +47,13 @@ + #include "pm.h" + #include "fwio.h" + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++static inline int del_timer_sync(struct timer_list *timer) ++{ ++ return timer_delete_sync(timer); ++} ++#endif ++ + /* #define ROC_DEBUG */ + /* hidden ssid is only supported when separate probe resp IE + configuration is supported */ +-- +2.39.5 + -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 Giulio Benetti @ 2025-07-21 20:59 ` Julien Olivain via buildroot 2025-07-22 16:33 ` Giulio Benetti 0 siblings, 1 reply; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 20:59 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Hi Giulio, On 01/07/2025 21:08, Giulio Benetti wrote: > Add local patch pending upstream to fix build failure with Linux 6.15 > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > .../0001-Fix-build-with-Linux-6.15.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 > package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch > > diff --git a/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch > b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch The patch title mention "package/rtl8189es" but the package patch is added in "package/xr819-xradio". Could you clarify or send an updated patch if this is a mixup, please? > new file mode 100644 > index 0000000000..ce0b3f3908 > --- /dev/null > +++ b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch > @@ -0,0 +1,38 @@ > +From 6e170c96bf50a1088d5dd85fdfd67dc7f83e4eb9 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti <giulio.benetti@benettiengineering.com> > +Date: Tue, 1 Jul 2025 20:51:40 +0200 > +Subject: [PATCH] Fix build with Linux 6.15 > + > +Commit: > +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8fa7292fee5c5240402371ea89 > +ab285ec856c916 > +drops del_timer_sync() in favor of timer_delete_sync() so let's > backport > +locally functions del_timer_sync() when Linux version is 6.15.0 or > later. > + > +Upstream: https://github.com/fifteenhex/xradio/pull/26 > +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > +--- > + xradio.h | 7 +++++++ > + 1 file changed, 7 insertions(+) > + > +diff --git a/xradio.h b/xradio.h > +index e7f60f6..9506986 100644 > +--- a/xradio.h > ++++ b/xradio.h > +@@ -47,6 +47,13 @@ > + #include "pm.h" > + #include "fwio.h" > + > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) > ++static inline int del_timer_sync(struct timer_list *timer) > ++{ > ++ return timer_delete_sync(timer); > ++} > ++#endif > ++ > + /* #define ROC_DEBUG */ > + /* hidden ssid is only supported when separate probe resp IE > + configuration is supported */ > +-- > +2.39.5 > + > -- > 2.39.5 Best regards, Julien. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 2025-07-21 20:59 ` Julien Olivain via buildroot @ 2025-07-22 16:33 ` Giulio Benetti 0 siblings, 0 replies; 14+ messages in thread From: Giulio Benetti @ 2025-07-22 16:33 UTC (permalink / raw) To: Julien Olivain Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Hi Julien, On 7/21/25 22:59, Julien Olivain wrote: > Hi Giulio, > > On 01/07/2025 21:08, Giulio Benetti wrote: >> Add local patch pending upstream to fix build failure with Linux 6.15 >> >> Fixes: >> still not occured. >> >> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> >> --- >> .../0001-Fix-build-with-Linux-6.15.patch | 38 +++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> create mode 100644 package/xr819-xradio/0001-Fix-build-with- >> Linux-6.15.patch >> >> diff --git a/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch >> b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch > > The patch title mention "package/rtl8189es" but the package patch > is added in "package/xr819-xradio". Could you clarify or send an updated > patch if this is a mixup, please? I've confused it with all the other drivers, yes. I've just sent another patch with patch upstreamed: https://patchwork.ozlabs.org/project/buildroot/patch/20250722163049.2584798-1-giulio.benetti@benettiengineering.com/ -- Giulio Benetti CEO&CTO@Benetti Engineering sas https://www.linkedin.com/company/benetti-engineering-sas/ https://www.linkedin.com/in/giulio-benetti-79975951/ >> new file mode 100644 >> index 0000000000..ce0b3f3908 >> --- /dev/null >> +++ b/package/xr819-xradio/0001-Fix-build-with-Linux-6.15.patch >> @@ -0,0 +1,38 @@ >> +From 6e170c96bf50a1088d5dd85fdfd67dc7f83e4eb9 Mon Sep 17 00:00:00 2001 >> +From: Giulio Benetti <giulio.benetti@benettiengineering.com> >> +Date: Tue, 1 Jul 2025 20:51:40 +0200 >> +Subject: [PATCH] Fix build with Linux 6.15 >> + >> +Commit: >> +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ >> commit/?id=8fa7292fee5c5240402371ea89 >> +ab285ec856c916 >> +drops del_timer_sync() in favor of timer_delete_sync() so let's backport >> +locally functions del_timer_sync() when Linux version is 6.15.0 or >> later. >> + >> +Upstream: https://github.com/fifteenhex/xradio/pull/26 >> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> >> +--- >> + xradio.h | 7 +++++++ >> + 1 file changed, 7 insertions(+) >> + >> +diff --git a/xradio.h b/xradio.h >> +index e7f60f6..9506986 100644 >> +--- a/xradio.h >> ++++ b/xradio.h >> +@@ -47,6 +47,13 @@ >> + #include "pm.h" >> + #include "fwio.h" >> + >> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) >> ++static inline int del_timer_sync(struct timer_list *timer) >> ++{ >> ++ return timer_delete_sync(timer); >> ++} >> ++#endif >> ++ >> + /* #define ROC_DEBUG */ >> + /* hidden ssid is only supported when separate probe resp IE >> + configuration is supported */ >> +-- >> +2.39.5 >> + >> -- >> 2.39.5 > > Best regards, > > Julien. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build with Linux 6.15 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti ` (2 preceding siblings ...) 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 Giulio Benetti @ 2025-07-01 19:08 ` Giulio Benetti 2025-07-21 21:04 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/wilc-driver: fix build failure " Giulio Benetti 2025-07-21 21:02 ` [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Julien Olivain via buildroot 5 siblings, 1 reply; 14+ messages in thread From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw) To: buildroot Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Add local patch pending upstream to fix build failure with Linux 6.15. Fixes: still not occured. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- .../0001-fix-build-for-kernel-6.15.patch | 1637 +++++++++++++++++ 1 file changed, 1637 insertions(+) create mode 100644 package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch diff --git a/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch b/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch new file mode 100644 index 0000000000..a48214fea2 --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0001-fix-build-for-kernel-6.15.patch @@ -0,0 +1,1637 @@ +From bfb09454a243547bea3e02d6c6df2ffdc1218fea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dominik=20W=C3=B3jt?= <domin144@o2.pl> +Date: Sat, 3 May 2025 19:18:54 +0200 +Subject: [PATCH] fix build for kernel 6.15 + +Upstream: https://github.com/aircrack-ng/rtl8812au/pull/1229 +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +--- + Makefile | 760 ++++++++++++++++---------------- + hal/phydm/phydm.mk | 4 +- + hal/phydm/sd4_phydm_2_kernel.mk | 2 +- + include/osdep_service_linux.h | 4 + + 4 files changed, 389 insertions(+), 381 deletions(-) + +diff --git a/Makefile b/Makefile +index 10acbd2..d6e5809 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,27 +1,27 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie +-EXTRA_CFLAGS += -O3 +-EXTRA_CFLAGS += -Wno-unused-variable +-#EXTRA_CFLAGS += -Wno-unused-value +-EXTRA_CFLAGS += -Wno-unused-label +-#EXTRA_CFLAGS += -Wno-unused-parameter +-EXTRA_CFLAGS += -Wno-unused-function +-EXTRA_CFLAGS += -Wno-implicit-fallthrough +-EXTRA_CFLAGS += -Wno-cast-function-type +-EXTRA_CFLAGS += -Wno-missing-declarations +-EXTRA_CFLAGS += -Wno-missing-prototypes +-#EXTRA_CFLAGS += -Wno-error=cast-function-type +-#EXTRA_CFLAGS += -Wno-parentheses-equality +-#EXTRA_CFLAGS += -Wno-error=incompatible-pointer-types +-EXTRA_CFLAGS += -Wno-stringop-overread +-#EXTRA_CFLAGS += -Wno-pointer-bool-conversion +-EXTRA_CFLAGS += -Wno-unknown-pragmas +-#EXTRA_CFLAGS += -Wno-unused +-EXTRA_CFLAGS += -Wno-address +-EXTRA_CFLAGS += -Wno-vla -g +- +-EXTRA_CFLAGS += -I$(src)/include -I$(srctree)/$(src)/include +-EXTRA_CFLAGS += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm +-EXTRA_LDFLAGS += --strip-all -O3 ++ccflags-y += $(USER_EXTRA_CFLAGS) -fno-pie ++ccflags-y += -O3 ++ccflags-y += -Wno-unused-variable ++#ccflags-y += -Wno-unused-value ++ccflags-y += -Wno-unused-label ++#ccflags-y += -Wno-unused-parameter ++ccflags-y += -Wno-unused-function ++ccflags-y += -Wno-implicit-fallthrough ++ccflags-y += -Wno-cast-function-type ++ccflags-y += -Wno-missing-declarations ++ccflags-y += -Wno-missing-prototypes ++#ccflags-y += -Wno-error=cast-function-type ++#ccflags-y += -Wno-parentheses-equality ++#ccflags-y += -Wno-error=incompatible-pointer-types ++ccflags-y += -Wno-stringop-overread ++#ccflags-y += -Wno-pointer-bool-conversion ++ccflags-y += -Wno-unknown-pragmas ++#ccflags-y += -Wno-unused ++ccflags-y += -Wno-address ++ccflags-y += -Wno-vla -g ++ ++ccflags-y += -I$(src)/include -I$(srctree)/$(src)/include ++ccflags-y += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm ++ldflags-y += --strip-all -O3 + + ########################## WIFI IC ############################ + CONFIG_RTL8812A = y +@@ -189,12 +189,12 @@ endif + + ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) + +-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" ++ccflags-y += -DDRV_NAME=\"rtl88XXau\" + ifeq ($(CONFIG_USB_HCI), y) + USER_MODULE_NAME = 88XXau + endif + else +-EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" ++ccflags-y += -DDRV_NAME=\"rtl8812au\" + endif + + _OS_INTFS_FILES := os_dep/osdep_service.o \ +@@ -230,10 +230,10 @@ _HAL_INTFS_FILES := hal/hal_intf.o \ + hal/led/hal_$(HCI_NAME)_led.o + + +-EXTRA_CFLAGS += -I$(src)/platform -I$(srctree)/$(src)/platform ++ccflags-y += -I$(src)/platform -I$(srctree)/$(src)/platform + _PLATFORM_FILES := platform/platform_ops.o + +-EXTRA_CFLAGS += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc ++ccflags-y += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc + + + ########### HAL_RTL8812A_RTL8821A ################################# +@@ -292,7 +292,7 @@ endif + endif + + ifeq ($(CONFIG_RTL8812A), y) +-EXTRA_CFLAGS += -DCONFIG_RTL8812A ++ccflags-y += -DCONFIG_RTL8812A + _HAL_INTFS_FILES += hal/rtl8812a/hal8812a_fw.o + endif + +@@ -310,7 +310,7 @@ endif + endif + endif + +-EXTRA_CFLAGS += -DCONFIG_RTL8821A ++ccflags-y += -DCONFIG_RTL8821A + + _HAL_INTFS_FILES += hal/rtl8812a/hal8821a_fw.o + endif +@@ -331,7 +331,7 @@ endif + ########### HAL_RTL8814A ################################# + ifeq ($(CONFIG_RTL8814A), y) + ## ADD NEW VHT MP HW TX MODE ## +-#EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE ++#ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE + CONFIG_MP_VHT_HW_TX_MODE = n + ########################################## + RTL871X = rtl8814a +@@ -339,7 +339,7 @@ ifeq ($(CONFIG_USB_HCI), y) + MODULE_NAME = 8814au + endif + +-EXTRA_CFLAGS += -DCONFIG_RTL8814A ++ccflags-y += -DCONFIG_RTL8814A + + _HAL_INTFS_FILES += hal/HalPwrSeqCmd.o \ + hal/$(RTL871X)/Hal8814PwrSeq.o \ +@@ -390,274 +390,274 @@ endif + + ifeq ($(CONFIG_USB_HCI), y) + ifeq ($(CONFIG_USB_AUTOSUSPEND), y) +-EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND ++ccflags-y += -DCONFIG_USB_AUTOSUSPEND + endif + endif + + ifeq ($(CONFIG_MP_INCLUDED), y) + #MODULE_NAME := $(MODULE_NAME)_mp +-EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED ++ccflags-y += -DCONFIG_MP_INCLUDED + endif + + ifeq ($(CONFIG_POWER_SAVING), y) +-EXTRA_CFLAGS += -DCONFIG_POWER_SAVING ++ccflags-y += -DCONFIG_POWER_SAVING + endif + + ifeq ($(CONFIG_HW_PWRP_DETECTION), y) +-EXTRA_CFLAGS += -DCONFIG_HW_PWRP_DETECTION ++ccflags-y += -DCONFIG_HW_PWRP_DETECTION + endif + + ifeq ($(CONFIG_BT_COEXIST), y) +-EXTRA_CFLAGS += -DCONFIG_BT_COEXIST ++ccflags-y += -DCONFIG_BT_COEXIST + endif + + ifeq ($(CONFIG_INTEL_WIDI), y) +-EXTRA_CFLAGS += -DCONFIG_INTEL_WIDI ++ccflags-y += -DCONFIG_INTEL_WIDI + endif + + ifeq ($(CONFIG_WAPI_SUPPORT), y) +-EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT ++ccflags-y += -DCONFIG_WAPI_SUPPORT + endif + + ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y) +-EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE ++ccflags-y += -DCONFIG_EFUSE_CONFIG_FILE + + #EFUSE_MAP_PATH + USER_EFUSE_MAP_PATH ?= + ifneq ($(USER_EFUSE_MAP_PATH),) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\" ++ccflags-y += -DEFUSE_MAP_PATH=\"$(USER_EFUSE_MAP_PATH)\" + else ifeq ($(MODULE_NAME), 8189es) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8189e.map\" + else ifeq ($(MODULE_NAME), 8723bs) +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_8723bs.map\" + else +-EXTRA_CFLAGS += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\" ++ccflags-y += -DEFUSE_MAP_PATH=\"/system/etc/wifi/wifi_efuse_$(MODULE_NAME).map\" + endif + + #WIFIMAC_PATH + USER_WIFIMAC_PATH ?= + ifneq ($(USER_WIFIMAC_PATH),) +-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" ++ccflags-y += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\" + else +-EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\" ++ccflags-y += -DWIFIMAC_PATH=\"/data/wifimac.txt\" + endif + + endif + + ifeq ($(CONFIG_EXT_CLK), y) +-EXTRA_CFLAGS += -DCONFIG_EXT_CLK ++ccflags-y += -DCONFIG_EXT_CLK + endif + + ifeq ($(CONFIG_TRAFFIC_PROTECT), y) +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + endif + + ifeq ($(CONFIG_LOAD_PHY_PARA_FROM_FILE), y) +-EXTRA_CFLAGS += -DCONFIG_LOAD_PHY_PARA_FROM_FILE +-#EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER +-EXTRA_CFLAGS += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\" ++ccflags-y += -DCONFIG_LOAD_PHY_PARA_FROM_FILE ++#ccflags-y += -DREALTEK_CONFIG_PATH_WITH_IC_NAME_FOLDER ++ccflags-y += -DREALTEK_CONFIG_PATH=\"/lib/firmware/\" + endif + + ifeq ($(CONFIG_TXPWR_BY_RATE), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=0 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE=0 + else ifeq ($(CONFIG_TXPWR_BY_RATE), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE=1 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE=1 + endif + ifeq ($(CONFIG_TXPWR_BY_RATE_EN), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=0 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=0 + else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=1 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=1 + else ifeq ($(CONFIG_TXPWR_BY_RATE_EN), auto) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_BY_RATE_EN=2 ++ccflags-y += -DCONFIG_TXPWR_BY_RATE_EN=2 + endif + + ifeq ($(CONFIG_TXPWR_LIMIT), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=0 ++ccflags-y += -DCONFIG_TXPWR_LIMIT=0 + else ifeq ($(CONFIG_TXPWR_LIMIT), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT=1 ++ccflags-y += -DCONFIG_TXPWR_LIMIT=1 + endif + ifeq ($(CONFIG_TXPWR_LIMIT_EN), n) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=0 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=0 + else ifeq ($(CONFIG_TXPWR_LIMIT_EN), y) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=1 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=1 + else ifeq ($(CONFIG_TXPWR_LIMIT_EN), auto) +-EXTRA_CFLAGS += -DCONFIG_TXPWR_LIMIT_EN=2 ++ccflags-y += -DCONFIG_TXPWR_LIMIT_EN=2 + endif + + ifneq ($(CONFIG_RTW_CHPLAN), 0xFF) +-EXTRA_CFLAGS += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN) ++ccflags-y += -DCONFIG_RTW_CHPLAN=$(CONFIG_RTW_CHPLAN) + endif + + ifeq ($(CONFIG_CALIBRATE_TX_POWER_BY_REGULATORY), y) +-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY ++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_BY_REGULATORY + endif + + ifeq ($(CONFIG_CALIBRATE_TX_POWER_TO_MAX), y) +-EXTRA_CFLAGS += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX ++ccflags-y += -DCONFIG_CALIBRATE_TX_POWER_TO_MAX + endif + + ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), disable) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=0 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=0 + else ifeq ($(CONFIG_RTW_ADAPTIVITY_EN), enable) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_EN=1 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_EN=1 + endif + + ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), normal) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=0 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=0 + else ifeq ($(CONFIG_RTW_ADAPTIVITY_MODE), carrier_sense) +-EXTRA_CFLAGS += -DCONFIG_RTW_ADAPTIVITY_MODE=1 ++ccflags-y += -DCONFIG_RTW_ADAPTIVITY_MODE=1 + endif + + ifeq ($(CONFIG_SIGNAL_SCALE_MAPPING), y) +-EXTRA_CFLAGS += -DCONFIG_SIGNAL_SCALE_MAPPING ++ccflags-y += -DCONFIG_SIGNAL_SCALE_MAPPING + endif + + ifeq ($(CONFIG_80211W), y) +-EXTRA_CFLAGS += -DCONFIG_IEEE80211W ++ccflags-y += -DCONFIG_IEEE80211W + endif + + ifeq ($(CONFIG_WOWLAN), y) +-EXTRA_CFLAGS += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE) +-EXTRA_CFLAGS += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE) ++ccflags-y += -DCONFIG_WOWLAN -DRTW_WAKEUP_EVENT=$(CONFIG_WAKEUP_TYPE) ++ccflags-y += -DRTW_SUSPEND_TYPE=$(CONFIG_SUSPEND_TYPE) + ifeq ($(CONFIG_WOW_STA_MIX), y) +-EXTRA_CFLAGS += -DRTW_WOW_STA_MIX ++ccflags-y += -DRTW_WOW_STA_MIX + endif + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_AP_WOWLAN), y) +-EXTRA_CFLAGS += -DCONFIG_AP_WOWLAN ++ccflags-y += -DCONFIG_AP_WOWLAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_PNO_SUPPORT), y) +-EXTRA_CFLAGS += -DCONFIG_PNO_SUPPORT ++ccflags-y += -DCONFIG_PNO_SUPPORT + ifeq ($(CONFIG_PNO_SET_DEBUG), y) +-EXTRA_CFLAGS += -DCONFIG_PNO_SET_DEBUG ++ccflags-y += -DCONFIG_PNO_SET_DEBUG + endif + endif + + ifeq ($(CONFIG_GPIO_WAKEUP), y) +-EXTRA_CFLAGS += -DCONFIG_GPIO_WAKEUP ++ccflags-y += -DCONFIG_GPIO_WAKEUP + ifeq ($(CONFIG_ONE_PIN_GPIO), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_ONE_PIN_GPIO ++ccflags-y += -DCONFIG_RTW_ONE_PIN_GPIO + endif + ifeq ($(CONFIG_HIGH_ACTIVE_DEV2HST), y) +-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=1 ++ccflags-y += -DHIGH_ACTIVE_DEV2HST=1 + else +-EXTRA_CFLAGS += -DHIGH_ACTIVE_DEV2HST=0 ++ccflags-y += -DHIGH_ACTIVE_DEV2HST=0 + endif + endif + + ifeq ($(CONFIG_HIGH_ACTIVE_HST2DEV), y) +-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=1 ++ccflags-y += -DHIGH_ACTIVE_HST2DEV=1 + else +-EXTRA_CFLAGS += -DHIGH_ACTIVE_HST2DEV=0 ++ccflags-y += -DHIGH_ACTIVE_HST2DEV=0 + endif + + ifneq ($(CONFIG_WAKEUP_GPIO_IDX), default) +-EXTRA_CFLAGS += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX) ++ccflags-y += -DWAKEUP_GPIO_IDX=$(CONFIG_WAKEUP_GPIO_IDX) + endif + + ifeq ($(CONFIG_RTW_SDIO_PM_KEEP_POWER), y) + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_SDIO_PM_KEEP_POWER ++ccflags-y += -DCONFIG_RTW_SDIO_PM_KEEP_POWER + endif + endif + + ifeq ($(CONFIG_REDUCE_TX_CPU_LOADING), y) +-EXTRA_CFLAGS += -DCONFIG_REDUCE_TX_CPU_LOADING ++ccflags-y += -DCONFIG_REDUCE_TX_CPU_LOADING + endif + + ifeq ($(CONFIG_BR_EXT), y) + BR_NAME = br0 +-EXTRA_CFLAGS += -DCONFIG_BR_EXT +-EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' ++ccflags-y += -DCONFIG_BR_EXT ++ccflags-y += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"' + endif + + + ifeq ($(CONFIG_TDLS), y) +-EXTRA_CFLAGS += -DCONFIG_TDLS ++ccflags-y += -DCONFIG_TDLS + endif + + ifeq ($(CONFIG_WIFI_MONITOR), y) +-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR ++ccflags-y += -DCONFIG_WIFI_MONITOR + endif + + ifeq ($(CONFIG_MCC_MODE), y) +-EXTRA_CFLAGS += -DCONFIG_MCC_MODE ++ccflags-y += -DCONFIG_MCC_MODE + endif + + ifeq ($(CONFIG_RTW_NAPI), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_NAPI ++ccflags-y += -DCONFIG_RTW_NAPI + endif + + ifeq ($(CONFIG_RTW_GRO), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_GRO ++ccflags-y += -DCONFIG_RTW_GRO + endif + + ifeq ($(CONFIG_RTW_REPEATER_SON), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_REPEATER_SON ++ccflags-y += -DCONFIG_RTW_REPEATER_SON + endif + + ifeq ($(CONFIG_RTW_IPCAM_APPLICATION), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_IPCAM_APPLICATION ++ccflags-y += -DCONFIG_RTW_IPCAM_APPLICATION + ifeq ($(CONFIG_WIFI_MONITOR), n) +-EXTRA_CFLAGS += -DCONFIG_WIFI_MONITOR ++ccflags-y += -DCONFIG_WIFI_MONITOR + endif + endif + + ifeq ($(CONFIG_RTW_NETIF_SG), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG ++ccflags-y += -DCONFIG_RTW_NETIF_SG + endif + + ifeq ($(CONFIG_TX_CSUM_OFFLOAD), y) +-EXTRA_CFLAGS += -DCONFIG_TX_CSUM_OFFLOAD ++ccflags-y += -DCONFIG_TX_CSUM_OFFLOAD + endif + + ifeq ($(CONFIG_ICMP_VOQ), y) +-EXTRA_CFLAGS += -DCONFIG_ICMP_VOQ ++ccflags-y += -DCONFIG_ICMP_VOQ + endif + + ifeq ($(CONFIG_IP_R_MONITOR), y) +-EXTRA_CFLAGS += -DCONFIG_IP_R_MONITOR ++ccflags-y += -DCONFIG_IP_R_MONITOR + endif + + ifeq ($(CONFIG_RTW_WIFI_HAL), y) +-#EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL_DEBUG +-EXTRA_CFLAGS += -DCONFIG_RTW_WIFI_HAL +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVEDNOR_LLSTATS +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVENDOR_RANDOM_MAC_OUI +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVEDNOR_RSSIMONITOR +-EXTRA_CFLAGS += -DCONFIG_RTW_CFGVENDOR_WIFI_LOGGER ++#ccflags-y += -DCONFIG_RTW_WIFI_HAL_DEBUG ++ccflags-y += -DCONFIG_RTW_WIFI_HAL ++ccflags-y += -DCONFIG_RTW_CFGVEDNOR_LLSTATS ++ccflags-y += -DCONFIG_RTW_CFGVENDOR_RANDOM_MAC_OUI ++ccflags-y += -DCONFIG_RTW_CFGVEDNOR_RSSIMONITOR ++ccflags-y += -DCONFIG_RTW_CFGVENDOR_WIFI_LOGGER + endif + + ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y) +-EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE ++ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE + endif + + ifeq ($(CONFIG_APPEND_VENDOR_IE_ENABLE), y) +-EXTRA_CFLAGS += -DCONFIG_APPEND_VENDOR_IE_ENABLE ++ccflags-y += -DCONFIG_APPEND_VENDOR_IE_ENABLE + endif + + ifeq ($(CONFIG_RTW_DEBUG), y) +-EXTRA_CFLAGS += -DCONFIG_RTW_DEBUG +-EXTRA_CFLAGS += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) ++ccflags-y += -DCONFIG_RTW_DEBUG ++ccflags-y += -DRTW_LOG_LEVEL=$(CONFIG_RTW_LOG_LEVEL) + endif + +-EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04 ++ccflags-y += -DDM_ODM_SUPPORT_TYPE=0x04 + + ifeq ($(CONFIG_RTW_VIRTUAL_INTF), y) +-EXTRA_CFLAGS += -DRTW_VIRTUAL_INTF=1 ++ccflags-y += -DRTW_VIRTUAL_INTF=1 + endif + + ifeq ($(CONFIG_PLATFORM_I386_PC), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/; s/riscv.*/riscv/;") + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?= +@@ -669,8 +669,8 @@ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RPI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -680,8 +680,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM64_RPI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm64 + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -691,8 +691,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM_NV_NANO), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm64 + KVER := $(shell uname -r) + KSRC := /lib/modules/$(KVER)/build +@@ -702,8 +702,8 @@ STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging + endif + + ifeq ($(CONFIG_PLATFORM_ARM_ODROIDC2), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH ?= arm64 + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -713,8 +713,8 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_PPC), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e s/ppc/powerpc/) + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?= +@@ -725,16 +725,16 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_NV_TK1), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_NV_TK1 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_PLATFORM_ANDROID + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK +-EXTRA_CFLAGS += -DRTW_VENDOR_EXT_SUPPORT +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_RADIO_WORK ++ccflags-y += -DRTW_VENDOR_EXT_SUPPORT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC + ARCH ?= arm + + CROSS_COMPILE := /mnt/newdisk/android_sdk/nvidia_tk1/android_L/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi- +@@ -743,9 +743,9 @@ MODULE_NAME = wlan + endif + + ifeq ($(CONFIG_PLATFORM_NV_TK1_UBUNTU), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_NV_TK1 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + ARCH ?= arm + +@@ -757,7 +757,7 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM702X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ACTIONS_ATM702X + #ARCH := arm + ARCH := $(R_ARCH) + #CROSS_COMPILE := arm-none-linux-gnueabi- +@@ -769,18 +769,18 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-#EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++#ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ACTIONS_ATM705X +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_ACTIONS_ATM705X ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_arm_act_sdio.o + endif + +@@ -790,20 +790,20 @@ KSRC := /home/android_sdk/Action-semi/705a_android_L/android/kernel + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN50IW1P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN50IW1P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN50IW1P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE ++ccflags-y += -DCONFIG_PLATFORM_OPS + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -817,14 +817,14 @@ KSRC :=/home/android_sdk/Allwinner/a64/android-51/lichee/linux-3.10/ + endif + + ifeq ($(CONFIG_PLATFORM_TI_AM3517), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_SHUTTLE + CROSS_COMPILE := arm-eabi- + KSRC := $(shell pwd)/../../../Android/kernel + ARCH := arm + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR_TITANIA12), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR -DCONFIG_PLATFORM_MSTAR_TITANIA12 + ARCH:=mips + CROSS_COMPILE:= /usr/src/Mstar_kernel/mips-4.3/bin/mips-linux-gnu- + KVER:= 2.6.28.9 +@@ -832,13 +832,13 @@ KSRC:= /usr/src/Mstar_kernel/2.6.28.9/ + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR), y) +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_MSTAR_HIGH ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_MSTAR ++ccflags-y += -DCONFIG_PLATFORM_MSTAR_HIGH + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX -DCONFIG_FIX_NR_BULKIN_BUFFER + endif + ARCH:=arm + CROSS_COMPILE:= /usr/src/bin/arm-none-linux-gnueabi- +@@ -849,18 +849,18 @@ endif + ifeq ($(CONFIG_PLATFORM_ANDROID_ARM64), y) + # For this to work, change the "modules:" section is also needed, in order to build with CLANG. + # "$(MAKE) ARCH=$(ARCH) SUBARCH=$(ARCH) REAL_CC=${CC_DIR}/clang CLANG_TRIPLE=aarch64-linux-gnu- CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd) O="$(KBUILD_OUTPUT)" modules" +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -fno-pic +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -fno-pic ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC -DCONFIG_RADIO_WORK + #Enable this to have two interfaces: +-#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_P2P_IPS ++#ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_P2P_IPS + # A special rule for cfg80211_connect_bss() to receive all 10 arguments in an Android build +-EXTRA_CFLAGS += -DCONFIG_CFG80211_CONNECT_BSS_ANDROID ++ccflags-y += -DCONFIG_CFG80211_CONNECT_BSS_ANDROID + endif + + ifeq ($(CONFIG_PLATFORM_ANDROID_X86), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) + ARCH := $(SUBARCH) + CROSS_COMPILE := /media/DATA-2/android-x86/ics-x86_20120130/prebuilt/linux-x86/toolchain/i686-unknown-linux-gnu-4.2.1/bin/i686-unknown-linux-gnu- +@@ -869,20 +869,20 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ANDROID_INTEL_X86), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ANDROID_INTEL_X86 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING ++ccflags-y += -DCONFIG_PLATFORM_ANDROID_INTEL_X86 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_SKIP_SIGNAL_SCALE_MAPPING + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE ++ccflags-y += -DCONFIG_RESUME_IN_WORKQUEUE + endif + endif + + ifeq ($(CONFIG_PLATFORM_JB_X86), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) + ARCH := $(SUBARCH) + CROSS_COMPILE := /home/android_sdk/android-x86_JB/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7/bin/i686-linux-android- +@@ -891,7 +891,7 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_PXA2XX), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-none-linux-gnueabi- + KVER := 2.6.34.1 +@@ -899,7 +899,7 @@ KSRC ?= /usr/src/linux-2.6.34.1 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_S3C2K4), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-linux- + KVER := 2.6.24.7_$(ARCH) +@@ -907,7 +907,7 @@ KSRC := /usr/src/kernels/linux-$(KVER) + endif + + ifeq ($(CONFIG_PLATFORM_ARM_S3C6K4), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := arm-none-linux-gnueabi- + KVER := 2.6.34.1 +@@ -915,7 +915,7 @@ KSRC ?= /usr/src/linux-2.6.34.1 + endif + + ifeq ($(CONFIG_PLATFORM_RTD2880B), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B ++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTD2880B + ARCH:= + CROSS_COMPILE:= + KVER:= +@@ -923,7 +923,7 @@ KSRC:= + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_RMI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH:=mips + CROSS_COMPILE:=mipsisa32r2-uclibc- + KVER:= +@@ -931,7 +931,7 @@ KSRC:= /root/work/kernel_realtek + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_PLM), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH:=mips + CROSS_COMPILE:=mipsisa32r2-uclibc- + KVER:= +@@ -939,7 +939,7 @@ KSRC:= /root/work/kernel_realtek + endif + + ifeq ($(CONFIG_PLATFORM_MSTAR389), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MSTAR389 + ARCH:=mips + CROSS_COMPILE:= mips-linux-gnu- + KVER:= 2.6.28.10 +@@ -947,7 +947,7 @@ KSRC:= /home/mstar/mstar_linux/2.6.28.9/ + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_AR9132), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH := mips + CROSS_COMPILE := mips-openwrt-linux- + KSRC := /home/alex/test_openwrt/tmp/linux-2.6.30.9 +@@ -955,7 +955,7 @@ endif + + # This is how I built for openwrt Neo2 platform. --Ben + ifeq ($(CONFIG_PLATFORM_OPENWRT_NEO2), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm64 + CROSS_COMPILE := aarch64-openwrt-linux- + #export PATH=$PATH:/home/greearb/git/openwrt-neo2-dev/staging_dir/toolchain-aarch64_cortex-a53_gcc-7.3.0_musl/bin/ +@@ -964,7 +964,7 @@ KSRC := /home/greearb/git/openwrt-neo2-dev/build_dir/target-aarch64_cortex-a53_m + endif + + ifeq ($(CONFIG_PLATFORM_DMP_PHILIPS), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM + ARCH := mips + #CROSS_COMPILE:=/usr/local/msdk-4.3.6-mips-EL-2.6.12.6-0.9.30.3/bin/mipsel-linux- + CROSS_COMPILE:=/usr/local/toolchain_mipsel/bin/mipsel-linux- +@@ -972,8 +972,8 @@ KSRC ?=/usr/local/Jupiter/linux-2.6.12 + endif + + ifeq ($(CONFIG_PLATFORM_RTK_DMP), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DRTK_DMP_PLATFORM -DCONFIG_WIRELESS_EXT ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) + _PLATFORM_FILES += platform/platform_RTK_DMP_usb.o + endif +@@ -984,7 +984,7 @@ KSRC ?= /usr/src/DMP_Kernel/jupiter/linux-2.6.12 + endif + + ifeq ($(CONFIG_PLATFORM_MT53XX), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MT53XX + ARCH:= arm + CROSS_COMPILE:= arm11_mtk_le- + KVER:= 2.6.27 +@@ -992,7 +992,7 @@ KSRC?= /proj/mtk00802/BD_Compare/BDP/Dev/BDP_V301/BDP_Linux/linux-2.6.27 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_MX51_241H), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_WISTRON_PLATFORM + ARCH := arm + CROSS_COMPILE := /opt/freescale/usr/local/gcc-4.1.2-glibc-2.5-nptl-3/arm-none-linux-gnueabi/bin/arm-none-linux-gnueabi- + KVER := 2.6.31 +@@ -1000,8 +1000,8 @@ KSRC ?= /lib/modules/2.6.31-770-g0e46b52/source + endif + + ifeq ($(CONFIG_PLATFORM_FS_MX61), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE ?= + KVER ?= $(shell uname -r) +@@ -1011,7 +1011,7 @@ INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X + ARCH := mips + CROSS_COMPILE := /home/cnsd4/project/actions/tools-2.6.27/bin/mipsel-linux-gnu- + KVER := 2.6.27 +@@ -1019,9 +1019,9 @@ KSRC := /home/cnsd4/project/actions/linux-2.6.27.28 + endif + + ifeq ($(CONFIG_PLATFORM_TI_DM365), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365 +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX +-EXTRA_CFLAGS += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_TI_DM365 ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX ++ccflags-y += -DCONFIG_SINGLE_XMIT_BUF -DCONFIG_SINGLE_RECV_BUF + ARCH := arm + #CROSS_COMPILE := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/arm/v5t_le/bin/arm_v5t_le- + #KSRC := /home/cnsd4/Appro/mv_pro_5.0/montavista/pro/devkit/lsp/ti-davinci/linux-dm365 +@@ -1032,7 +1032,7 @@ KVER := 2.6.18 + endif + + ifeq ($(CONFIG_PLATFORM_MOZART), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_MOZART + ARCH := arm + CROSS_COMPILE := /home/vivotek/lsp/mozart3v2/Mozart3e_Toolchain/build_arm_nofpu/usr/bin/arm-linux- + KVER := $(shell uname -r) +@@ -1041,11 +1041,11 @@ KERNELOUTPUT := /home/pink/sample/ODM/IP8136W-VINT/tmp/kernel + endif + + ifeq ($(CONFIG_PLATFORM_TEGRA3_CARDHU), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/nvidia/tegra-16r3-partner-android-4.1_20120723/out/target/product/cardhu/obj/KERNEL +@@ -1053,11 +1053,11 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_TEGRA4_DALMORE), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/nvidia/tegra-17r9-partner-android-4.2-dalmore_20130131/out/target/product/dalmore/obj/KERNEL +@@ -1065,7 +1065,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8900), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/SDK_2304_20110613/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/SDK_2304_20110613/kernel +@@ -1073,7 +1073,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8920), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v12.06_r1-tcc-android-4.0.4/kernel +@@ -1081,10 +1081,10 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8920_JB42), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v13.03_r1-tcc-android-4.2.2_ds_patched/kernel +@@ -1092,7 +1092,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK2818), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS + ARCH := arm + CROSS_COMPILE := /usr/src/release_fae_version/toolchain/arm-eabi-4.4.0/bin/arm-eabi- + KSRC := /usr/src/release_fae_version/kernel25_A7_281x +@@ -1100,13 +1100,13 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK3188), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFORM_ROCKCHIPS + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE + # default setting for Power control +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN + # default setting for Special function + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3188/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- +@@ -1115,15 +1115,15 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RK3066), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_RK3066 +-EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DCONFIG_PLATFORM_ARM_RK3066 ++ccflags-y += -DRTW_ENABLE_WIFI_CONTROL_FUNC ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DRTW_SUPPORT_PLATFORM_SHUTDOWN ++ccflags-y += -DRTW_SUPPORT_PLATFORM_SHUTDOWN + endif +-EXTRA_CFLAGS += -fno-pic ++ccflags-y += -fno-pic + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Rockchip/rk3066_20130607/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi- + #CROSS_COMPILE := /home/android_sdk/Rockchip/Rk3066sdk/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6/bin/arm-linux-androideabi- +@@ -1132,7 +1132,7 @@ MODULE_NAME :=wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_URBETTER), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE + ARCH := arm + CROSS_COMPILE := /media/DATA-1/urbetter/arm-2009q3/bin/arm-none-linux-gnueabi- + KSRC := /media/DATA-1/urbetter/ics-urbetter/kernel +@@ -1140,7 +1140,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TI_PANDA), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN #-DCONFIG_MINIMAL_MEMORY_USAGE + ARCH := arm + #CROSS_COMPILE := /media/DATA-1/aosp/ics-aosp_20111227/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi- + #KSRC := /media/DATA-1/aosp/android-omap-panda-3.0_20120104 +@@ -1150,14 +1150,14 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_MIPS_JZ4760), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_MINIMAL_MEMORY_USAGE + ARCH ?= mips + CROSS_COMPILE ?= /mnt/sdb5/Ingenic/Umido/mips-4.3/bin/mips-linux-gnu- + KSRC ?= /mnt/sdb5/Ingenic/Umido/kernel + endif + + ifeq ($(CONFIG_PLATFORM_SZEBOOK), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN ++ccflags-y += -DCONFIG_BIG_ENDIAN + ARCH:=arm + CROSS_COMPILE:=/opt/crosstool2/bin/armeb-unknown-linux-gnueabi- + KVER:= 2.6.31.6 +@@ -1165,20 +1165,20 @@ KSRC:= ../code/linux-2.6.31.6-2020/ + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUNxI), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUNxI ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUNxI + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) + # default setting for A10-EVB mmc0 +-#EXTRA_CFLAGS += -DCONFIG_WITS_EVB_V13 ++#ccflags-y += -DCONFIG_WITS_EVB_V13 + _PLATFORM_FILES += platform/platform_ARM_SUNxI_sdio.o + endif + +@@ -1191,22 +1191,22 @@ KSRC=/home/android_sdk/Allwinner/a10/android-jb42/lichee-jb42/linux-3.0 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN6I), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN6I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN6I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) + # default setting for A31-EVB mmc0 +-EXTRA_CFLAGS += -DCONFIG_A31_EVB ++ccflags-y += -DCONFIG_A31_EVB + _PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o + endif + +@@ -1223,17 +1223,17 @@ KSRC :=/home/android_sdk/Allwinner/a31/kitkat-a3x_v4.5/lichee/linux-3.3 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN7I), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2, 4.3, 4.4 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1253,17 +1253,17 @@ KSRC := /home/android_sdk/Allwinner/a20/kitkat-a20_v4.4/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W3P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W3P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1280,20 +1280,20 @@ KSRC :=/home/android_sdk/Allwinner/a23/android-kk44/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SUN8I_W5P1), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1 +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I ++ccflags-y += -DCONFIG_PLATFORM_ARM_SUN8I_W5P1 ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + _PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1307,8 +1307,8 @@ KSRC :=/home/android_sdk/Allwinner/a33/android-L/lichee/linux-3.4 + endif + + ifeq ($(CONFIG_PLATFORM_ACTIONS_ATV5201), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201 +-EXTRA_CFLAGS += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATV5201 ++ccflags-y += -DCONFIG_SDIO_DISABLE_RXFIFO_POLLING_LOOP + ARCH := mips + CROSS_COMPILE := mipsel-linux-gnu- + KVER := $(KERNEL_VER) +@@ -1316,29 +1316,29 @@ KSRC:= $(CFGDIR)/../../kernel/linux-$(KERNEL_VER) + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RTD299X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ifeq ($(CONFIG_ANDROID), y) + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + endif + #ARCH, CROSS_COMPILE, KSRC,and MODDESTDIR are provided by external makefile + INSTALL_PREFIX := + endif + + ifeq ($(CONFIG_PLATFORM_ARM_RTD299X_LG), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1 +-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 +-#EXTRA_CFLAGS += -DCONFIG_FIX_HWPORT +-EXTRA_CFLAGS += -DLGE_PRIVATE +-EXTRA_CFLAGS += -DPURE_SUPPLICANT +-EXTRA_CFLAGS += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY +-EXTRA_CFLAGS += -DDBG_RX_DFRAME_RAW_DATA +-EXTRA_CFLAGS += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1 ++ccflags-y += -DCONFIG_IFACE_NUMBER=3 ++#ccflags-y += -DCONFIG_FIX_HWPORT ++ccflags-y += -DLGE_PRIVATE ++ccflags-y += -DPURE_SUPPLICANT ++ccflags-y += -DCONFIG_CUSTOMIZED_COUNTRY_CHPLAN_MAP -DCONFIG_RTW_IOCTL_SET_COUNTRY ++ccflags-y += -DDBG_RX_DFRAME_RAW_DATA ++ccflags-y += -DRTW_REDUCE_SCAN_SWITCH_CH_TIME + ARCH ?= arm + KVER ?= + +@@ -1354,11 +1354,11 @@ INSTALL_PREFIX ?= + endif + + ifeq ($(CONFIG_PLATFORM_HISILICON), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_HISILICON + ifeq ($(SUPPORT_CONCURRENT),y) +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_CONCURRENT_MODE + endif +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + ifeq ($(CROSS_COMPILE),) + CROSS_COMPILE = arm-hisiv200-linux- +@@ -1370,23 +1370,23 @@ endif + endif + + ifeq ($(CONFIG_PLATFORM_HISILICON_HI3798), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798 +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_HISILICON ++ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798 ++#ccflags-y += -DCONFIG_PLATFORM_HISILICON_HI3798_MV200_HDMI_DONGLE ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++#ccflags-y += -DCONFIG_RADIO_WORK + + # If system could power on and recognize Wi-Fi SDIO automatically, + # platfrom operations are not necessary. + #ifeq ($(CONFIG_SDIO_HCI), y) +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++#ccflags-y += -DCONFIG_PLATFORM_OPS + #_PLATFORM_FILES += platform/platform_hisilicon_hi3798_sdio.o +-#EXTRA_CFLAGS += -DCONFIG_HISI_SDIO_ID=1 ++#ccflags-y += -DCONFIG_HISI_SDIO_ID=1 + #endif + + ARCH ?= arm +@@ -1400,35 +1400,35 @@ endif + # Platform setting + ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_6820), y) + ifeq ($(CONFIG_ANDROID_2X), y) +-EXTRA_CFLAGS += -DANDROID_2X ++ccflags-y += -DANDROID_2X + endif +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD +-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_6820 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_SPRD ++ccflags-y += -DPLATFORM_SPREADTRUM_6820 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_sprd_sdio.o + endif + endif + + ifeq ($(CONFIG_PLATFORM_ARM_SPREADTRUM_8810), y) + ifeq ($(CONFIG_ANDROID_2X), y) +-EXTRA_CFLAGS += -DANDROID_2X ++ccflags-y += -DANDROID_2X + endif +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_SPRD +-EXTRA_CFLAGS += -DPLATFORM_SPREADTRUM_8810 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_SPRD ++ccflags-y += -DPLATFORM_SPREADTRUM_8810 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_sprd_sdio.o + endif + endif + + ifeq ($(CONFIG_PLATFORM_ARM_WMT), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_OPS + ifeq ($(CONFIG_SDIO_HCI), y) + _PLATFORM_FILES += platform/platform_ARM_WMT_sdio.o + endif +@@ -1439,18 +1439,18 @@ MODULE_NAME :=8189es_kk + endif + + ifeq ($(CONFIG_PLATFORM_RTK119X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_ARM_SUN7I +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++#ccflags-y += -DCONFIG_PLATFORM_ARM_SUN7I ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-#EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++#ccflags-y += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + +-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS ++#ccflags-y += -DCONFIG_#PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + #_PLATFORM_FILES += platform/platform_ARM_SUNxI_usb.o + endif + ifeq ($(CONFIG_SDIO_HCI), y) +@@ -1470,15 +1470,15 @@ MODULE_NAME := 8192eu + endif + + ifeq ($(CONFIG_PLATFORM_RTK119X_AM), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK119X_AM +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE +-EXTRA_CFLAGS += -DCONFIG_IFACE_NUMBER=3 +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_PLATFORM_RTK119X_AM ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_CONCURRENT_MODE -DCONFIG_FULL_CH_IN_P2P_HANDSHAKE ++ccflags-y += -DCONFIG_IFACE_NUMBER=3 ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH := arm +@@ -1490,28 +1490,28 @@ CROSS_COMPILE := + endif + + ifeq ($(CONFIG_PLATFORM_RTK129X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DRTK_129X_PLATFORM +-EXTRA_CFLAGS += -DCONFIG_TRAFFIC_PROTECT ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DRTK_129X_PLATFORM ++ccflags-y += -DCONFIG_TRAFFIC_PROTECT + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-#EXTRA_CFLAGS += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION +-EXTRA_CFLAGS += -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++#ccflags-y += -DCONFIG_P2P_IPS -DCONFIG_QOS_OPTIMIZATION ++ccflags-y += -DCONFIG_QOS_OPTIMIZATION + # Enable this for Android 5.0 +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + ifeq ($(CONFIG_RTL8821C)$(CONFIG_SDIO_HCI),yy) +-EXTRA_CFLAGS += -DCONFIG_WAKEUP_GPIO_INPUT_MODE +-EXTRA_CFLAGS += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN ++ccflags-y += -DCONFIG_WAKEUP_GPIO_INPUT_MODE ++ccflags-y += -DCONFIG_BT_WAKE_HST_OPEN_DRAIN + endif +-EXTRA_CFLAGS += -Wno-error=date-time ++ccflags-y += -Wno-error=date-time + # default setting for Android 7.0 + ifeq ($(RTK_ANDROID_VERSION), nougat) +-EXTRA_CFLAGS += -DRTW_P2P_GROUP_INTERFACE=1 ++ccflags-y += -DRTW_P2P_GROUP_INTERFACE=1 + endif +-#EXTRA_CFLAGS += -DCONFIG_#PLATFORM_OPS ++#ccflags-y += -DCONFIG_#PLATFORM_OPS + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH := arm64 +@@ -1526,12 +1526,12 @@ KSRC := /home/android_sdk/DHC/trunk-6.0.0_r1-QA160627/linux-kernel + endif + + ifeq ($(CONFIG_PLATFORM_RTK390X), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_RTK390X +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_RTW_NETIF_SG ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_PLATFORM_RTK390X ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_RTW_NETIF_SG + ifeq ($(CONFIG_USB_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + endif + + ARCH:=rlx +@@ -1542,12 +1542,12 @@ KSRC:= /home/realtek/share/Develop/IPCAM_SDK/RealSil/rts3901_sdk_v1.2_vanilla/li + endif + + ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_NOVATEK_NT72668 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_RX +-EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX ++ccflags-y += -DCONFIG_PLATFORM_NOVATEK_NT72668 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_RX ++ccflags-y += -DCONFIG_USE_USB_BUFFER_ALLOC_TX + ARCH ?= arm + CROSS_COMPILE := arm-linux-gnueabihf- + KVER := 3.8.0 +@@ -1556,10 +1556,10 @@ KSRC := /Custom/Novatek/TCL/linux-3.8_header + endif + + ifeq ($(CONFIG_PLATFORM_ARM_TCC8930_JB42), y) +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android 4.1, 4.2 +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + ARCH := arm + CROSS_COMPILE := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi- + KSRC := /home/android_sdk/Telechips/v13.05_r1-tcc-android-4.2.2_tcc893x-evm_build/kernel +@@ -1567,7 +1567,7 @@ MODULE_NAME := wlan + endif + + ifeq ($(CONFIG_PLATFORM_RTL8197D), y) +-EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D ++ccflags-y += -DCONFIG_BIG_ENDIAN -DCONFIG_PLATFORM_RTL8197D + export DIR_LINUX=$(shell pwd)/../SDK/rlxlinux-sdk321-v50/linux-2.6.30 + ARCH ?= rlx + CROSS_COMPILE:= $(DIR_LINUX)/../toolchain/rsdk-1.5.5-5281-EB-2.6.30-0.9.30.3-110714/bin/rsdk-linux- +@@ -1575,17 +1575,17 @@ KSRC := $(DIR_LINUX) + endif + + ifeq ($(CONFIG_PLATFORM_AML_S905), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_AML_S905 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -fno-pic ++ccflags-y += -DCONFIG_PLATFORM_AML_S905 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN -fno-pic + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++ccflags-y += -DCONFIG_PLATFORM_OPS + _PLATFORM_FILES += platform/platform_aml_s905_sdio.o + endif + +@@ -1599,19 +1599,19 @@ endif + endif + + ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y) +-EXTRA_CFLAGS += -Wno-error=date-time +-EXTRA_CFLAGS += -DCONFIG_PLATFORM_ZTE_ZX296716 +-EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN ++ccflags-y += -Wno-error=date-time ++ccflags-y += -DCONFIG_PLATFORM_ZTE_ZX296716 ++ccflags-y += -DCONFIG_LITTLE_ENDIAN + # default setting for Android +-EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE +-EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 +-EXTRA_CFLAGS += -DRTW_USE_CFG80211_STA_EVENT ++ccflags-y += -DCONFIG_CONCURRENT_MODE ++ccflags-y += -DCONFIG_IOCTL_CFG80211 ++ccflags-y += -DRTW_USE_CFG80211_STA_EVENT + # default setting for Android 5.x and later +-#EXTRA_CFLAGS += -DCONFIG_RADIO_WORK ++#ccflags-y += -DCONFIG_RADIO_WORK + + ifeq ($(CONFIG_SDIO_HCI), y) + # mark this temporarily +-#EXTRA_CFLAGS += -DCONFIG_PLATFORM_OPS ++#ccflags-y += -DCONFIG_PLATFORM_OPS + #_PLATFORM_FILES += platform/platform_zte_zx296716_sdio.o + endif + +@@ -1621,11 +1621,11 @@ KSRC ?= + endif + + ifeq ($(ARCH), i386) +-EXTRA_CFLAGS += -mhard-float +-EXTRA_CFLAGS += -DMARK_KERNEL_PFU ++ccflags-y += -mhard-float ++ccflags-y += -DMARK_KERNEL_PFU + else ifeq ($(ARCH), x86_64) +-EXTRA_CFLAGS += -mhard-float +-EXTRA_CFLAGS += -DMARK_KERNEL_PFU ++ccflags-y += -mhard-float ++ccflags-y += -DMARK_KERNEL_PFU + endif + + ########### CUSTOMER ################################ +@@ -1634,7 +1634,7 @@ CONFIG_CUSTOMER_HUAWEI = y + endif + + ifeq ($(CONFIG_CUSTOMER_HUAWEI), y) +-EXTRA_CFLAGS += -DCONFIG_HUAWEI_PROC ++ccflags-y += -DCONFIG_HUAWEI_PROC + endif + + ifeq ($(CONFIG_MULTIDRV), y) +@@ -1823,3 +1823,7 @@ endif + @$(KSRC)/scripts/sign-file sha256 MOK.priv MOK.der 88XXau.ko + + sign-install: all sign install ++ ++# For compatibility with kernels prior to 2.6.24. ++EXTRA_CFLAGS += $(ccflags-y) ++EXTRA_LDFLAGS += $(ldflags-y) +diff --git a/hal/phydm/phydm.mk b/hal/phydm/phydm.mk +index a05df64..b4cdca3 100644 +--- a/hal/phydm/phydm.mk ++++ b/hal/phydm/phydm.mk +@@ -1,4 +1,4 @@ +-EXTRA_CFLAGS += -I$(src)/hal/phydm ++ccflags-y += -I$(src)/hal/phydm + + _PHYDM_FILES := hal/phydm/phydm_debug.o \ + hal/phydm/phydm_antdiv.o\ +@@ -223,4 +223,4 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8814b_bb.o\ + hal/phydm/halrf/$(RTL871X)/halrf_8814b.o \ + hal/phydm/halrf/$(RTL871X)/halrf_iqk_8814b.o \ + hal/phydm/halrf/$(RTL871X)/halrf_rfk_init_8814b.o +-endif +\ No newline at end of file ++endif +diff --git a/hal/phydm/sd4_phydm_2_kernel.mk b/hal/phydm/sd4_phydm_2_kernel.mk +index f11c6ac..65eb93c 100644 +--- a/hal/phydm/sd4_phydm_2_kernel.mk ++++ b/hal/phydm/sd4_phydm_2_kernel.mk +@@ -1,4 +1,4 @@ +-EXTRA_CFLAGS += -I$(src)/hal/phydm ++ccflags-y += -I$(src)/hal/phydm + + _PHYDM_FILES := hal/phydm/phydm_debug.o \ + hal/phydm/phydm_interface.o\ +diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h +index 684d685..4c276f6 100644 +--- a/include/osdep_service_linux.h ++++ b/include/osdep_service_linux.h +@@ -385,7 +385,11 @@ __inline static void _set_timer(_timer *ptimer, u32 delay_time) + + __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++ *bcancelled = timer_delete_sync(&ptimer->timer) == 1 ? 1 : 0; ++#else + *bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0; ++#endif + } + + static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx) +-- +2.39.5 + -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build with Linux 6.15 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build " Giulio Benetti @ 2025-07-21 21:04 ` Julien Olivain via buildroot 0 siblings, 0 replies; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 21:04 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich On 01/07/2025 21:08, Giulio Benetti wrote: > Add local patch pending upstream to fix build failure with Linux 6.15. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH] package/wilc-driver: fix build failure with Linux 6.15 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti ` (3 preceding siblings ...) 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build " Giulio Benetti @ 2025-07-01 19:08 ` Giulio Benetti 2025-07-03 18:23 ` Giulio Benetti 2025-07-21 21:04 ` Julien Olivain via buildroot 2025-07-21 21:02 ` [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Julien Olivain via buildroot 5 siblings, 2 replies; 14+ messages in thread From: Giulio Benetti @ 2025-07-01 19:08 UTC (permalink / raw) To: buildroot Cc: Giulio Benetti, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Add 2 local patches pending upstream to fix build failure with Linux 6.15. Fixes: still not occured. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- .../0012-Fix-build-with-Linux-6.14.patch | 33 ++++ .../0013-Fix-build-with-Linux-6.15.patch | 177 ++++++++++++++++++ 2 files changed, 210 insertions(+) create mode 100644 package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch create mode 100644 package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch diff --git a/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch new file mode 100644 index 0000000000..adcbab4a59 --- /dev/null +++ b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch @@ -0,0 +1,33 @@ +From ea7bdf9c6f37dbed0d7e7a94bd5d6ec20593eb02 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <giulio.benetti@benettiengineering.com> +Date: Tue, 1 Jul 2025 19:25:19 +0200 +Subject: [PATCH] Fix build with Linux 6.14 + +Commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7a53af85d3bbdbe06cd47b81a6d99a04dc0a3963 +adds argument "unsigned int link_id" to get_tx_power(), so let's add it to +cfg80211_rtw_get_txpower() according to Linux version. + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +--- + cfg80211.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 5c92062..0e1375c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -2230,6 +2230,9 @@ static int set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + } + + static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) ++ unsigned int link_id, ++#endif + int *dbm) + { + int ret; +-- +2.39.5 + diff --git a/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch new file mode 100644 index 0000000000..2baac53dfc --- /dev/null +++ b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch @@ -0,0 +1,177 @@ +From acdbd9268841a5c0bac477418bb39707d9602957 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <giulio.benetti@benettiengineering.com> +Date: Tue, 1 Jul 2025 19:27:01 +0200 +Subject: [PATCH] Fix build with Linux 6.15 + +Commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8fa7292fee5c5240402371ea89ab285ec856c916 +drops del_timer_sync() in favor of timer_delete{_sync}() so let's backport +locally functions del_timer{_sync}() when Linux version is 6.15.0 or later. +Let's also backport crc7_be() and crc_itu_t() sinsce are not selectable +anymore in kernel since commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f5a40fcf82c1d3f26910ebe1c62fec8ae3b85f02 + +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +--- + netdev.h | 13 +++++++ + spi.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 128 insertions(+) + +diff --git a/netdev.h b/netdev.h +index f06d45a..607a3b5 100644 +--- a/netdev.h ++++ b/netdev.h +@@ -13,6 +13,19 @@ + #include <net/ieee80211_radiotap.h> + #include <linux/if_arp.h> + #include <linux/gpio/consumer.h> ++#include <linux/version.h> ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++static inline int del_timer_sync(struct timer_list *timer) ++{ ++ return timer_delete_sync(timer); ++} ++ ++static inline int del_timer(struct timer_list *timer) ++{ ++ return timer_delete(timer); ++} ++#endif + + #include "hif.h" + #include "wlan.h" +diff --git a/spi.c b/spi.c +index f7b43e2..5443633 100644 +--- a/spi.c ++++ b/spi.c +@@ -9,10 +9,125 @@ + #include <linux/module.h> + #include <linux/crc7.h> + #include <linux/crc-itu-t.h> ++#include <linux/version.h> + + #include "netdev.h" + #include "cfg80211.h" + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) ++/* ++ * Table for CRC-7 (polynomial x^7 + x^3 + 1). ++ * This is a big-endian CRC (msbit is highest power of x), ++ * aligned so the msbit of the byte is the x^6 coefficient ++ * and the lsbit is not used. ++ */ ++static const u8 crc7_be_syndrome_table[256] = { ++ 0x00, 0x12, 0x24, 0x36, 0x48, 0x5a, 0x6c, 0x7e, ++ 0x90, 0x82, 0xb4, 0xa6, 0xd8, 0xca, 0xfc, 0xee, ++ 0x32, 0x20, 0x16, 0x04, 0x7a, 0x68, 0x5e, 0x4c, ++ 0xa2, 0xb0, 0x86, 0x94, 0xea, 0xf8, 0xce, 0xdc, ++ 0x64, 0x76, 0x40, 0x52, 0x2c, 0x3e, 0x08, 0x1a, ++ 0xf4, 0xe6, 0xd0, 0xc2, 0xbc, 0xae, 0x98, 0x8a, ++ 0x56, 0x44, 0x72, 0x60, 0x1e, 0x0c, 0x3a, 0x28, ++ 0xc6, 0xd4, 0xe2, 0xf0, 0x8e, 0x9c, 0xaa, 0xb8, ++ 0xc8, 0xda, 0xec, 0xfe, 0x80, 0x92, 0xa4, 0xb6, ++ 0x58, 0x4a, 0x7c, 0x6e, 0x10, 0x02, 0x34, 0x26, ++ 0xfa, 0xe8, 0xde, 0xcc, 0xb2, 0xa0, 0x96, 0x84, ++ 0x6a, 0x78, 0x4e, 0x5c, 0x22, 0x30, 0x06, 0x14, ++ 0xac, 0xbe, 0x88, 0x9a, 0xe4, 0xf6, 0xc0, 0xd2, ++ 0x3c, 0x2e, 0x18, 0x0a, 0x74, 0x66, 0x50, 0x42, ++ 0x9e, 0x8c, 0xba, 0xa8, 0xd6, 0xc4, 0xf2, 0xe0, ++ 0x0e, 0x1c, 0x2a, 0x38, 0x46, 0x54, 0x62, 0x70, ++ 0x82, 0x90, 0xa6, 0xb4, 0xca, 0xd8, 0xee, 0xfc, ++ 0x12, 0x00, 0x36, 0x24, 0x5a, 0x48, 0x7e, 0x6c, ++ 0xb0, 0xa2, 0x94, 0x86, 0xf8, 0xea, 0xdc, 0xce, ++ 0x20, 0x32, 0x04, 0x16, 0x68, 0x7a, 0x4c, 0x5e, ++ 0xe6, 0xf4, 0xc2, 0xd0, 0xae, 0xbc, 0x8a, 0x98, ++ 0x76, 0x64, 0x52, 0x40, 0x3e, 0x2c, 0x1a, 0x08, ++ 0xd4, 0xc6, 0xf0, 0xe2, 0x9c, 0x8e, 0xb8, 0xaa, ++ 0x44, 0x56, 0x60, 0x72, 0x0c, 0x1e, 0x28, 0x3a, ++ 0x4a, 0x58, 0x6e, 0x7c, 0x02, 0x10, 0x26, 0x34, ++ 0xda, 0xc8, 0xfe, 0xec, 0x92, 0x80, 0xb6, 0xa4, ++ 0x78, 0x6a, 0x5c, 0x4e, 0x30, 0x22, 0x14, 0x06, ++ 0xe8, 0xfa, 0xcc, 0xde, 0xa0, 0xb2, 0x84, 0x96, ++ 0x2e, 0x3c, 0x0a, 0x18, 0x66, 0x74, 0x42, 0x50, ++ 0xbe, 0xac, 0x9a, 0x88, 0xf6, 0xe4, 0xd2, 0xc0, ++ 0x1c, 0x0e, 0x38, 0x2a, 0x54, 0x46, 0x70, 0x62, ++ 0x8c, 0x9e, 0xa8, 0xba, 0xc4, 0xd6, 0xe0, 0xf2 ++}; ++ ++/** ++ * crc7_be - update the CRC7 for the data buffer ++ * @crc: previous CRC7 value ++ * @buffer: data pointer ++ * @len: number of bytes in the buffer ++ * Context: any ++ * ++ * Returns the updated CRC7 value. ++ * The CRC7 is left-aligned in the byte (the lsbit is always 0), as that ++ * makes the computation easier, and all callers want it in that form. ++ * ++ */ ++u8 crc7_be(u8 crc, const u8 *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc7_be_syndrome_table[crc ^ *buffer++]; ++ return crc; ++} ++ ++/* CRC table for the CRC ITU-T V.41 0x1021 (x^16 + x^12 + x^5 + 1) */ ++const u16 crc_itu_t_table[256] = { ++ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, ++ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, ++ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, ++ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, ++ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, ++ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, ++ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, ++ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, ++ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, ++ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, ++ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, ++ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, ++ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, ++ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, ++ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, ++ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, ++ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, ++ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, ++ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, ++ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, ++ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, ++ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, ++ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, ++ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, ++ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, ++ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, ++ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, ++ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, ++ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, ++ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, ++ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, ++ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 ++}; ++ ++/** ++ * crc_itu_t - Compute the CRC-ITU-T for the data buffer ++ * ++ * @crc: previous CRC value ++ * @buffer: data pointer ++ * @len: number of bytes in the buffer ++ * ++ * Returns the updated CRC value ++ */ ++u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len) ++{ ++ while (len--) ++ crc = crc_itu_t_byte(crc, *buffer++); ++ return crc; ++} ++#endif ++ + static bool enable_crc7; /* protect SPI commands with CRC7 */ + module_param(enable_crc7, bool, 0644); + MODULE_PARM_DESC(enable_crc7, +-- +2.39.5 + -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/wilc-driver: fix build failure with Linux 6.15 2025-07-01 19:08 ` [Buildroot] [PATCH] package/wilc-driver: fix build failure " Giulio Benetti @ 2025-07-03 18:23 ` Giulio Benetti 2025-07-21 21:04 ` Julien Olivain via buildroot 1 sibling, 0 replies; 14+ messages in thread From: Giulio Benetti @ 2025-07-03 18:23 UTC (permalink / raw) To: buildroot Cc: James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich Hello All, as pointed in PR[0] Bootlin added support for wilc3000 to Linux[1], this is starting from Linux 6.13. At this point I ask if there's a way to exclude package wilc-driver from autobuilders if Linux version is >= 6.13 Thanks in advance Best regards [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/9#issuecomment-3033112757 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/wireless/microchip/wilc1000/spi.c?h=v6.13.12&id=e1408c115ef9bd7dcd5c74be9755291e5c699f8e -- Giulio Benetti CEO&CTO@Benetti Engineering sas https://www.linkedin.com/company/benetti-engineering-sas/ https://www.linkedin.com/in/giulio-benetti-79975951/ On 7/1/25 21:08, Giulio Benetti wrote: > Add 2 local patches pending upstream to fix build failure with Linux 6.15. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > .../0012-Fix-build-with-Linux-6.14.patch | 33 ++++ > .../0013-Fix-build-with-Linux-6.15.patch | 177 ++++++++++++++++++ > 2 files changed, 210 insertions(+) > create mode 100644 package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch > create mode 100644 package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch > > diff --git a/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch > new file mode 100644 > index 0000000000..adcbab4a59 > --- /dev/null > +++ b/package/wilc-driver/0012-Fix-build-with-Linux-6.14.patch > @@ -0,0 +1,33 @@ > +From ea7bdf9c6f37dbed0d7e7a94bd5d6ec20593eb02 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti <giulio.benetti@benettiengineering.com> > +Date: Tue, 1 Jul 2025 19:25:19 +0200 > +Subject: [PATCH] Fix build with Linux 6.14 > + > +Commit: > +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7a53af85d3bbdbe06cd47b81a6d99a04dc0a3963 > +adds argument "unsigned int link_id" to get_tx_power(), so let's add it to > +cfg80211_rtw_get_txpower() according to Linux version. > + > +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 > +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > +--- > + cfg80211.c | 3 +++ > + 1 file changed, 3 insertions(+) > + > +diff --git a/cfg80211.c b/cfg80211.c > +index 5c92062..0e1375c 100644 > +--- a/cfg80211.c > ++++ b/cfg80211.c > +@@ -2230,6 +2230,9 @@ static int set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, > + } > + > + static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) > ++ unsigned int link_id, > ++#endif > + int *dbm) > + { > + int ret; > +-- > +2.39.5 > + > diff --git a/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch > new file mode 100644 > index 0000000000..2baac53dfc > --- /dev/null > +++ b/package/wilc-driver/0013-Fix-build-with-Linux-6.15.patch > @@ -0,0 +1,177 @@ > +From acdbd9268841a5c0bac477418bb39707d9602957 Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti <giulio.benetti@benettiengineering.com> > +Date: Tue, 1 Jul 2025 19:27:01 +0200 > +Subject: [PATCH] Fix build with Linux 6.15 > + > +Commit: > +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8fa7292fee5c5240402371ea89ab285ec856c916 > +drops del_timer_sync() in favor of timer_delete{_sync}() so let's backport > +locally functions del_timer{_sync}() when Linux version is 6.15.0 or later. > +Let's also backport crc7_be() and crc_itu_t() sinsce are not selectable > +anymore in kernel since commit: > +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f5a40fcf82c1d3f26910ebe1c62fec8ae3b85f02 > + > +Upstream: https://github.com/embeddedTS/wilc3000-external-module/pull/9 > +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > +--- > + netdev.h | 13 +++++++ > + spi.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > + 2 files changed, 128 insertions(+) > + > +diff --git a/netdev.h b/netdev.h > +index f06d45a..607a3b5 100644 > +--- a/netdev.h > ++++ b/netdev.h > +@@ -13,6 +13,19 @@ > + #include <net/ieee80211_radiotap.h> > + #include <linux/if_arp.h> > + #include <linux/gpio/consumer.h> > ++#include <linux/version.h> > ++ > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) > ++static inline int del_timer_sync(struct timer_list *timer) > ++{ > ++ return timer_delete_sync(timer); > ++} > ++ > ++static inline int del_timer(struct timer_list *timer) > ++{ > ++ return timer_delete(timer); > ++} > ++#endif > + > + #include "hif.h" > + #include "wlan.h" > +diff --git a/spi.c b/spi.c > +index f7b43e2..5443633 100644 > +--- a/spi.c > ++++ b/spi.c > +@@ -9,10 +9,125 @@ > + #include <linux/module.h> > + #include <linux/crc7.h> > + #include <linux/crc-itu-t.h> > ++#include <linux/version.h> > + > + #include "netdev.h" > + #include "cfg80211.h" > + > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)) > ++/* > ++ * Table for CRC-7 (polynomial x^7 + x^3 + 1). > ++ * This is a big-endian CRC (msbit is highest power of x), > ++ * aligned so the msbit of the byte is the x^6 coefficient > ++ * and the lsbit is not used. > ++ */ > ++static const u8 crc7_be_syndrome_table[256] = { > ++ 0x00, 0x12, 0x24, 0x36, 0x48, 0x5a, 0x6c, 0x7e, > ++ 0x90, 0x82, 0xb4, 0xa6, 0xd8, 0xca, 0xfc, 0xee, > ++ 0x32, 0x20, 0x16, 0x04, 0x7a, 0x68, 0x5e, 0x4c, > ++ 0xa2, 0xb0, 0x86, 0x94, 0xea, 0xf8, 0xce, 0xdc, > ++ 0x64, 0x76, 0x40, 0x52, 0x2c, 0x3e, 0x08, 0x1a, > ++ 0xf4, 0xe6, 0xd0, 0xc2, 0xbc, 0xae, 0x98, 0x8a, > ++ 0x56, 0x44, 0x72, 0x60, 0x1e, 0x0c, 0x3a, 0x28, > ++ 0xc6, 0xd4, 0xe2, 0xf0, 0x8e, 0x9c, 0xaa, 0xb8, > ++ 0xc8, 0xda, 0xec, 0xfe, 0x80, 0x92, 0xa4, 0xb6, > ++ 0x58, 0x4a, 0x7c, 0x6e, 0x10, 0x02, 0x34, 0x26, > ++ 0xfa, 0xe8, 0xde, 0xcc, 0xb2, 0xa0, 0x96, 0x84, > ++ 0x6a, 0x78, 0x4e, 0x5c, 0x22, 0x30, 0x06, 0x14, > ++ 0xac, 0xbe, 0x88, 0x9a, 0xe4, 0xf6, 0xc0, 0xd2, > ++ 0x3c, 0x2e, 0x18, 0x0a, 0x74, 0x66, 0x50, 0x42, > ++ 0x9e, 0x8c, 0xba, 0xa8, 0xd6, 0xc4, 0xf2, 0xe0, > ++ 0x0e, 0x1c, 0x2a, 0x38, 0x46, 0x54, 0x62, 0x70, > ++ 0x82, 0x90, 0xa6, 0xb4, 0xca, 0xd8, 0xee, 0xfc, > ++ 0x12, 0x00, 0x36, 0x24, 0x5a, 0x48, 0x7e, 0x6c, > ++ 0xb0, 0xa2, 0x94, 0x86, 0xf8, 0xea, 0xdc, 0xce, > ++ 0x20, 0x32, 0x04, 0x16, 0x68, 0x7a, 0x4c, 0x5e, > ++ 0xe6, 0xf4, 0xc2, 0xd0, 0xae, 0xbc, 0x8a, 0x98, > ++ 0x76, 0x64, 0x52, 0x40, 0x3e, 0x2c, 0x1a, 0x08, > ++ 0xd4, 0xc6, 0xf0, 0xe2, 0x9c, 0x8e, 0xb8, 0xaa, > ++ 0x44, 0x56, 0x60, 0x72, 0x0c, 0x1e, 0x28, 0x3a, > ++ 0x4a, 0x58, 0x6e, 0x7c, 0x02, 0x10, 0x26, 0x34, > ++ 0xda, 0xc8, 0xfe, 0xec, 0x92, 0x80, 0xb6, 0xa4, > ++ 0x78, 0x6a, 0x5c, 0x4e, 0x30, 0x22, 0x14, 0x06, > ++ 0xe8, 0xfa, 0xcc, 0xde, 0xa0, 0xb2, 0x84, 0x96, > ++ 0x2e, 0x3c, 0x0a, 0x18, 0x66, 0x74, 0x42, 0x50, > ++ 0xbe, 0xac, 0x9a, 0x88, 0xf6, 0xe4, 0xd2, 0xc0, > ++ 0x1c, 0x0e, 0x38, 0x2a, 0x54, 0x46, 0x70, 0x62, > ++ 0x8c, 0x9e, 0xa8, 0xba, 0xc4, 0xd6, 0xe0, 0xf2 > ++}; > ++ > ++/** > ++ * crc7_be - update the CRC7 for the data buffer > ++ * @crc: previous CRC7 value > ++ * @buffer: data pointer > ++ * @len: number of bytes in the buffer > ++ * Context: any > ++ * > ++ * Returns the updated CRC7 value. > ++ * The CRC7 is left-aligned in the byte (the lsbit is always 0), as that > ++ * makes the computation easier, and all callers want it in that form. > ++ * > ++ */ > ++u8 crc7_be(u8 crc, const u8 *buffer, size_t len) > ++{ > ++ while (len--) > ++ crc = crc7_be_syndrome_table[crc ^ *buffer++]; > ++ return crc; > ++} > ++ > ++/* CRC table for the CRC ITU-T V.41 0x1021 (x^16 + x^12 + x^5 + 1) */ > ++const u16 crc_itu_t_table[256] = { > ++ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, > ++ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, > ++ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, > ++ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, > ++ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, > ++ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, > ++ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, > ++ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, > ++ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, > ++ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, > ++ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, > ++ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, > ++ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, > ++ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, > ++ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, > ++ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, > ++ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, > ++ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, > ++ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, > ++ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, > ++ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, > ++ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, > ++ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, > ++ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, > ++ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, > ++ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, > ++ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, > ++ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, > ++ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, > ++ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, > ++ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, > ++ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 > ++}; > ++ > ++/** > ++ * crc_itu_t - Compute the CRC-ITU-T for the data buffer > ++ * > ++ * @crc: previous CRC value > ++ * @buffer: data pointer > ++ * @len: number of bytes in the buffer > ++ * > ++ * Returns the updated CRC value > ++ */ > ++u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len) > ++{ > ++ while (len--) > ++ crc = crc_itu_t_byte(crc, *buffer++); > ++ return crc; > ++} > ++#endif > ++ > + static bool enable_crc7; /* protect SPI commands with CRC7 */ > + module_param(enable_crc7, bool, 0644); > + MODULE_PARM_DESC(enable_crc7, > +-- > +2.39.5 > + _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/wilc-driver: fix build failure with Linux 6.15 2025-07-01 19:08 ` [Buildroot] [PATCH] package/wilc-driver: fix build failure " Giulio Benetti 2025-07-03 18:23 ` Giulio Benetti @ 2025-07-21 21:04 ` Julien Olivain via buildroot 1 sibling, 0 replies; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 21:04 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich On 01/07/2025 21:08, Giulio Benetti wrote: > Add 2 local patches pending upstream to fix build failure with Linux > 6.15. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti ` (4 preceding siblings ...) 2025-07-01 19:08 ` [Buildroot] [PATCH] package/wilc-driver: fix build failure " Giulio Benetti @ 2025-07-21 21:02 ` Julien Olivain via buildroot 5 siblings, 0 replies; 14+ messages in thread From: Julien Olivain via buildroot @ 2025-07-21 21:02 UTC (permalink / raw) To: Giulio Benetti Cc: buildroot, James Hilliard, Kris Bahnsen, Louis Aussedat, Sergey Matyukevich On 01/07/2025 21:08, Giulio Benetti wrote: > With this version we can build with Linux 6.15. > > Fixes: > still not occured. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Applied to master, thanks. For info, I removed the extra empty line in the hash file which was generating a check-package error. Best regards, Julien. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2025-07-22 16:33 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-07-01 19:08 [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Giulio Benetti 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189fs: " Giulio Benetti 2025-07-21 21:03 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8192eu: bump to 2025-06-09 version Giulio Benetti 2025-07-21 21:03 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8189es: fix build failure with Linux 6.15 Giulio Benetti 2025-07-21 20:59 ` Julien Olivain via buildroot 2025-07-22 16:33 ` Giulio Benetti 2025-07-01 19:08 ` [Buildroot] [PATCH] package/rtl8812au-aircrack-ng: fix build " Giulio Benetti 2025-07-21 21:04 ` Julien Olivain via buildroot 2025-07-01 19:08 ` [Buildroot] [PATCH] package/wilc-driver: fix build failure " Giulio Benetti 2025-07-03 18:23 ` Giulio Benetti 2025-07-21 21:04 ` Julien Olivain via buildroot 2025-07-21 21:02 ` [Buildroot] [PATCH] package/rtl8189es: bump to version 2025-06-21 Julien Olivain via buildroot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox