Gitiles
Code Review Sign In
git01.mediatek.com / filogic / rdk-b / meta-filogic / 617abbdc84135e6594119bf98869f7dded53b6be / . / recipes-wifi / linux-mac80211 / files / patches-6.x / subsys / 0001-sync-backports-patches-build.patch
blob: e926f0bd1d9049a49314dc56e9093a833b3a1ea1 [file] [log] [blame]
developer617abbd2024-04-23 14:50:01 +0800[diff] [blame^]1From 45a2c927c790c9f71a81983f6d59b15cfb6b05ac Mon Sep 17 00:00:00 2001
2From: Shayne Chen <shayne.chen@mediatek.com>
3Date: Tue, 12 Mar 2024 11:25:41 +0800
4Subject: [PATCH 01/61] sync backports patches/build
5
6---
7 Kconfig.local | 111 -----------------
8 Kconfig.sources | 5 -
9 Makefile | 116 +++++++++---------
10 Makefile.real | 29 ++++-
11 compat/main.c | 25 ----
12 drivers/net/wireless/ath/ath11k/Kconfig | 6 +-
13 drivers/net/wireless/broadcom/b43/Kconfig | 12 +-
14 drivers/net/wireless/broadcom/b43/main.c | 4 +-
15 .../net/wireless/broadcom/b43legacy/Kconfig | 8 +-
16 .../net/wireless/broadcom/b43legacy/main.c | 4 +-
17 .../net/wireless/broadcom/brcm80211/Kconfig | 2 +-
18 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +-
19 drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 21 ++--
20 drivers/staging/rtl8723bs/Kconfig | 1 -
21 kconf/Makefile | 4 +-
22 kconf/conf.c | 30 +----
23 kconf/confdata.c | 4 +-
24 local-symbols | 45 -------
25 18 files changed, 118 insertions(+), 311 deletions(-)
26
27diff --git a/Kconfig.local b/Kconfig.local
28index d9495b1..547f8ad 100644
29--- a/Kconfig.local
30+++ b/Kconfig.local
31@@ -1420,117 +1420,6 @@ config BACKPORTED_USB_NET_AQC111
32 config BACKPORTED_USB_RTL8153_ECM
33 tristate
34 default USB_RTL8153_ECM
35-config BACKPORTED_SSB_POSSIBLE
36- tristate
37- default SSB_POSSIBLE
38-config BACKPORTED_SSB
39- tristate
40- default SSB
41-config BACKPORTED_SSB_SPROM
42- tristate
43- default SSB_SPROM
44-config BACKPORTED_SSB_BLOCKIO
45- tristate
46- default SSB_BLOCKIO
47-config BACKPORTED_SSB_PCIHOST_POSSIBLE
48- tristate
49- default SSB_PCIHOST_POSSIBLE
50-config BACKPORTED_SSB_PCIHOST
51- tristate
52- default SSB_PCIHOST
53-config BACKPORTED_SSB_B43_PCI_BRIDGE
54- tristate
55- default SSB_B43_PCI_BRIDGE
56-config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE
57- tristate
58- default SSB_PCMCIAHOST_POSSIBLE
59-config BACKPORTED_SSB_PCMCIAHOST
60- tristate
61- default SSB_PCMCIAHOST
62-config BACKPORTED_SSB_SDIOHOST_POSSIBLE
63- tristate
64- default SSB_SDIOHOST_POSSIBLE
65-config BACKPORTED_SSB_SDIOHOST
66- tristate
67- default SSB_SDIOHOST
68-config BACKPORTED_SSB_HOST_SOC
69- tristate
70- default SSB_HOST_SOC
71-config BACKPORTED_SSB_SERIAL
72- tristate
73- default SSB_SERIAL
74-config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE
75- tristate
76- default SSB_DRIVER_PCICORE_POSSIBLE
77-config BACKPORTED_SSB_DRIVER_PCICORE
78- tristate
79- default SSB_DRIVER_PCICORE
80-config BACKPORTED_SSB_PCICORE_HOSTMODE
81- tristate
82- default SSB_PCICORE_HOSTMODE
83-config BACKPORTED_SSB_DRIVER_MIPS
84- tristate
85- default SSB_DRIVER_MIPS
86-config BACKPORTED_SSB_SFLASH
87- tristate
88- default SSB_SFLASH
89-config BACKPORTED_SSB_EMBEDDED
90- tristate
91- default SSB_EMBEDDED
92-config BACKPORTED_SSB_DRIVER_EXTIF
93- tristate
94- default SSB_DRIVER_EXTIF
95-config BACKPORTED_SSB_DRIVER_GIGE
96- tristate
97- default SSB_DRIVER_GIGE
98-config BACKPORTED_SSB_DRIVER_GPIO
99- tristate
100- default SSB_DRIVER_GPIO
101-config BACKPORTED_BCMA_POSSIBLE
102- tristate
103- default BCMA_POSSIBLE
104-config BACKPORTED_BCMA
105- tristate
106- default BCMA
107-config BACKPORTED_BCMA_BLOCKIO
108- tristate
109- default BCMA_BLOCKIO
110-config BACKPORTED_BCMA_HOST_PCI_POSSIBLE
111- tristate
112- default BCMA_HOST_PCI_POSSIBLE
113-config BACKPORTED_BCMA_HOST_PCI
114- tristate
115- default BCMA_HOST_PCI
116-config BACKPORTED_BCMA_HOST_SOC
117- tristate
118- default BCMA_HOST_SOC
119-config BACKPORTED_BCMA_DRIVER_PCI
120- tristate
121- default BCMA_DRIVER_PCI
122-config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE
123- tristate
124- default BCMA_DRIVER_PCI_HOSTMODE
125-config BACKPORTED_BCMA_DRIVER_MIPS
126- tristate
127- default BCMA_DRIVER_MIPS
128-config BACKPORTED_BCMA_PFLASH
129- tristate
130- default BCMA_PFLASH
131-config BACKPORTED_BCMA_SFLASH
132- tristate
133- default BCMA_SFLASH
134-config BACKPORTED_BCMA_NFLASH
135- tristate
136- default BCMA_NFLASH
137-config BACKPORTED_BCMA_DRIVER_GMAC_CMN
138- tristate
139- default BCMA_DRIVER_GMAC_CMN
140-config BACKPORTED_BCMA_DRIVER_GPIO
141- tristate
142- default BCMA_DRIVER_GPIO
143-config BACKPORTED_BCMA_DEBUG
144- tristate
145- default BCMA_DEBUG
146 config BACKPORTED_USB_ACM
147 tristate
148 default USB_ACM
149diff --git a/Kconfig.sources b/Kconfig.sources
150index 2ea4d8a..d74affd 100644
151--- a/Kconfig.sources
152+++ b/Kconfig.sources
153@@ -4,15 +4,10 @@ source "$BACKPORT_DIR/compat/Kconfig"
154 # these are copied from the kernel
155 source "$BACKPORT_DIR/net/wireless/Kconfig"
156 source "$BACKPORT_DIR/net/mac80211/Kconfig"
157-source "$BACKPORT_DIR/net/qrtr/Kconfig"
158-source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
159 source "$BACKPORT_DIR/drivers/soc/qcom/Kconfig"
160 source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
161 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
162
163-source "$BACKPORT_DIR/drivers/ssb/Kconfig"
164-source "$BACKPORT_DIR/drivers/bcma/Kconfig"
165-
166 source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
167
168 source "$BACKPORT_DIR/drivers/staging/Kconfig"
169diff --git a/Makefile b/Makefile
170index 77c2670..c431b71 100644
171--- a/Makefile
172+++ b/Makefile
173@@ -2,10 +2,10 @@
174 # Makefile for the output source package
175 #
176
177-ifeq ($(KERNELRELEASE),)
178+ifeq ($(KERNELVERSION),)
179
180 MAKEFLAGS += --no-print-directory
181-SHELL := /bin/bash
182+SHELL := /usr/bin/env bash
183 BACKPORT_DIR := $(shell pwd)
184
185 KMODDIR ?= updates
186@@ -19,6 +19,7 @@ KLIB_BUILD ?= $(KLIB)/build/
187 KERNEL_CONFIG := $(KLIB_BUILD)/.config
188 KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
189 CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//')
190+STAMP_KERNEL_CONFIG := .kernel_config_md5_$(CONFIG_MD5)
191
192 export KLIB KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG
193
194@@ -36,7 +37,8 @@ mrproper:
195 @rm -f .kernel_config_md5 Kconfig.versions Kconfig.kernel
196 @rm -f backport-include/backport/autoconf.h
197
198-.DEFAULT:
199+.SILENT: $(STAMP_KERNEL_CONFIG)
200+$(STAMP_KERNEL_CONFIG):
201 @set -e ; test -f local-symbols || ( \
202 echo "/--------------" ;\
203 echo "| You shouldn't run make in the backports tree, but only in" ;\
204@@ -60,58 +62,62 @@ mrproper:
205 echo "| (that isn't currently running.)" ;\
206 echo "\\--" ;\
207 false)
208- @set -e ; if [ "$$(cat .kernel_config_md5 2>/dev/null)" != "$(CONFIG_MD5)" ] ;\
209- then \
210- echo -n "Generating local configuration database from kernel ..." ;\
211- grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | ( \
212- while read l ; do \
213- if [ "$${l:0:7}" != "CONFIG_" ] ; then \
214- continue ;\
215- fi ;\
216- l=$${l:7} ;\
217- n=$${l%%=*} ;\
218- v=$${l#*=} ;\
219- if [ "$$v" = "m" ] ; then \
220- echo config $$n ;\
221- echo ' tristate' ;\
222- elif [ "$$v" = "y" ] ; then \
223- echo config $$n ;\
224- echo ' bool' ;\
225- else \
226- continue ;\
227- fi ;\
228- echo " default $$v" ;\
229- echo "" ;\
230- done \
231- ) > Kconfig.kernel ;\
232- kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
233- kernelversion | sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\
234- test "$$kver" != "" || echo "Kernel version parse failed!" ;\
235- test "$$kver" != "" ;\
236- kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\
237- kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')" ;\
238- kvers="$$kvers $$(seq 0 20 | sed 's/^/4./')" ;\
239- kvers="$$kvers $$(seq 0 99 | sed 's/^/5./')" ;\
240- print=0 ;\
241- for v in $$kvers ; do \
242- if [ "$$print" = "1" ] ; then \
243- echo config KERNEL_$$(echo $$v | tr . _) ;\
244- echo " def_bool y" ;\
245- fi ;\
246- if [ "$$v" = "$$kver" ] ; then print=1 ; fi ;\
247- done > Kconfig.versions ;\
248- # RHEL as well, sadly we need to grep for it ;\
249- RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | \
250- sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\
251- RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | \
252- sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\
253- for v in $$(seq 0 $$RHEL_MINOR) ; do \
254- echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v ;\
255- echo " def_bool y" ;\
256- done >> Kconfig.versions ;\
257- echo " done." ;\
258- fi ;\
259- echo "$(CONFIG_MD5)" > .kernel_config_md5
260+ @rm -f .kernel_config_md5_*
261+ @touch $@
262+
263+Kconfig.kernel: $(STAMP_KERNEL_CONFIG) local-symbols
264+ @printf "Generating local configuration database from kernel ..."
265+ @grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | ( \
266+ while read l ; do \
267+ if [ "$${l:0:7}" != "CONFIG_" ] ; then \
268+ continue ;\
269+ fi ;\
270+ l=$${l:7} ;\
271+ n=$${l%%=*} ;\
272+ v=$${l#*=} ;\
273+ if [ "$$v" = "m" ] ; then \
274+ echo config $$n ;\
275+ echo ' tristate' ;\
276+ elif [ "$$v" = "y" ] ; then \
277+ echo config $$n ;\
278+ echo ' bool' ;\
279+ else \
280+ continue ;\
281+ fi ;\
282+ echo " default $$v" ;\
283+ echo "" ;\
284+ done \
285+ ) > $@
286+ @echo " done."
287+
288+Kconfig.versions: Kconfig.kernel
289+ @kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
290+ kernelversion | sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\
291+ test "$$kver" != "" || echo "Kernel version parse failed!" ;\
292+ test "$$kver" != "" ;\
293+ kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\
294+ kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')" ;\
295+ kvers="$$kvers $$(seq 0 20 | sed 's/^/4./')" ;\
296+ kvers="$$kvers $$(seq 0 99 | sed 's/^/5./')" ;\
297+ print=0 ;\
298+ for v in $$kvers ; do \
299+ if [ "$$print" = "1" ] ; then \
300+ echo config KERNEL_$$(echo $$v | tr . _) ;\
301+ echo " def_bool y" ;\
302+ fi ;\
303+ if [ "$$v" = "$$kver" ] ; then print=1 ; fi ;\
304+ done > $@
305+ @RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | \
306+ sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\
307+ RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | \
308+ sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\
309+ for v in $$(seq 0 $$RHEL_MINOR) ; do \
310+ echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v ;\
311+ echo " def_bool y" ;\
312+ done >> $@
313+
314+.DEFAULT:
315+ @$(MAKE) Kconfig.versions
316 @$(MAKE) -f Makefile.real "$@"
317
318 .PHONY: defconfig-help
319diff --git a/Makefile.real b/Makefile.real
320index 6550802..971a543 100644
321--- a/Makefile.real
322+++ b/Makefile.real
323@@ -6,6 +6,18 @@ else
324 export BACKPORTS_GIT_TRACKER_DEF=
325 endif
326
327+ifneq ($(LLVM),)
328+ifneq ($(filter %/,$(LLVM)),)
329+LLVM_PREFIX := $(LLVM)
330+else ifneq ($(filter -%,$(LLVM)),)
331+LLVM_SUFFIX := $(LLVM)
332+endif
333+
334+HOSTCC = $(LLVM_PREFIX)clang$(LLVM_SUFFIX)
335+else
336+HOSTCC = gcc
337+endif
338+
339 # disable built-in rules for this file
340 .SUFFIXES:
341
342@@ -24,21 +36,21 @@ listnewconfig oldaskconfig oldconfig \
343 silentoldconfig olddefconfig oldnoconfig \
344 allnoconfig allyesconfig allmodconfig \
345 alldefconfig randconfig:
346- @$(MAKE) -C kconf conf
347+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
348 @./kconf/conf --$@ Kconfig
349
350 .PHONY: usedefconfig
351 usedefconfig:
352- @$(MAKE) -C kconf conf
353+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
354 @./kconf/conf --defconfig=defconfig Kconfig
355
356 .PHONY: savedefconfig
357 savedefconfig:
358- @$(MAKE) -C kconf conf
359+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
360 @./kconf/conf --savedefconfig=defconfig Kconfig
361
362 defconfig-%::
363- @$(MAKE) -C kconf conf
364+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
365 @./kconf/conf --defconfig=defconfigs/$(@:defconfig-%=%) Kconfig
366
367 .config:
368@@ -59,7 +71,7 @@ defconfig-%::
369
370 backport-include/backport/autoconf.h: .config Kconfig.versions Kconfig.kernel
371 @$(MAKE) oldconfig
372- @echo -n "Building backport-include/backport/autoconf.h ..."
373+ @printf "Building backport-include/backport/autoconf.h ..."
374 @grep -f local-symbols .config | ( \
375 echo "#ifndef COMPAT_AUTOCONF_INCLUDED" ;\
376 echo "#define COMPAT_AUTOCONF_INCLUDED" ;\
377@@ -80,7 +92,12 @@ backport-include/backport/autoconf.h: .config Kconfig.versions Kconfig.kernel
378 esac ;\
379 done ;\
380 echo "#endif /* COMPAT_AUTOCONF_INCLUDED */" ;\
381- ) > backport-include/backport/autoconf.h
382+ ) > $@.new
383+ @if cmp -s $@ $@.new; then \
384+ rm -f $@.new; \
385+ else \
386+ mv $@.new $@; \
387+ fi
388 @echo " done."
389
390 .PHONY: modules
391diff --git a/compat/main.c b/compat/main.c
392index d4f3340..651ab63 100644
393--- a/compat/main.c
394+++ b/compat/main.c
395@@ -19,31 +19,6 @@ MODULE_LICENSE("GPL");
396 #error "You need a CPTCFG_VERSION"
397 #endif
398
399-static char *backported_kernel_name = CPTCFG_KERNEL_NAME;
400-
401-module_param(backported_kernel_name, charp, 0400);
402-MODULE_PARM_DESC(backported_kernel_name,
403- "The kernel tree name that was used for this backport (" CPTCFG_KERNEL_NAME ")");
404-
405-#ifdef BACKPORTS_GIT_TRACKED
406-static char *backports_tracker_id = BACKPORTS_GIT_TRACKED;
407-module_param(backports_tracker_id, charp, 0400);
408-MODULE_PARM_DESC(backports_tracker_id,
409- "The version of the tree containing this backport (" BACKPORTS_GIT_TRACKED ")");
410-#else
411-static char *backported_kernel_version = CPTCFG_KERNEL_VERSION;
412-static char *backports_version = CPTCFG_VERSION;
413-
414-module_param(backported_kernel_version, charp, 0400);
415-MODULE_PARM_DESC(backported_kernel_version,
416- "The kernel version that was used for this backport (" CPTCFG_KERNEL_VERSION ")");
417-
418-module_param(backports_version, charp, 0400);
419-MODULE_PARM_DESC(backports_version,
420- "The git version of the backports tree used to generate this backport (" CPTCFG_VERSION ")");
421-
422-#endif
423-
424 void backport_dependency_symbol(void)
425 {
426 }
427diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
428index 7430aaf..f5f58a5 100644
429--- a/drivers/net/wireless/ath/ath11k/Kconfig
430+++ b/drivers/net/wireless/ath/ath11k/Kconfig
431@@ -25,9 +25,9 @@ config ATH11K_PCI
432 tristate "Atheros ath11k PCI support"
433 depends on m
434 depends on ATH11K && PCI
435- select MHI_BUS
436- select QRTR
437- select QRTR_MHI
438+ depends on MHI_BUS
439+ depends on QRTR
440+ depends on QRTR_MHI
441 help
442 This module adds support for PCIE bus
443
444diff --git a/drivers/net/wireless/broadcom/b43/Kconfig b/drivers/net/wireless/broadcom/b43/Kconfig
445index 2e196b5..84cbe38 100644
446--- a/drivers/net/wireless/broadcom/b43/Kconfig
447+++ b/drivers/net/wireless/broadcom/b43/Kconfig
448@@ -63,21 +63,21 @@ endchoice
449 config B43_PCI_AUTOSELECT
450 bool
451 depends on B43 && SSB_PCIHOST_POSSIBLE
452- select SSB_PCIHOST
453- select SSB_B43_PCI_BRIDGE
454+ depends on SSB_PCIHOST
455+ depends on SSB_B43_PCI_BRIDGE
456 default y
457
458 # Auto-select SSB PCICORE driver, if possible
459 config B43_PCICORE_AUTOSELECT
460 bool
461 depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE
462- select SSB_DRIVER_PCICORE
463+ depends on SSB_DRIVER_PCICORE
464 default y
465
466 config B43_SDIO
467 bool "Broadcom 43xx SDIO device support"
468 depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
469- select SSB_SDIOHOST
470+ depends on SSB_SDIOHOST
471 help
472 Broadcom 43xx device support for Soft-MAC SDIO devices.
473
474@@ -96,13 +96,13 @@ config B43_SDIO
475 config B43_BCMA_PIO
476 bool
477 depends on B43 && B43_BCMA
478- select BCMA_BLOCKIO
479+ depends on BCMA_BLOCKIO
480 default y
481
482 config B43_PIO
483 bool
484 depends on B43 && B43_SSB
485- select SSB_BLOCKIO
486+ depends on SSB_BLOCKIO
487 default y
488
489 config B43_PHY_G
490diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c
491index c2e0a05..bf2be0a 100644
492--- a/drivers/net/wireless/broadcom/b43/main.c
493+++ b/drivers/net/wireless/broadcom/b43/main.c
494@@ -2854,7 +2854,7 @@ static struct ssb_device *b43_ssb_gpio_dev(struct b43_wldev *dev)
495 {
496 struct ssb_bus *bus = dev->dev->sdev->bus;
497
498-#ifdef CPTCFG_SSB_DRIVER_PCICORE
499+#ifdef CONFIG_SSB_DRIVER_PCICORE
500 return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
501 #else
502 return bus->chipco.dev;
503@@ -4873,7 +4873,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
504 }
505 if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
506 hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
507-#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
508+#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
509 if (dev->dev->bus_type == B43_BUS_SSB &&
510 dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
511 dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
512diff --git a/drivers/net/wireless/broadcom/b43legacy/Kconfig b/drivers/net/wireless/broadcom/b43legacy/Kconfig
513index 6ba7eb7..b924f63 100644
514--- a/drivers/net/wireless/broadcom/b43legacy/Kconfig
515+++ b/drivers/net/wireless/broadcom/b43legacy/Kconfig
516@@ -3,7 +3,7 @@ config B43LEGACY
517 tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)"
518 depends on m
519 depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
520- select SSB
521+ depends on SSB
522 depends on FW_LOADER
523 help
524 b43legacy is a driver for 802.11b devices from Broadcom (BCM4301 and
525@@ -25,15 +25,15 @@ config B43LEGACY
526 config B43LEGACY_PCI_AUTOSELECT
527 bool
528 depends on B43LEGACY && SSB_PCIHOST_POSSIBLE
529- select SSB_PCIHOST
530- select SSB_B43_PCI_BRIDGE
531+ depends on SSB_PCIHOST
532+ depends on SSB_B43_PCI_BRIDGE
533 default y
534
535 # Auto-select SSB PCICORE driver, if possible
536 config B43LEGACY_PCICORE_AUTOSELECT
537 bool
538 depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE
539- select SSB_DRIVER_PCICORE
540+ depends on SSB_DRIVER_PCICORE
541 default y
542
543 # LED support
544diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c
545index edd91ff..0222f63 100644
546--- a/drivers/net/wireless/broadcom/b43legacy/main.c
547+++ b/drivers/net/wireless/broadcom/b43legacy/main.c
548@@ -1907,7 +1907,7 @@ static int b43legacy_gpio_init(struct b43legacy_wldev *dev)
549 if (dev->dev->id.revision >= 2)
550 mask |= 0x0010; /* FIXME: This is redundant. */
551
552-#ifdef CPTCFG_SSB_DRIVER_PCICORE
553+#ifdef CONFIG_SSB_DRIVER_PCICORE
554 pcidev = bus->pcicore.dev;
555 #endif
556 gpiodev = bus->chipco.dev ? : pcidev;
557@@ -1926,7 +1926,7 @@ static void b43legacy_gpio_cleanup(struct b43legacy_wldev *dev)
558 struct ssb_bus *bus = dev->dev->bus;
559 struct ssb_device *gpiodev, *pcidev = NULL;
560
561-#ifdef CPTCFG_SSB_DRIVER_PCICORE
562+#ifdef CONFIG_SSB_DRIVER_PCICORE
563 pcidev = bus->pcicore.dev;
564 #endif
565 gpiodev = bus->chipco.dev ? : pcidev;
566diff --git a/drivers/net/wireless/broadcom/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig
567index 400dc88..b2d97b8 100644
568--- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
569+++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
570@@ -8,7 +8,7 @@ config BRCMSMAC
571 depends on m
572 depends on MAC80211
573 depends on BCMA_POSSIBLE
574- select BCMA
575+ depends on BCMA
576 select BRCMUTIL
577 depends on FW_LOADER
578 depends on CORDIC
579diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
580index b1a1ce5..66f9281 100644
581--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
582+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
583@@ -555,7 +555,7 @@ struct iwl_mvm_tt_mgmt {
584 * @tzone: thermal zone device data
585 */
586 struct iwl_mvm_thermal_device {
587- struct thermal_trip trips[IWL_MAX_DTS_TRIPS];
588+ s16 temp_trips[IWL_MAX_DTS_TRIPS];
589 u8 fw_trips_index[IWL_MAX_DTS_TRIPS];
590 struct thermal_zone_device *tzone;
591 };
592diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
593index dee9c36..1fb364d 100644
594--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
595+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
596@@ -573,11 +573,11 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm)
597 * and uncompressed, the FW should get it compressed and sorted
598 */
599
600- /* compress trips to cmd array, remove uninitialized values*/
601+ /* compress temp_trips to cmd array, remove uninitialized values*/
602 for (i = 0; i < IWL_MAX_DTS_TRIPS; i++) {
603- if (mvm->tz_device.trips[i].temperature != INT_MIN) {
604+ if (mvm->tz_device.temp_trips[i] != S16_MIN) {
605 cmd.thresholds[idx++] =
606- cpu_to_le16((s16)(mvm->tz_device.trips[i].temperature / 1000));
607+ cpu_to_le16(mvm->tz_device.temp_trips[i]);
608 }
609 }
610 cmd.num_temps = cpu_to_le32(idx);
611@@ -593,8 +593,8 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm)
612 */
613 for (i = 0; i < idx; i++) {
614 for (j = 0; j < IWL_MAX_DTS_TRIPS; j++) {
615- if ((int)(le16_to_cpu(cmd.thresholds[i]) * 1000) ==
616- mvm->tz_device.trips[j].temperature)
617+ if (le16_to_cpu(cmd.thresholds[i]) ==
618+ mvm->tz_device.temp_trips[j])
619 mvm->tz_device.fw_trips_index[i] = j;
620 }
621 }
622@@ -665,6 +665,8 @@ out:
623
624 static struct thermal_zone_device_ops tzone_ops = {
625 .get_temp = iwl_mvm_tzone_get_temp,
626+ .get_trip_temp = iwl_mvm_tzone_get_trip_temp,
627+ .get_trip_type = iwl_mvm_tzone_get_trip_type,
628 .set_trip_temp = iwl_mvm_tzone_set_trip_temp,
629 };
630
631@@ -686,8 +688,7 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
632 BUILD_BUG_ON(ARRAY_SIZE(name) >= THERMAL_NAME_LENGTH);
633
634 sprintf(name, "iwlwifi_%u", atomic_inc_return(&counter) & 0xFF);
635- mvm->tz_device.tzone = thermal_zone_device_register_with_trips(name,
636- mvm->tz_device.trips,
637+ mvm->tz_device.tzone = thermal_zone_device_register(name,
638 IWL_MAX_DTS_TRIPS,
639 IWL_WRITABLE_TRIPS_MSK,
640 mvm, &tzone_ops,
641@@ -710,10 +711,8 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
642 /* 0 is a valid temperature,
643 * so initialize the array with S16_MIN which invalid temperature
644 */
645- for (i = 0 ; i < IWL_MAX_DTS_TRIPS; i++) {
646- mvm->tz_device.trips[i].temperature = INT_MIN;
647- mvm->tz_device.trips[i].type = THERMAL_TRIP_PASSIVE;
648- }
649+ for (i = 0 ; i < IWL_MAX_DTS_TRIPS; i++)
650+ mvm->tz_device.temp_trips[i] = S16_MIN;
651 }
652
653 static int iwl_mvm_tcool_get_max_state(struct thermal_cooling_device *cdev,
654diff --git a/drivers/staging/rtl8723bs/Kconfig b/drivers/staging/rtl8723bs/Kconfig
655index b51916c..b46ff98 100644
656--- a/drivers/staging/rtl8723bs/Kconfig
657+++ b/drivers/staging/rtl8723bs/Kconfig
658@@ -5,7 +5,6 @@ config RTL8723BS
659 depends on m
660 depends on WLAN && MMC && CFG80211
661 depends on m
662- select CFG80211_WEXT
663 depends on CRYPTO
664 select BPAUTO_CRYPTO_LIB_ARC4
665 help
666diff --git a/kconf/Makefile b/kconf/Makefile
667index 2004c44..a2790b1 100644
668--- a/kconf/Makefile
669+++ b/kconf/Makefile
670@@ -1,9 +1,9 @@
671-CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
672+CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DKBUILD_NO_NLS
673
674 LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o
675
676 conf: conf.o zconf.tab.o
677-mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags) -DLOCALE
678+mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags)
679 mconf_LDFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
680 mconf: CFLAGS += $(mconf_CFLAGS)
681
682diff --git a/kconf/conf.c b/kconf/conf.c
683index 283eeed..1707f05 100644
684--- a/kconf/conf.c
685+++ b/kconf/conf.c
686@@ -598,40 +598,12 @@ int main(int ac, char **av)
687 case oldconfig:
688 case listnewconfig:
689 case olddefconfig:
690- conf_read(NULL);
691- break;
692 case allnoconfig:
693 case allyesconfig:
694 case allmodconfig:
695 case alldefconfig:
696 case randconfig:
697- name = getenv("KCONFIG_ALLCONFIG");
698- if (!name)
699- break;
700- if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
701- if (conf_read_simple(name, S_DEF_USER)) {
702- fprintf(stderr,
703- _("*** Can't read seed configuration \"%s\"!\n"),
704- name);
705- exit(1);
706- }
707- break;
708- }
709- switch (input_mode) {
710- case allnoconfig: name = "allno.config"; break;
711- case allyesconfig: name = "allyes.config"; break;
712- case allmodconfig: name = "allmod.config"; break;
713- case alldefconfig: name = "alldef.config"; break;
714- case randconfig: name = "allrandom.config"; break;
715- default: break;
716- }
717- if (conf_read_simple(name, S_DEF_USER) &&
718- conf_read_simple("all.config", S_DEF_USER)) {
719- fprintf(stderr,
720- _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
721- name);
722- exit(1);
723- }
724+ conf_read(NULL);
725 break;
726 default:
727 break;
728diff --git a/kconf/confdata.c b/kconf/confdata.c
729index df26c7b..1038c30 100644
730--- a/kconf/confdata.c
731+++ b/kconf/confdata.c
732@@ -1170,6 +1170,8 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
733 }
734 bool has_changed = false;
735
736+ sym_clear_all_valid();
737+
738 for_all_symbols(i, sym) {
739 if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
740 continue;
741@@ -1213,8 +1215,6 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)
742
743 }
744
745- sym_clear_all_valid();
746-
747 /*
748 * We have different type of choice blocks.
749 * If curr.tri equals to mod then we can select several
750diff --git a/local-symbols b/local-symbols
751index 078fe8b..0743888 100644
752--- a/local-symbols
753+++ b/local-symbols
754@@ -67,14 +67,6 @@ MAC80211_MESH_PS_DEBUG=
755 MAC80211_TDLS_DEBUG=
756 MAC80211_DEBUG_COUNTERS=
757 MAC80211_STA_HASH_MAX_SIZE=
758-QRTR=
759-QRTR_SMD=
760-QRTR_TUN=
761-QRTR_MHI=
762-MHI_BUS=
763-MHI_BUS_DEBUG=
764-MHI_BUS_PCI_GENERIC=
765-MHI_BUS_EP=
766 QCOM_AOSS_QMP=
767 QCOM_COMMAND_DB=
768 QCOM_GENI_SE=
769@@ -472,43 +464,6 @@ USB_VL600=
770 USB_NET_CH9200=
771 USB_NET_AQC111=
772 USB_RTL8153_ECM=
773-SSB_POSSIBLE=
774-SSB=
775-SSB_SPROM=
776-SSB_BLOCKIO=
777-SSB_PCIHOST_POSSIBLE=
778-SSB_PCIHOST=
779-SSB_B43_PCI_BRIDGE=
780-SSB_PCMCIAHOST_POSSIBLE=
781-SSB_PCMCIAHOST=
782-SSB_SDIOHOST_POSSIBLE=
783-SSB_SDIOHOST=
784-SSB_HOST_SOC=
785-SSB_SERIAL=
786-SSB_DRIVER_PCICORE_POSSIBLE=
787-SSB_DRIVER_PCICORE=
788-SSB_PCICORE_HOSTMODE=
789-SSB_DRIVER_MIPS=
790-SSB_SFLASH=
791-SSB_EMBEDDED=
792-SSB_DRIVER_EXTIF=
793-SSB_DRIVER_GIGE=
794-SSB_DRIVER_GPIO=
795-BCMA_POSSIBLE=
796-BCMA=
797-BCMA_BLOCKIO=
798-BCMA_HOST_PCI_POSSIBLE=
799-BCMA_HOST_PCI=
800-BCMA_HOST_SOC=
801-BCMA_DRIVER_PCI=
802-BCMA_DRIVER_PCI_HOSTMODE=
803-BCMA_DRIVER_MIPS=
804-BCMA_PFLASH=
805-BCMA_SFLASH=
806-BCMA_NFLASH=
807-BCMA_DRIVER_GMAC_CMN=
808-BCMA_DRIVER_GPIO=
809-BCMA_DEBUG=
810 USB_ACM=
811 USB_PRINTER=
812 USB_WDM=
813--
8142.39.2
815