| From 45a2c927c790c9f71a81983f6d59b15cfb6b05ac Mon Sep 17 00:00:00 2001 |
| From: Shayne Chen <shayne.chen@mediatek.com> |
| Date: Tue, 12 Mar 2024 11:25:41 +0800 |
| Subject: [PATCH 01/61] sync backports patches/build |
| |
| --- |
| Kconfig.local | 111 ----------------- |
| Kconfig.sources | 5 - |
| Makefile | 116 +++++++++--------- |
| Makefile.real | 29 ++++- |
| compat/main.c | 25 ---- |
| drivers/net/wireless/ath/ath11k/Kconfig | 6 +- |
| drivers/net/wireless/broadcom/b43/Kconfig | 12 +- |
| drivers/net/wireless/broadcom/b43/main.c | 4 +- |
| .../net/wireless/broadcom/b43legacy/Kconfig | 8 +- |
| .../net/wireless/broadcom/b43legacy/main.c | 4 +- |
| .../net/wireless/broadcom/brcm80211/Kconfig | 2 +- |
| drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- |
| drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 21 ++-- |
| drivers/staging/rtl8723bs/Kconfig | 1 - |
| kconf/Makefile | 4 +- |
| kconf/conf.c | 30 +---- |
| kconf/confdata.c | 4 +- |
| local-symbols | 45 ------- |
| 18 files changed, 118 insertions(+), 311 deletions(-) |
| |
| diff --git a/Kconfig.local b/Kconfig.local |
| index d9495b1..547f8ad 100644 |
| --- a/Kconfig.local |
| +++ b/Kconfig.local |
| @@ -1420,117 +1420,6 @@ config BACKPORTED_USB_NET_AQC111 |
| config BACKPORTED_USB_RTL8153_ECM |
| tristate |
| default USB_RTL8153_ECM |
| -config BACKPORTED_SSB_POSSIBLE |
| - tristate |
| - default SSB_POSSIBLE |
| -config BACKPORTED_SSB |
| - tristate |
| - default SSB |
| -config BACKPORTED_SSB_SPROM |
| - tristate |
| - default SSB_SPROM |
| -config BACKPORTED_SSB_BLOCKIO |
| - tristate |
| - default SSB_BLOCKIO |
| -config BACKPORTED_SSB_PCIHOST_POSSIBLE |
| - tristate |
| - default SSB_PCIHOST_POSSIBLE |
| -config BACKPORTED_SSB_PCIHOST |
| - tristate |
| - default SSB_PCIHOST |
| -config BACKPORTED_SSB_B43_PCI_BRIDGE |
| - tristate |
| - default SSB_B43_PCI_BRIDGE |
| -config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE |
| - tristate |
| - default SSB_PCMCIAHOST_POSSIBLE |
| -config BACKPORTED_SSB_PCMCIAHOST |
| - tristate |
| - default SSB_PCMCIAHOST |
| -config BACKPORTED_SSB_SDIOHOST_POSSIBLE |
| - tristate |
| - default SSB_SDIOHOST_POSSIBLE |
| -config BACKPORTED_SSB_SDIOHOST |
| - tristate |
| - default SSB_SDIOHOST |
| -config BACKPORTED_SSB_HOST_SOC |
| - tristate |
| - default SSB_HOST_SOC |
| -config BACKPORTED_SSB_SERIAL |
| - tristate |
| - default SSB_SERIAL |
| -config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE |
| - tristate |
| - default SSB_DRIVER_PCICORE_POSSIBLE |
| -config BACKPORTED_SSB_DRIVER_PCICORE |
| - tristate |
| - default SSB_DRIVER_PCICORE |
| -config BACKPORTED_SSB_PCICORE_HOSTMODE |
| - tristate |
| - default SSB_PCICORE_HOSTMODE |
| -config BACKPORTED_SSB_DRIVER_MIPS |
| - tristate |
| - default SSB_DRIVER_MIPS |
| -config BACKPORTED_SSB_SFLASH |
| - tristate |
| - default SSB_SFLASH |
| -config BACKPORTED_SSB_EMBEDDED |
| - tristate |
| - default SSB_EMBEDDED |
| -config BACKPORTED_SSB_DRIVER_EXTIF |
| - tristate |
| - default SSB_DRIVER_EXTIF |
| -config BACKPORTED_SSB_DRIVER_GIGE |
| - tristate |
| - default SSB_DRIVER_GIGE |
| -config BACKPORTED_SSB_DRIVER_GPIO |
| - tristate |
| - default SSB_DRIVER_GPIO |
| -config BACKPORTED_BCMA_POSSIBLE |
| - tristate |
| - default BCMA_POSSIBLE |
| -config BACKPORTED_BCMA |
| - tristate |
| - default BCMA |
| -config BACKPORTED_BCMA_BLOCKIO |
| - tristate |
| - default BCMA_BLOCKIO |
| -config BACKPORTED_BCMA_HOST_PCI_POSSIBLE |
| - tristate |
| - default BCMA_HOST_PCI_POSSIBLE |
| -config BACKPORTED_BCMA_HOST_PCI |
| - tristate |
| - default BCMA_HOST_PCI |
| -config BACKPORTED_BCMA_HOST_SOC |
| - tristate |
| - default BCMA_HOST_SOC |
| -config BACKPORTED_BCMA_DRIVER_PCI |
| - tristate |
| - default BCMA_DRIVER_PCI |
| -config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE |
| - tristate |
| - default BCMA_DRIVER_PCI_HOSTMODE |
| -config BACKPORTED_BCMA_DRIVER_MIPS |
| - tristate |
| - default BCMA_DRIVER_MIPS |
| -config BACKPORTED_BCMA_PFLASH |
| - tristate |
| - default BCMA_PFLASH |
| -config BACKPORTED_BCMA_SFLASH |
| - tristate |
| - default BCMA_SFLASH |
| -config BACKPORTED_BCMA_NFLASH |
| - tristate |
| - default BCMA_NFLASH |
| -config BACKPORTED_BCMA_DRIVER_GMAC_CMN |
| - tristate |
| - default BCMA_DRIVER_GMAC_CMN |
| -config BACKPORTED_BCMA_DRIVER_GPIO |
| - tristate |
| - default BCMA_DRIVER_GPIO |
| -config BACKPORTED_BCMA_DEBUG |
| - tristate |
| - default BCMA_DEBUG |
| config BACKPORTED_USB_ACM |
| tristate |
| default USB_ACM |
| diff --git a/Kconfig.sources b/Kconfig.sources |
| index 2ea4d8a..d74affd 100644 |
| --- a/Kconfig.sources |
| +++ b/Kconfig.sources |
| @@ -4,15 +4,10 @@ source "$BACKPORT_DIR/compat/Kconfig" |
| # these are copied from the kernel |
| source "$BACKPORT_DIR/net/wireless/Kconfig" |
| source "$BACKPORT_DIR/net/mac80211/Kconfig" |
| -source "$BACKPORT_DIR/net/qrtr/Kconfig" |
| -source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig" |
| source "$BACKPORT_DIR/drivers/soc/qcom/Kconfig" |
| source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" |
| source "$BACKPORT_DIR/drivers/net/usb/Kconfig" |
| |
| -source "$BACKPORT_DIR/drivers/ssb/Kconfig" |
| -source "$BACKPORT_DIR/drivers/bcma/Kconfig" |
| - |
| source "$BACKPORT_DIR/drivers/usb/class/Kconfig" |
| |
| source "$BACKPORT_DIR/drivers/staging/Kconfig" |
| diff --git a/Makefile b/Makefile |
| index 77c2670..c431b71 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -2,10 +2,10 @@ |
| # Makefile for the output source package |
| # |
| |
| -ifeq ($(KERNELRELEASE),) |
| +ifeq ($(KERNELVERSION),) |
| |
| MAKEFLAGS += --no-print-directory |
| -SHELL := /bin/bash |
| +SHELL := /usr/bin/env bash |
| BACKPORT_DIR := $(shell pwd) |
| |
| KMODDIR ?= updates |
| @@ -19,6 +19,7 @@ KLIB_BUILD ?= $(KLIB)/build/ |
| KERNEL_CONFIG := $(KLIB_BUILD)/.config |
| KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile |
| CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//') |
| +STAMP_KERNEL_CONFIG := .kernel_config_md5_$(CONFIG_MD5) |
| |
| export KLIB KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG |
| |
| @@ -36,7 +37,8 @@ mrproper: |
| @rm -f .kernel_config_md5 Kconfig.versions Kconfig.kernel |
| @rm -f backport-include/backport/autoconf.h |
| |
| -.DEFAULT: |
| +.SILENT: $(STAMP_KERNEL_CONFIG) |
| +$(STAMP_KERNEL_CONFIG): |
| @set -e ; test -f local-symbols || ( \ |
| echo "/--------------" ;\ |
| echo "| You shouldn't run make in the backports tree, but only in" ;\ |
| @@ -60,58 +62,62 @@ mrproper: |
| echo "| (that isn't currently running.)" ;\ |
| echo "\\--" ;\ |
| false) |
| - @set -e ; if [ "$$(cat .kernel_config_md5 2>/dev/null)" != "$(CONFIG_MD5)" ] ;\ |
| - then \ |
| - echo -n "Generating local configuration database from kernel ..." ;\ |
| - grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | ( \ |
| - while read l ; do \ |
| - if [ "$${l:0:7}" != "CONFIG_" ] ; then \ |
| - continue ;\ |
| - fi ;\ |
| - l=$${l:7} ;\ |
| - n=$${l%%=*} ;\ |
| - v=$${l#*=} ;\ |
| - if [ "$$v" = "m" ] ; then \ |
| - echo config $$n ;\ |
| - echo ' tristate' ;\ |
| - elif [ "$$v" = "y" ] ; then \ |
| - echo config $$n ;\ |
| - echo ' bool' ;\ |
| - else \ |
| - continue ;\ |
| - fi ;\ |
| - echo " default $$v" ;\ |
| - echo "" ;\ |
| - done \ |
| - ) > Kconfig.kernel ;\ |
| - kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \ |
| - kernelversion | sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\ |
| - test "$$kver" != "" || echo "Kernel version parse failed!" ;\ |
| - test "$$kver" != "" ;\ |
| - kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\ |
| - kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')" ;\ |
| - kvers="$$kvers $$(seq 0 20 | sed 's/^/4./')" ;\ |
| - kvers="$$kvers $$(seq 0 99 | sed 's/^/5./')" ;\ |
| - print=0 ;\ |
| - for v in $$kvers ; do \ |
| - if [ "$$print" = "1" ] ; then \ |
| - echo config KERNEL_$$(echo $$v | tr . _) ;\ |
| - echo " def_bool y" ;\ |
| - fi ;\ |
| - if [ "$$v" = "$$kver" ] ; then print=1 ; fi ;\ |
| - done > Kconfig.versions ;\ |
| - # RHEL as well, sadly we need to grep for it ;\ |
| - RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | \ |
| - sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\ |
| - RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | \ |
| - sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\ |
| - for v in $$(seq 0 $$RHEL_MINOR) ; do \ |
| - echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v ;\ |
| - echo " def_bool y" ;\ |
| - done >> Kconfig.versions ;\ |
| - echo " done." ;\ |
| - fi ;\ |
| - echo "$(CONFIG_MD5)" > .kernel_config_md5 |
| + @rm -f .kernel_config_md5_* |
| + @touch $@ |
| + |
| +Kconfig.kernel: $(STAMP_KERNEL_CONFIG) local-symbols |
| + @printf "Generating local configuration database from kernel ..." |
| + @grep -v -f local-symbols $(KERNEL_CONFIG) | grep = | ( \ |
| + while read l ; do \ |
| + if [ "$${l:0:7}" != "CONFIG_" ] ; then \ |
| + continue ;\ |
| + fi ;\ |
| + l=$${l:7} ;\ |
| + n=$${l%%=*} ;\ |
| + v=$${l#*=} ;\ |
| + if [ "$$v" = "m" ] ; then \ |
| + echo config $$n ;\ |
| + echo ' tristate' ;\ |
| + elif [ "$$v" = "y" ] ; then \ |
| + echo config $$n ;\ |
| + echo ' bool' ;\ |
| + else \ |
| + continue ;\ |
| + fi ;\ |
| + echo " default $$v" ;\ |
| + echo "" ;\ |
| + done \ |
| + ) > $@ |
| + @echo " done." |
| + |
| +Kconfig.versions: Kconfig.kernel |
| + @kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \ |
| + kernelversion | sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d');\ |
| + test "$$kver" != "" || echo "Kernel version parse failed!" ;\ |
| + test "$$kver" != "" ;\ |
| + kvers="$$(seq 14 39 | sed 's/^/2.6./')" ;\ |
| + kvers="$$kvers $$(seq 0 19 | sed 's/^/3./')" ;\ |
| + kvers="$$kvers $$(seq 0 20 | sed 's/^/4./')" ;\ |
| + kvers="$$kvers $$(seq 0 99 | sed 's/^/5./')" ;\ |
| + print=0 ;\ |
| + for v in $$kvers ; do \ |
| + if [ "$$print" = "1" ] ; then \ |
| + echo config KERNEL_$$(echo $$v | tr . _) ;\ |
| + echo " def_bool y" ;\ |
| + fi ;\ |
| + if [ "$$v" = "$$kver" ] ; then print=1 ; fi ;\ |
| + done > $@ |
| + @RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | \ |
| + sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\ |
| + RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | \ |
| + sed 's/.*=\s*\([0-9]*\)/\1/;t;d') ;\ |
| + for v in $$(seq 0 $$RHEL_MINOR) ; do \ |
| + echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v ;\ |
| + echo " def_bool y" ;\ |
| + done >> $@ |
| + |
| +.DEFAULT: |
| + @$(MAKE) Kconfig.versions |
| @$(MAKE) -f Makefile.real "$@" |
| |
| .PHONY: defconfig-help |
| diff --git a/Makefile.real b/Makefile.real |
| index 6550802..971a543 100644 |
| --- a/Makefile.real |
| +++ b/Makefile.real |
| @@ -6,6 +6,18 @@ else |
| export BACKPORTS_GIT_TRACKER_DEF= |
| endif |
| |
| +ifneq ($(LLVM),) |
| +ifneq ($(filter %/,$(LLVM)),) |
| +LLVM_PREFIX := $(LLVM) |
| +else ifneq ($(filter -%,$(LLVM)),) |
| +LLVM_SUFFIX := $(LLVM) |
| +endif |
| + |
| +HOSTCC = $(LLVM_PREFIX)clang$(LLVM_SUFFIX) |
| +else |
| +HOSTCC = gcc |
| +endif |
| + |
| # disable built-in rules for this file |
| .SUFFIXES: |
| |
| @@ -24,21 +36,21 @@ listnewconfig oldaskconfig oldconfig \ |
| silentoldconfig olddefconfig oldnoconfig \ |
| allnoconfig allyesconfig allmodconfig \ |
| alldefconfig randconfig: |
| - @$(MAKE) -C kconf conf |
| + @$(MAKE) -C kconf CC=$(HOSTCC) conf |
| @./kconf/conf --$@ Kconfig |
| |
| .PHONY: usedefconfig |
| usedefconfig: |
| - @$(MAKE) -C kconf conf |
| + @$(MAKE) -C kconf CC=$(HOSTCC) conf |
| @./kconf/conf --defconfig=defconfig Kconfig |
| |
| .PHONY: savedefconfig |
| savedefconfig: |
| - @$(MAKE) -C kconf conf |
| + @$(MAKE) -C kconf CC=$(HOSTCC) conf |
| @./kconf/conf --savedefconfig=defconfig Kconfig |
| |
| defconfig-%:: |
| - @$(MAKE) -C kconf conf |
| + @$(MAKE) -C kconf CC=$(HOSTCC) conf |
| @./kconf/conf --defconfig=defconfigs/$(@:defconfig-%=%) Kconfig |
| |
| .config: |
| @@ -59,7 +71,7 @@ defconfig-%:: |
| |
| backport-include/backport/autoconf.h: .config Kconfig.versions Kconfig.kernel |
| @$(MAKE) oldconfig |
| - @echo -n "Building backport-include/backport/autoconf.h ..." |
| + @printf "Building backport-include/backport/autoconf.h ..." |
| @grep -f local-symbols .config | ( \ |
| echo "#ifndef COMPAT_AUTOCONF_INCLUDED" ;\ |
| echo "#define COMPAT_AUTOCONF_INCLUDED" ;\ |
| @@ -80,7 +92,12 @@ backport-include/backport/autoconf.h: .config Kconfig.versions Kconfig.kernel |
| esac ;\ |
| done ;\ |
| echo "#endif /* COMPAT_AUTOCONF_INCLUDED */" ;\ |
| - ) > backport-include/backport/autoconf.h |
| + ) > $@.new |
| + @if cmp -s $@ $@.new; then \ |
| + rm -f $@.new; \ |
| + else \ |
| + mv $@.new $@; \ |
| + fi |
| @echo " done." |
| |
| .PHONY: modules |
| diff --git a/compat/main.c b/compat/main.c |
| index d4f3340..651ab63 100644 |
| --- a/compat/main.c |
| +++ b/compat/main.c |
| @@ -19,31 +19,6 @@ MODULE_LICENSE("GPL"); |
| #error "You need a CPTCFG_VERSION" |
| #endif |
| |
| -static char *backported_kernel_name = CPTCFG_KERNEL_NAME; |
| - |
| -module_param(backported_kernel_name, charp, 0400); |
| -MODULE_PARM_DESC(backported_kernel_name, |
| - "The kernel tree name that was used for this backport (" CPTCFG_KERNEL_NAME ")"); |
| - |
| -#ifdef BACKPORTS_GIT_TRACKED |
| -static char *backports_tracker_id = BACKPORTS_GIT_TRACKED; |
| -module_param(backports_tracker_id, charp, 0400); |
| -MODULE_PARM_DESC(backports_tracker_id, |
| - "The version of the tree containing this backport (" BACKPORTS_GIT_TRACKED ")"); |
| -#else |
| -static char *backported_kernel_version = CPTCFG_KERNEL_VERSION; |
| -static char *backports_version = CPTCFG_VERSION; |
| - |
| -module_param(backported_kernel_version, charp, 0400); |
| -MODULE_PARM_DESC(backported_kernel_version, |
| - "The kernel version that was used for this backport (" CPTCFG_KERNEL_VERSION ")"); |
| - |
| -module_param(backports_version, charp, 0400); |
| -MODULE_PARM_DESC(backports_version, |
| - "The git version of the backports tree used to generate this backport (" CPTCFG_VERSION ")"); |
| - |
| -#endif |
| - |
| void backport_dependency_symbol(void) |
| { |
| } |
| diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig |
| index 7430aaf..f5f58a5 100644 |
| --- a/drivers/net/wireless/ath/ath11k/Kconfig |
| +++ b/drivers/net/wireless/ath/ath11k/Kconfig |
| @@ -25,9 +25,9 @@ config ATH11K_PCI |
| tristate "Atheros ath11k PCI support" |
| depends on m |
| depends on ATH11K && PCI |
| - select MHI_BUS |
| - select QRTR |
| - select QRTR_MHI |
| + depends on MHI_BUS |
| + depends on QRTR |
| + depends on QRTR_MHI |
| help |
| This module adds support for PCIE bus |
| |
| diff --git a/drivers/net/wireless/broadcom/b43/Kconfig b/drivers/net/wireless/broadcom/b43/Kconfig |
| index 2e196b5..84cbe38 100644 |
| --- a/drivers/net/wireless/broadcom/b43/Kconfig |
| +++ b/drivers/net/wireless/broadcom/b43/Kconfig |
| @@ -63,21 +63,21 @@ endchoice |
| config B43_PCI_AUTOSELECT |
| bool |
| depends on B43 && SSB_PCIHOST_POSSIBLE |
| - select SSB_PCIHOST |
| - select SSB_B43_PCI_BRIDGE |
| + depends on SSB_PCIHOST |
| + depends on SSB_B43_PCI_BRIDGE |
| default y |
| |
| # Auto-select SSB PCICORE driver, if possible |
| config B43_PCICORE_AUTOSELECT |
| bool |
| depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE |
| - select SSB_DRIVER_PCICORE |
| + depends on SSB_DRIVER_PCICORE |
| default y |
| |
| config B43_SDIO |
| bool "Broadcom 43xx SDIO device support" |
| depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE |
| - select SSB_SDIOHOST |
| + depends on SSB_SDIOHOST |
| help |
| Broadcom 43xx device support for Soft-MAC SDIO devices. |
| |
| @@ -96,13 +96,13 @@ config B43_SDIO |
| config B43_BCMA_PIO |
| bool |
| depends on B43 && B43_BCMA |
| - select BCMA_BLOCKIO |
| + depends on BCMA_BLOCKIO |
| default y |
| |
| config B43_PIO |
| bool |
| depends on B43 && B43_SSB |
| - select SSB_BLOCKIO |
| + depends on SSB_BLOCKIO |
| default y |
| |
| config B43_PHY_G |
| diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c |
| index c2e0a05..bf2be0a 100644 |
| --- a/drivers/net/wireless/broadcom/b43/main.c |
| +++ b/drivers/net/wireless/broadcom/b43/main.c |
| @@ -2854,7 +2854,7 @@ static struct ssb_device *b43_ssb_gpio_dev(struct b43_wldev *dev) |
| { |
| struct ssb_bus *bus = dev->dev->sdev->bus; |
| |
| -#ifdef CPTCFG_SSB_DRIVER_PCICORE |
| +#ifdef CONFIG_SSB_DRIVER_PCICORE |
| return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); |
| #else |
| return bus->chipco.dev; |
| @@ -4873,7 +4873,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev) |
| } |
| if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW) |
| hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */ |
| -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE) |
| +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE) |
| if (dev->dev->bus_type == B43_BUS_SSB && |
| dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI && |
| dev->dev->sdev->bus->pcicore.dev->id.revision <= 10) |
| diff --git a/drivers/net/wireless/broadcom/b43legacy/Kconfig b/drivers/net/wireless/broadcom/b43legacy/Kconfig |
| index 6ba7eb7..b924f63 100644 |
| --- a/drivers/net/wireless/broadcom/b43legacy/Kconfig |
| +++ b/drivers/net/wireless/broadcom/b43legacy/Kconfig |
| @@ -3,7 +3,7 @@ config B43LEGACY |
| tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)" |
| depends on m |
| depends on SSB_POSSIBLE && MAC80211 && HAS_DMA |
| - select SSB |
| + depends on SSB |
| depends on FW_LOADER |
| help |
| b43legacy is a driver for 802.11b devices from Broadcom (BCM4301 and |
| @@ -25,15 +25,15 @@ config B43LEGACY |
| config B43LEGACY_PCI_AUTOSELECT |
| bool |
| depends on B43LEGACY && SSB_PCIHOST_POSSIBLE |
| - select SSB_PCIHOST |
| - select SSB_B43_PCI_BRIDGE |
| + depends on SSB_PCIHOST |
| + depends on SSB_B43_PCI_BRIDGE |
| default y |
| |
| # Auto-select SSB PCICORE driver, if possible |
| config B43LEGACY_PCICORE_AUTOSELECT |
| bool |
| depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE |
| - select SSB_DRIVER_PCICORE |
| + depends on SSB_DRIVER_PCICORE |
| default y |
| |
| # LED support |
| diff --git a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c |
| index edd91ff..0222f63 100644 |
| --- a/drivers/net/wireless/broadcom/b43legacy/main.c |
| +++ b/drivers/net/wireless/broadcom/b43legacy/main.c |
| @@ -1907,7 +1907,7 @@ static int b43legacy_gpio_init(struct b43legacy_wldev *dev) |
| if (dev->dev->id.revision >= 2) |
| mask |= 0x0010; /* FIXME: This is redundant. */ |
| |
| -#ifdef CPTCFG_SSB_DRIVER_PCICORE |
| +#ifdef CONFIG_SSB_DRIVER_PCICORE |
| pcidev = bus->pcicore.dev; |
| #endif |
| gpiodev = bus->chipco.dev ? : pcidev; |
| @@ -1926,7 +1926,7 @@ static void b43legacy_gpio_cleanup(struct b43legacy_wldev *dev) |
| struct ssb_bus *bus = dev->dev->bus; |
| struct ssb_device *gpiodev, *pcidev = NULL; |
| |
| -#ifdef CPTCFG_SSB_DRIVER_PCICORE |
| +#ifdef CONFIG_SSB_DRIVER_PCICORE |
| pcidev = bus->pcicore.dev; |
| #endif |
| gpiodev = bus->chipco.dev ? : pcidev; |
| diff --git a/drivers/net/wireless/broadcom/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| index 400dc88..b2d97b8 100644 |
| --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig |
| @@ -8,7 +8,7 @@ config BRCMSMAC |
| depends on m |
| depends on MAC80211 |
| depends on BCMA_POSSIBLE |
| - select BCMA |
| + depends on BCMA |
| select BRCMUTIL |
| depends on FW_LOADER |
| depends on CORDIC |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h |
| index b1a1ce5..66f9281 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h |
| @@ -555,7 +555,7 @@ struct iwl_mvm_tt_mgmt { |
| * @tzone: thermal zone device data |
| */ |
| struct iwl_mvm_thermal_device { |
| - struct thermal_trip trips[IWL_MAX_DTS_TRIPS]; |
| + s16 temp_trips[IWL_MAX_DTS_TRIPS]; |
| u8 fw_trips_index[IWL_MAX_DTS_TRIPS]; |
| struct thermal_zone_device *tzone; |
| }; |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c |
| index dee9c36..1fb364d 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c |
| @@ -573,11 +573,11 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm) |
| * and uncompressed, the FW should get it compressed and sorted |
| */ |
| |
| - /* compress trips to cmd array, remove uninitialized values*/ |
| + /* compress temp_trips to cmd array, remove uninitialized values*/ |
| for (i = 0; i < IWL_MAX_DTS_TRIPS; i++) { |
| - if (mvm->tz_device.trips[i].temperature != INT_MIN) { |
| + if (mvm->tz_device.temp_trips[i] != S16_MIN) { |
| cmd.thresholds[idx++] = |
| - cpu_to_le16((s16)(mvm->tz_device.trips[i].temperature / 1000)); |
| + cpu_to_le16(mvm->tz_device.temp_trips[i]); |
| } |
| } |
| cmd.num_temps = cpu_to_le32(idx); |
| @@ -593,8 +593,8 @@ int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm) |
| */ |
| for (i = 0; i < idx; i++) { |
| for (j = 0; j < IWL_MAX_DTS_TRIPS; j++) { |
| - if ((int)(le16_to_cpu(cmd.thresholds[i]) * 1000) == |
| - mvm->tz_device.trips[j].temperature) |
| + if (le16_to_cpu(cmd.thresholds[i]) == |
| + mvm->tz_device.temp_trips[j]) |
| mvm->tz_device.fw_trips_index[i] = j; |
| } |
| } |
| @@ -665,6 +665,8 @@ out: |
| |
| static struct thermal_zone_device_ops tzone_ops = { |
| .get_temp = iwl_mvm_tzone_get_temp, |
| + .get_trip_temp = iwl_mvm_tzone_get_trip_temp, |
| + .get_trip_type = iwl_mvm_tzone_get_trip_type, |
| .set_trip_temp = iwl_mvm_tzone_set_trip_temp, |
| }; |
| |
| @@ -686,8 +688,7 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm) |
| BUILD_BUG_ON(ARRAY_SIZE(name) >= THERMAL_NAME_LENGTH); |
| |
| sprintf(name, "iwlwifi_%u", atomic_inc_return(&counter) & 0xFF); |
| - mvm->tz_device.tzone = thermal_zone_device_register_with_trips(name, |
| - mvm->tz_device.trips, |
| + mvm->tz_device.tzone = thermal_zone_device_register(name, |
| IWL_MAX_DTS_TRIPS, |
| IWL_WRITABLE_TRIPS_MSK, |
| mvm, &tzone_ops, |
| @@ -710,10 +711,8 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm) |
| /* 0 is a valid temperature, |
| * so initialize the array with S16_MIN which invalid temperature |
| */ |
| - for (i = 0 ; i < IWL_MAX_DTS_TRIPS; i++) { |
| - mvm->tz_device.trips[i].temperature = INT_MIN; |
| - mvm->tz_device.trips[i].type = THERMAL_TRIP_PASSIVE; |
| - } |
| + for (i = 0 ; i < IWL_MAX_DTS_TRIPS; i++) |
| + mvm->tz_device.temp_trips[i] = S16_MIN; |
| } |
| |
| static int iwl_mvm_tcool_get_max_state(struct thermal_cooling_device *cdev, |
| diff --git a/drivers/staging/rtl8723bs/Kconfig b/drivers/staging/rtl8723bs/Kconfig |
| index b51916c..b46ff98 100644 |
| --- a/drivers/staging/rtl8723bs/Kconfig |
| +++ b/drivers/staging/rtl8723bs/Kconfig |
| @@ -5,7 +5,6 @@ config RTL8723BS |
| depends on m |
| depends on WLAN && MMC && CFG80211 |
| depends on m |
| - select CFG80211_WEXT |
| depends on CRYPTO |
| select BPAUTO_CRYPTO_LIB_ARC4 |
| help |
| diff --git a/kconf/Makefile b/kconf/Makefile |
| index 2004c44..a2790b1 100644 |
| --- a/kconf/Makefile |
| +++ b/kconf/Makefile |
| @@ -1,9 +1,9 @@ |
| -CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer |
| +CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DKBUILD_NO_NLS |
| |
| LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o |
| |
| conf: conf.o zconf.tab.o |
| -mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags) -DLOCALE |
| +mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags) |
| mconf_LDFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC)) |
| mconf: CFLAGS += $(mconf_CFLAGS) |
| |
| diff --git a/kconf/conf.c b/kconf/conf.c |
| index 283eeed..1707f05 100644 |
| --- a/kconf/conf.c |
| +++ b/kconf/conf.c |
| @@ -598,40 +598,12 @@ int main(int ac, char **av) |
| case oldconfig: |
| case listnewconfig: |
| case olddefconfig: |
| - conf_read(NULL); |
| - break; |
| case allnoconfig: |
| case allyesconfig: |
| case allmodconfig: |
| case alldefconfig: |
| case randconfig: |
| - name = getenv("KCONFIG_ALLCONFIG"); |
| - if (!name) |
| - break; |
| - if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { |
| - if (conf_read_simple(name, S_DEF_USER)) { |
| - fprintf(stderr, |
| - _("*** Can't read seed configuration \"%s\"!\n"), |
| - name); |
| - exit(1); |
| - } |
| - break; |
| - } |
| - switch (input_mode) { |
| - case allnoconfig: name = "allno.config"; break; |
| - case allyesconfig: name = "allyes.config"; break; |
| - case allmodconfig: name = "allmod.config"; break; |
| - case alldefconfig: name = "alldef.config"; break; |
| - case randconfig: name = "allrandom.config"; break; |
| - default: break; |
| - } |
| - if (conf_read_simple(name, S_DEF_USER) && |
| - conf_read_simple("all.config", S_DEF_USER)) { |
| - fprintf(stderr, |
| - _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), |
| - name); |
| - exit(1); |
| - } |
| + conf_read(NULL); |
| break; |
| default: |
| break; |
| diff --git a/kconf/confdata.c b/kconf/confdata.c |
| index df26c7b..1038c30 100644 |
| --- a/kconf/confdata.c |
| +++ b/kconf/confdata.c |
| @@ -1170,6 +1170,8 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode) |
| } |
| bool has_changed = false; |
| |
| + sym_clear_all_valid(); |
| + |
| for_all_symbols(i, sym) { |
| if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID)) |
| continue; |
| @@ -1213,8 +1215,6 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode) |
| |
| } |
| |
| - sym_clear_all_valid(); |
| - |
| /* |
| * We have different type of choice blocks. |
| * If curr.tri equals to mod then we can select several |
| diff --git a/local-symbols b/local-symbols |
| index 078fe8b..0743888 100644 |
| --- a/local-symbols |
| +++ b/local-symbols |
| @@ -67,14 +67,6 @@ MAC80211_MESH_PS_DEBUG= |
| MAC80211_TDLS_DEBUG= |
| MAC80211_DEBUG_COUNTERS= |
| MAC80211_STA_HASH_MAX_SIZE= |
| -QRTR= |
| -QRTR_SMD= |
| -QRTR_TUN= |
| -QRTR_MHI= |
| -MHI_BUS= |
| -MHI_BUS_DEBUG= |
| -MHI_BUS_PCI_GENERIC= |
| -MHI_BUS_EP= |
| QCOM_AOSS_QMP= |
| QCOM_COMMAND_DB= |
| QCOM_GENI_SE= |
| @@ -472,43 +464,6 @@ USB_VL600= |
| USB_NET_CH9200= |
| USB_NET_AQC111= |
| USB_RTL8153_ECM= |
| -SSB_POSSIBLE= |
| -SSB= |
| -SSB_SPROM= |
| -SSB_BLOCKIO= |
| -SSB_PCIHOST_POSSIBLE= |
| -SSB_PCIHOST= |
| -SSB_B43_PCI_BRIDGE= |
| -SSB_PCMCIAHOST_POSSIBLE= |
| -SSB_PCMCIAHOST= |
| -SSB_SDIOHOST_POSSIBLE= |
| -SSB_SDIOHOST= |
| -SSB_HOST_SOC= |
| -SSB_SERIAL= |
| -SSB_DRIVER_PCICORE_POSSIBLE= |
| -SSB_DRIVER_PCICORE= |
| -SSB_PCICORE_HOSTMODE= |
| -SSB_DRIVER_MIPS= |
| -SSB_SFLASH= |
| -SSB_EMBEDDED= |
| -SSB_DRIVER_EXTIF= |
| -SSB_DRIVER_GIGE= |
| -SSB_DRIVER_GPIO= |
| -BCMA_POSSIBLE= |
| -BCMA= |
| -BCMA_BLOCKIO= |
| -BCMA_HOST_PCI_POSSIBLE= |
| -BCMA_HOST_PCI= |
| -BCMA_HOST_SOC= |
| -BCMA_DRIVER_PCI= |
| -BCMA_DRIVER_PCI_HOSTMODE= |
| -BCMA_DRIVER_MIPS= |
| -BCMA_PFLASH= |
| -BCMA_SFLASH= |
| -BCMA_NFLASH= |
| -BCMA_DRIVER_GMAC_CMN= |
| -BCMA_DRIVER_GPIO= |
| -BCMA_DEBUG= |
| USB_ACM= |
| USB_PRINTER= |
| USB_WDM= |
| -- |
| 2.39.2 |
| |