diff mbox series

[1/2] Kernel: drop bluetooth support

Message ID	8e1b087f-2b96-3678-8fca-98717484740f@ipfire.org
State	Superseded
Headers	To: "IPFire: Development-List" <development@lists.ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@ipfire.org> Subject: [PATCH 1/2] Kernel: drop bluetooth support Message-ID: <8e1b087f-2b96-3678-8fca-98717484740f@ipfire.org> Date: Tue, 31 Mar 2020 16:42:00 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[1/2] Kernel: drop bluetooth support \| [1/2] Kernel: drop bluetooth support [2/2] Kernel: drop Memstick support

Commit Message

Peter Müller March 31, 2020, 4:42 p.m. UTC

  The bluetooth addon was recently removed by commit
592be1d206e45ad42736b352d96e42ebca50123a, which is why we do not need to
carry the corresponding kernel modules around anymore.

Cc: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Cc: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/kernel/kernel.config.aarch64-ipfire        | 76 +++++++++++----------
 config/kernel/kernel.config.armv5tel-ipfire-multi | 76 +++++++++++----------
 config/kernel/kernel.config.i586-ipfire           | 78 ++++++++++-----------
 config/kernel/kernel.config.i586-ipfire-pae       | 78 ++++++++++-----------
 config/kernel/kernel.config.x86_64-ipfire         | 82 +++++++++++------------
 5 files changed, 199 insertions(+), 191 deletions(-)

Comments

Arne Fitzenreiter April 1, 2020, 10:20 a.m. UTC | #1

Looks like you have edited the config manually and not by make *config
because if you disble BT by
# CONFIG_BT is not set
all other CONFIG_BT_* options should vanish from the config.

Arne


Am 2020-03-31 18:42, schrieb Peter Müller:
> The bluetooth addon was recently removed by commit
> 592be1d206e45ad42736b352d96e42ebca50123a, which is why we do not need 
> to
> carry the corresponding kernel modules around anymore.
> 
> Cc: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
> Cc: Michael Tremer <michael.tremer@ipfire.org>
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
>  config/kernel/kernel.config.aarch64-ipfire        | 76 
> +++++++++++----------
>  config/kernel/kernel.config.armv5tel-ipfire-multi | 76 
> +++++++++++----------
>  config/kernel/kernel.config.i586-ipfire           | 78 
> ++++++++++-----------
>  config/kernel/kernel.config.i586-ipfire-pae       | 78 
> ++++++++++-----------
>  config/kernel/kernel.config.x86_64-ipfire         | 82 
> +++++++++++------------
>  5 files changed, 199 insertions(+), 191 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.aarch64-ipfire
> b/config/kernel/kernel.config.aarch64-ipfire
> index 32ad2df07..4c4b74651 100644
> --- a/config/kernel/kernel.config.aarch64-ipfire
> +++ b/config/kernel/kernel.config.aarch64-ipfire
> @@ -1336,47 +1336,51 @@ CONFIG_NET_FLOW_LIMIT=y
>  # CONFIG_NET_DROP_MONITOR is not set
>  # CONFIG_HAMRADIO is not set
>  # CONFIG_CAN is not set
> -CONFIG_BT=m
> -CONFIG_BT_BREDR=y
> -CONFIG_BT_RFCOMM=m
> -CONFIG_BT_RFCOMM_TTY=y
> -CONFIG_BT_BNEP=m
> -CONFIG_BT_BNEP_MC_FILTER=y
> -CONFIG_BT_BNEP_PROTO_FILTER=y
> -CONFIG_BT_HIDP=m
> -CONFIG_BT_HS=y
> -CONFIG_BT_LE=y
> -CONFIG_BT_LEDS=y
> +# CONFIG_BT is not set
> +# CONFIG_BT_BREDR is not set
> +# CONFIG_BT_RFCOMM is not set
> +# CONFIG_BT_RFCOMM_TTY is not set
> +# CONFIG_BT_BNEP is not set
> +# CONFIG_BT_BNEP_MC_FILTER is not set
> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
> +# CONFIG_BT_HIDP is not set
> +# CONFIG_BT_HS is not set
> +# CONFIG_BT_LE is not set
> +# CONFIG_BT_LEDS is not set
>  # CONFIG_BT_SELFTEST is not set
> -CONFIG_BT_DEBUGFS=y
> +# CONFIG_BT_DEBUGFS is not set
> 
>  #
>  # Bluetooth device drivers
>  #
> -CONFIG_BT_INTEL=m
> -CONFIG_BT_BCM=m
> -CONFIG_BT_RTL=m
> -CONFIG_BT_QCA=m
> -CONFIG_BT_HCIBTUSB=m
> -CONFIG_BT_HCIBTUSB_BCM=y
> -CONFIG_BT_HCIBTUSB_RTL=y
> -CONFIG_BT_HCIBTSDIO=m
> -CONFIG_BT_HCIUART=m
> -CONFIG_BT_HCIUART_H4=y
> -CONFIG_BT_HCIUART_BCSP=y
> -CONFIG_BT_HCIUART_ATH3K=y
> -CONFIG_BT_HCIUART_INTEL=y
> -CONFIG_BT_HCIUART_QCA=y
> -CONFIG_BT_HCIUART_AG6XX=y
> -CONFIG_BT_HCIUART_MRVL=y
> -CONFIG_BT_HCIBCM203X=m
> -CONFIG_BT_HCIBPA10X=m
> -CONFIG_BT_HCIBFUSB=m
> -CONFIG_BT_HCIVHCI=m
> -CONFIG_BT_MRVL=m
> -CONFIG_BT_MRVL_SDIO=m
> -CONFIG_BT_ATH3K=m
> -CONFIG_BT_WILINK=m
> +# CONFIG_BT_INTEL is not set
> +# CONFIG_BT_BCM is not set
> +# CONFIG_BT_RTL is not set
> +# CONFIG_BT_QCA is not set
> +# CONFIG_BT_HCIBTUSB is not set
> +# CONFIG_BT_HCIBTUSB_BCM is not set
> +# CONFIG_BT_HCIBTUSB_RTL is not set
> +# CONFIG_BT_HCIBTSDIO is not set
> +# CONFIG_BT_HCIUART is not set
> +# CONFIG_BT_HCIUART_H4 is not set
> +# CONFIG_BT_HCIUART_BCSP is not set
> +# CONFIG_BT_HCIUART_ATH3K is not set
> +# CONFIG_BT_HCIUART_INTEL is not set
> +# CONFIG_BT_HCIUART_QCA is not set
> +# CONFIG_BT_HCIUART_AG6XX is not set
> +# CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIBCM203X is not set
> +# CONFIG_BT_HCIBPA10X is not set
> +# CONFIG_BT_HCIBFUSB is not set
> +# CONFIG_BT_HCIDTL1 is not set
> +# CONFIG_BT_HCIBT3C is not set
> +# CONFIG_BT_HCIBLUECARD is not set
> +# CONFIG_BT_HCIBTUART is not set
> +# CONFIG_BT_HCIVHCI is not set
> +# CONFIG_BT_MRVL is not set
> +# CONFIG_BT_MRVL_SDIO is not set
> +# CONFIG_BT_ATH3K is not set
> +# CONFIG_BT_WILINK is not set
>  # CONFIG_AF_RXRPC is not set
>  # CONFIG_AF_KCM is not set
>  # CONFIG_STREAM_PARSER is not set
> diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi
> b/config/kernel/kernel.config.armv5tel-ipfire-multi
> index cfa766005..f065eee0c 100644
> --- a/config/kernel/kernel.config.armv5tel-ipfire-multi
> +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
> @@ -1593,47 +1593,51 @@ CONFIG_NET_FLOW_LIMIT=y
>  # CONFIG_NET_DROP_MONITOR is not set
>  # CONFIG_HAMRADIO is not set
>  # CONFIG_CAN is not set
> -CONFIG_BT=m
> -CONFIG_BT_BREDR=y
> -CONFIG_BT_RFCOMM=m
> -CONFIG_BT_RFCOMM_TTY=y
> -CONFIG_BT_BNEP=m
> -CONFIG_BT_BNEP_MC_FILTER=y
> -CONFIG_BT_BNEP_PROTO_FILTER=y
> -CONFIG_BT_HIDP=m
> -CONFIG_BT_HS=y
> -CONFIG_BT_LE=y
> -CONFIG_BT_LEDS=y
> +# CONFIG_BT is not set
> +# CONFIG_BT_BREDR is not set
> +# CONFIG_BT_RFCOMM is not set
> +# CONFIG_BT_RFCOMM_TTY is not set
> +# CONFIG_BT_BNEP is not set
> +# CONFIG_BT_BNEP_MC_FILTER is not set
> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
> +# CONFIG_BT_HIDP is not set
> +# CONFIG_BT_HS is not set
> +# CONFIG_BT_LE is not set
> +# CONFIG_BT_LEDS is not set
>  # CONFIG_BT_SELFTEST is not set
> -CONFIG_BT_DEBUGFS=y
> +# CONFIG_BT_DEBUGFS is not set
> 
>  #
>  # Bluetooth device drivers
>  #
> -CONFIG_BT_INTEL=m
> -CONFIG_BT_BCM=m
> -CONFIG_BT_RTL=m
> -CONFIG_BT_QCA=m
> -CONFIG_BT_HCIBTUSB=m
> -CONFIG_BT_HCIBTUSB_BCM=y
> -CONFIG_BT_HCIBTUSB_RTL=y
> -CONFIG_BT_HCIBTSDIO=m
> -CONFIG_BT_HCIUART=m
> -CONFIG_BT_HCIUART_H4=y
> -CONFIG_BT_HCIUART_BCSP=y
> -CONFIG_BT_HCIUART_ATH3K=y
> -CONFIG_BT_HCIUART_INTEL=y
> -CONFIG_BT_HCIUART_QCA=y
> -CONFIG_BT_HCIUART_AG6XX=y
> -CONFIG_BT_HCIUART_MRVL=y
> -CONFIG_BT_HCIBCM203X=m
> -CONFIG_BT_HCIBPA10X=m
> -CONFIG_BT_HCIBFUSB=m
> -CONFIG_BT_HCIVHCI=m
> -CONFIG_BT_MRVL=m
> -CONFIG_BT_MRVL_SDIO=m
> -CONFIG_BT_ATH3K=m
> -CONFIG_BT_WILINK=m
> +# CONFIG_BT_INTEL is not set
> +# CONFIG_BT_BCM is not set
> +# CONFIG_BT_RTL is not set
> +# CONFIG_BT_QCA is not set
> +# CONFIG_BT_HCIBTUSB is not set
> +# CONFIG_BT_HCIBTUSB_BCM is not set
> +# CONFIG_BT_HCIBTUSB_RTL is not set
> +# CONFIG_BT_HCIBTSDIO is not set
> +# CONFIG_BT_HCIUART is not set
> +# CONFIG_BT_HCIUART_H4 is not set
> +# CONFIG_BT_HCIUART_BCSP is not set
> +# CONFIG_BT_HCIUART_ATH3K is not set
> +# CONFIG_BT_HCIUART_INTEL is not set
> +# CONFIG_BT_HCIUART_QCA is not set
> +# CONFIG_BT_HCIUART_AG6XX is not set
> +# CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIBCM203X is not set
> +# CONFIG_BT_HCIBPA10X is not set
> +# CONFIG_BT_HCIBFUSB is not set
> +# CONFIG_BT_HCIDTL1 is not set
> +# CONFIG_BT_HCIBT3C is not set
> +# CONFIG_BT_HCIBLUECARD is not set
> +# CONFIG_BT_HCIBTUART is not set
> +# CONFIG_BT_HCIVHCI is not set
> +# CONFIG_BT_MRVL is not set
> +# CONFIG_BT_MRVL_SDIO is not set
> +# CONFIG_BT_ATH3K is not set
> +# CONFIG_BT_WILINK is not set
>  # CONFIG_AF_RXRPC is not set
>  # CONFIG_AF_KCM is not set
>  # CONFIG_STREAM_PARSER is not set
> diff --git a/config/kernel/kernel.config.i586-ipfire
> b/config/kernel/kernel.config.i586-ipfire
> index 4bb39fc20..fb34980f1 100644
> --- a/config/kernel/kernel.config.i586-ipfire
> +++ b/config/kernel/kernel.config.i586-ipfire
> @@ -1532,51 +1532,51 @@ CONFIG_NET_FLOW_LIMIT=y
>  # CONFIG_NET_DROP_MONITOR is not set
>  # CONFIG_HAMRADIO is not set
>  # CONFIG_CAN is not set
> -CONFIG_BT=m
> -CONFIG_BT_BREDR=y
> -CONFIG_BT_RFCOMM=m
> -CONFIG_BT_RFCOMM_TTY=y
> -CONFIG_BT_BNEP=m
> -CONFIG_BT_BNEP_MC_FILTER=y
> -CONFIG_BT_BNEP_PROTO_FILTER=y
> -CONFIG_BT_HIDP=m
> -CONFIG_BT_HS=y
> -CONFIG_BT_LE=y
> -CONFIG_BT_LEDS=y
> +# CONFIG_BT is not set
> +# CONFIG_BT_BREDR is not set
> +# CONFIG_BT_RFCOMM is not set
> +# CONFIG_BT_RFCOMM_TTY is not set
> +# CONFIG_BT_BNEP is not set
> +# CONFIG_BT_BNEP_MC_FILTER is not set
> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
> +# CONFIG_BT_HIDP is not set
> +# CONFIG_BT_HS is not set
> +# CONFIG_BT_LE is not set
> +# CONFIG_BT_LEDS is not set
>  # CONFIG_BT_SELFTEST is not set
> -CONFIG_BT_DEBUGFS=y
> +# CONFIG_BT_DEBUGFS is not set
> 
>  #
>  # Bluetooth device drivers
>  #
> -CONFIG_BT_INTEL=m
> -CONFIG_BT_BCM=m
> -CONFIG_BT_RTL=m
> -CONFIG_BT_QCA=m
> -CONFIG_BT_HCIBTUSB=m
> -CONFIG_BT_HCIBTUSB_BCM=y
> -CONFIG_BT_HCIBTUSB_RTL=y
> -CONFIG_BT_HCIBTSDIO=m
> -CONFIG_BT_HCIUART=m
> -CONFIG_BT_HCIUART_H4=y
> -CONFIG_BT_HCIUART_BCSP=y
> -CONFIG_BT_HCIUART_ATH3K=y
> -CONFIG_BT_HCIUART_INTEL=y
> -CONFIG_BT_HCIUART_QCA=y
> -CONFIG_BT_HCIUART_AG6XX=y
> -CONFIG_BT_HCIUART_MRVL=y
> -CONFIG_BT_HCIBCM203X=m
> -CONFIG_BT_HCIBPA10X=m
> -CONFIG_BT_HCIBFUSB=m
> +# CONFIG_BT_INTEL is not set
> +# CONFIG_BT_BCM is not set
> +# CONFIG_BT_RTL is not set
> +# CONFIG_BT_QCA is not set
> +# CONFIG_BT_HCIBTUSB is not set
> +# CONFIG_BT_HCIBTUSB_BCM is not set
> +# CONFIG_BT_HCIBTUSB_RTL is not set
> +# CONFIG_BT_HCIBTSDIO is not set
> +# CONFIG_BT_HCIUART is not set
> +# CONFIG_BT_HCIUART_H4 is not set
> +# CONFIG_BT_HCIUART_BCSP is not set
> +# CONFIG_BT_HCIUART_ATH3K is not set
> +# CONFIG_BT_HCIUART_INTEL is not set
> +# CONFIG_BT_HCIUART_QCA is not set
> +# CONFIG_BT_HCIUART_AG6XX is not set
> +# CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIBCM203X is not set
> +# CONFIG_BT_HCIBPA10X is not set
> +# CONFIG_BT_HCIBFUSB is not set
>  # CONFIG_BT_HCIDTL1 is not set
>  # CONFIG_BT_HCIBT3C is not set
> -CONFIG_BT_HCIBLUECARD=m
> -CONFIG_BT_HCIBTUART=m
> -CONFIG_BT_HCIVHCI=m
> -CONFIG_BT_MRVL=m
> -CONFIG_BT_MRVL_SDIO=m
> -CONFIG_BT_ATH3K=m
> -CONFIG_BT_WILINK=m
> +# CONFIG_BT_HCIBLUECARD is not set
> +# CONFIG_BT_HCIBTUART is not set
> +# CONFIG_BT_HCIVHCI is not set
> +# CONFIG_BT_MRVL is not set
> +# CONFIG_BT_MRVL_SDIO is not set
> +# CONFIG_BT_ATH3K is not set
> +# CONFIG_BT_WILINK is not set
>  # CONFIG_AF_RXRPC is not set
>  # CONFIG_AF_KCM is not set
>  # CONFIG_STREAM_PARSER is not set
> @@ -5731,7 +5731,7 @@ CONFIG_MSI_WMI=m
>  CONFIG_PEAQ_WMI=m
>  CONFIG_TOPSTAR_LAPTOP=m
>  CONFIG_ACPI_TOSHIBA=m
> -CONFIG_TOSHIBA_BT_RFKILL=m
> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>  CONFIG_TOSHIBA_HAPS=m
>  CONFIG_TOSHIBA_WMI=m
>  CONFIG_ACPI_CMPC=m
> diff --git a/config/kernel/kernel.config.i586-ipfire-pae
> b/config/kernel/kernel.config.i586-ipfire-pae
> index 318384613..7deff0b7e 100644
> --- a/config/kernel/kernel.config.i586-ipfire-pae
> +++ b/config/kernel/kernel.config.i586-ipfire-pae
> @@ -1550,51 +1550,51 @@ CONFIG_NET_FLOW_LIMIT=y
>  # CONFIG_NET_DROP_MONITOR is not set
>  # CONFIG_HAMRADIO is not set
>  # CONFIG_CAN is not set
> -CONFIG_BT=m
> -CONFIG_BT_BREDR=y
> -CONFIG_BT_RFCOMM=m
> -CONFIG_BT_RFCOMM_TTY=y
> -CONFIG_BT_BNEP=m
> -CONFIG_BT_BNEP_MC_FILTER=y
> -CONFIG_BT_BNEP_PROTO_FILTER=y
> -CONFIG_BT_HIDP=m
> -CONFIG_BT_HS=y
> -CONFIG_BT_LE=y
> -CONFIG_BT_LEDS=y
> +# CONFIG_BT is not set
> +# CONFIG_BT_BREDR is not set
> +# CONFIG_BT_RFCOMM is not set
> +# CONFIG_BT_RFCOMM_TTY is not set
> +# CONFIG_BT_BNEP is not set
> +# CONFIG_BT_BNEP_MC_FILTER is not set
> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
> +# CONFIG_BT_HIDP is not set
> +# CONFIG_BT_HS is not set
> +# CONFIG_BT_LE is not set
> +# CONFIG_BT_LEDS is not set
>  # CONFIG_BT_SELFTEST is not set
> -CONFIG_BT_DEBUGFS=y
> +# CONFIG_BT_DEBUGFS is not set
> 
>  #
>  # Bluetooth device drivers
>  #
> -CONFIG_BT_INTEL=m
> -CONFIG_BT_BCM=m
> -CONFIG_BT_RTL=m
> -CONFIG_BT_QCA=m
> -CONFIG_BT_HCIBTUSB=m
> -CONFIG_BT_HCIBTUSB_BCM=y
> -CONFIG_BT_HCIBTUSB_RTL=y
> -CONFIG_BT_HCIBTSDIO=m
> -CONFIG_BT_HCIUART=m
> -CONFIG_BT_HCIUART_H4=y
> -CONFIG_BT_HCIUART_BCSP=y
> -CONFIG_BT_HCIUART_ATH3K=y
> -CONFIG_BT_HCIUART_INTEL=y
> -CONFIG_BT_HCIUART_QCA=y
> -CONFIG_BT_HCIUART_AG6XX=y
> -CONFIG_BT_HCIUART_MRVL=y
> -CONFIG_BT_HCIBCM203X=m
> -CONFIG_BT_HCIBPA10X=m
> -CONFIG_BT_HCIBFUSB=m
> +# CONFIG_BT_INTEL is not set
> +# CONFIG_BT_BCM is not set
> +# CONFIG_BT_RTL is not set
> +# CONFIG_BT_QCA is not set
> +# CONFIG_BT_HCIBTUSB is not set
> +# CONFIG_BT_HCIBTUSB_BCM is not set
> +# CONFIG_BT_HCIBTUSB_RTL is not set
> +# CONFIG_BT_HCIBTSDIO is not set
> +# CONFIG_BT_HCIUART is not set
> +# CONFIG_BT_HCIUART_H4 is not set
> +# CONFIG_BT_HCIUART_BCSP is not set
> +# CONFIG_BT_HCIUART_ATH3K is not set
> +# CONFIG_BT_HCIUART_INTEL is not set
> +# CONFIG_BT_HCIUART_QCA is not set
> +# CONFIG_BT_HCIUART_AG6XX is not set
> +# CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIBCM203X is not set
> +# CONFIG_BT_HCIBPA10X is not set
> +# CONFIG_BT_HCIBFUSB is not set
>  # CONFIG_BT_HCIDTL1 is not set
>  # CONFIG_BT_HCIBT3C is not set
> -CONFIG_BT_HCIBLUECARD=m
> -CONFIG_BT_HCIBTUART=m
> -CONFIG_BT_HCIVHCI=m
> -CONFIG_BT_MRVL=m
> -CONFIG_BT_MRVL_SDIO=m
> -CONFIG_BT_ATH3K=m
> -CONFIG_BT_WILINK=m
> +# CONFIG_BT_HCIBLUECARD is not set
> +# CONFIG_BT_HCIBTUART is not set
> +# CONFIG_BT_HCIVHCI is not set
> +# CONFIG_BT_MRVL is not set
> +# CONFIG_BT_MRVL_SDIO is not set
> +# CONFIG_BT_ATH3K is not set
> +# CONFIG_BT_WILINK is not set
>  # CONFIG_AF_RXRPC is not set
>  # CONFIG_AF_KCM is not set
>  # CONFIG_STREAM_PARSER is not set
> @@ -5738,7 +5738,7 @@ CONFIG_MSI_WMI=m
>  CONFIG_PEAQ_WMI=m
>  CONFIG_TOPSTAR_LAPTOP=m
>  CONFIG_ACPI_TOSHIBA=m
> -CONFIG_TOSHIBA_BT_RFKILL=m
> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>  CONFIG_TOSHIBA_HAPS=m
>  CONFIG_TOSHIBA_WMI=m
>  CONFIG_ACPI_CMPC=m
> diff --git a/config/kernel/kernel.config.x86_64-ipfire
> b/config/kernel/kernel.config.x86_64-ipfire
> index b16d13504..f7bfbe715 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -1525,51 +1525,51 @@ CONFIG_NET_FLOW_LIMIT=y
>  # CONFIG_NET_DROP_MONITOR is not set
>  # CONFIG_HAMRADIO is not set
>  # CONFIG_CAN is not set
> -CONFIG_BT=m
> -CONFIG_BT_BREDR=y
> -CONFIG_BT_RFCOMM=m
> -CONFIG_BT_RFCOMM_TTY=y
> -CONFIG_BT_BNEP=m
> -CONFIG_BT_BNEP_MC_FILTER=y
> -CONFIG_BT_BNEP_PROTO_FILTER=y
> -CONFIG_BT_HIDP=m
> -CONFIG_BT_HS=y
> -CONFIG_BT_LE=y
> -CONFIG_BT_LEDS=y
> +# CONFIG_BT is not set
> +# CONFIG_BT_BREDR is not set
> +# CONFIG_BT_RFCOMM is not set
> +# CONFIG_BT_RFCOMM_TTY is not set
> +# CONFIG_BT_BNEP is not set
> +# CONFIG_BT_BNEP_MC_FILTER is not set
> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
> +# CONFIG_BT_HIDP is not set
> +# CONFIG_BT_HS is not set
> +# CONFIG_BT_LE is not set
> +# CONFIG_BT_LEDS is not set
>  # CONFIG_BT_SELFTEST is not set
> -CONFIG_BT_DEBUGFS=y
> +# CONFIG_BT_DEBUGFS is not set
> 
>  #
>  # Bluetooth device drivers
>  #
> -CONFIG_BT_INTEL=m
> -CONFIG_BT_BCM=m
> -CONFIG_BT_RTL=m
> -CONFIG_BT_QCA=m
> -CONFIG_BT_HCIBTUSB=m
> -CONFIG_BT_HCIBTUSB_BCM=y
> -CONFIG_BT_HCIBTUSB_RTL=y
> -CONFIG_BT_HCIBTSDIO=m
> -CONFIG_BT_HCIUART=m
> -CONFIG_BT_HCIUART_H4=y
> -CONFIG_BT_HCIUART_BCSP=y
> -CONFIG_BT_HCIUART_ATH3K=y
> -CONFIG_BT_HCIUART_INTEL=y
> -CONFIG_BT_HCIUART_QCA=y
> -CONFIG_BT_HCIUART_AG6XX=y
> -CONFIG_BT_HCIUART_MRVL=y
> -CONFIG_BT_HCIBCM203X=m
> -CONFIG_BT_HCIBPA10X=m
> -CONFIG_BT_HCIBFUSB=m
> -CONFIG_BT_HCIDTL1=m
> -CONFIG_BT_HCIBT3C=m
> -CONFIG_BT_HCIBLUECARD=m
> -CONFIG_BT_HCIBTUART=m
> -CONFIG_BT_HCIVHCI=m
> -CONFIG_BT_MRVL=m
> -CONFIG_BT_MRVL_SDIO=m
> -CONFIG_BT_ATH3K=m
> -CONFIG_BT_WILINK=m
> +# CONFIG_BT_INTEL is not set
> +# CONFIG_BT_BCM is not set
> +# CONFIG_BT_RTL is not set
> +# CONFIG_BT_QCA is not set
> +# CONFIG_BT_HCIBTUSB is not set
> +# CONFIG_BT_HCIBTUSB_BCM is not set
> +# CONFIG_BT_HCIBTUSB_RTL is not set
> +# CONFIG_BT_HCIBTSDIO is not set
> +# CONFIG_BT_HCIUART is not set
> +# CONFIG_BT_HCIUART_H4 is not set
> +# CONFIG_BT_HCIUART_BCSP is not set
> +# CONFIG_BT_HCIUART_ATH3K is not set
> +# CONFIG_BT_HCIUART_INTEL is not set
> +# CONFIG_BT_HCIUART_QCA is not set
> +# CONFIG_BT_HCIUART_AG6XX is not set
> +# CONFIG_BT_HCIUART_MRVL is not set
> +# CONFIG_BT_HCIBCM203X is not set
> +# CONFIG_BT_HCIBPA10X is not set
> +# CONFIG_BT_HCIBFUSB is not set
> +# CONFIG_BT_HCIDTL1 is not set
> +# CONFIG_BT_HCIBT3C is not set
> +# CONFIG_BT_HCIBLUECARD is not set
> +# CONFIG_BT_HCIBTUART is not set
> +# CONFIG_BT_HCIVHCI is not set
> +# CONFIG_BT_MRVL is not set
> +# CONFIG_BT_MRVL_SDIO is not set
> +# CONFIG_BT_ATH3K is not set
> +# CONFIG_BT_WILINK is not set
>  # CONFIG_AF_RXRPC is not set
>  # CONFIG_AF_KCM is not set
>  # CONFIG_STREAM_PARSER is not set
> @@ -5595,7 +5595,7 @@ CONFIG_MSI_WMI=m
>  # CONFIG_PEAQ_WMI is not set
>  CONFIG_TOPSTAR_LAPTOP=m
>  CONFIG_ACPI_TOSHIBA=m
> -CONFIG_TOSHIBA_BT_RFKILL=m
> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>  # CONFIG_TOSHIBA_HAPS is not set
>  # CONFIG_TOSHIBA_WMI is not set
>  CONFIG_ACPI_CMPC=m

Peter Müller April 1, 2020, 11:25 a.m. UTC | #2

Hello Arne,

thanks for your reply.

You are right, it did not became clear to me how to update the configuration
files (cd into the kernel source directory only changes it for x86_64) for
all architectures.

If this is documented somewhere, I have missed it.

Thanks, and best regards,
Peter Müller

> Looks like you have edited the config manually and not by make *config
> because if you disble BT by
> # CONFIG_BT is not set
> all other CONFIG_BT_* options should vanish from the config.
> 
> Arne
> 
> 
> Am 2020-03-31 18:42, schrieb Peter Müller:
>> The bluetooth addon was recently removed by commit
>> 592be1d206e45ad42736b352d96e42ebca50123a, which is why we do not need to
>> carry the corresponding kernel modules around anymore.
>>
>> Cc: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
>> Cc: Michael Tremer <michael.tremer@ipfire.org>
>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>> ---
>>  config/kernel/kernel.config.aarch64-ipfire        | 76 +++++++++++----------
>>  config/kernel/kernel.config.armv5tel-ipfire-multi | 76 +++++++++++----------
>>  config/kernel/kernel.config.i586-ipfire           | 78 ++++++++++-----------
>>  config/kernel/kernel.config.i586-ipfire-pae       | 78 ++++++++++-----------
>>  config/kernel/kernel.config.x86_64-ipfire         | 82 +++++++++++------------
>>  5 files changed, 199 insertions(+), 191 deletions(-)
>>
>> diff --git a/config/kernel/kernel.config.aarch64-ipfire
>> b/config/kernel/kernel.config.aarch64-ipfire
>> index 32ad2df07..4c4b74651 100644
>> --- a/config/kernel/kernel.config.aarch64-ipfire
>> +++ b/config/kernel/kernel.config.aarch64-ipfire
>> @@ -1336,47 +1336,51 @@ CONFIG_NET_FLOW_LIMIT=y
>>  # CONFIG_NET_DROP_MONITOR is not set
>>  # CONFIG_HAMRADIO is not set
>>  # CONFIG_CAN is not set
>> -CONFIG_BT=m
>> -CONFIG_BT_BREDR=y
>> -CONFIG_BT_RFCOMM=m
>> -CONFIG_BT_RFCOMM_TTY=y
>> -CONFIG_BT_BNEP=m
>> -CONFIG_BT_BNEP_MC_FILTER=y
>> -CONFIG_BT_BNEP_PROTO_FILTER=y
>> -CONFIG_BT_HIDP=m
>> -CONFIG_BT_HS=y
>> -CONFIG_BT_LE=y
>> -CONFIG_BT_LEDS=y
>> +# CONFIG_BT is not set
>> +# CONFIG_BT_BREDR is not set
>> +# CONFIG_BT_RFCOMM is not set
>> +# CONFIG_BT_RFCOMM_TTY is not set
>> +# CONFIG_BT_BNEP is not set
>> +# CONFIG_BT_BNEP_MC_FILTER is not set
>> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
>> +# CONFIG_BT_HIDP is not set
>> +# CONFIG_BT_HS is not set
>> +# CONFIG_BT_LE is not set
>> +# CONFIG_BT_LEDS is not set
>>  # CONFIG_BT_SELFTEST is not set
>> -CONFIG_BT_DEBUGFS=y
>> +# CONFIG_BT_DEBUGFS is not set
>>
>>  #
>>  # Bluetooth device drivers
>>  #
>> -CONFIG_BT_INTEL=m
>> -CONFIG_BT_BCM=m
>> -CONFIG_BT_RTL=m
>> -CONFIG_BT_QCA=m
>> -CONFIG_BT_HCIBTUSB=m
>> -CONFIG_BT_HCIBTUSB_BCM=y
>> -CONFIG_BT_HCIBTUSB_RTL=y
>> -CONFIG_BT_HCIBTSDIO=m
>> -CONFIG_BT_HCIUART=m
>> -CONFIG_BT_HCIUART_H4=y
>> -CONFIG_BT_HCIUART_BCSP=y
>> -CONFIG_BT_HCIUART_ATH3K=y
>> -CONFIG_BT_HCIUART_INTEL=y
>> -CONFIG_BT_HCIUART_QCA=y
>> -CONFIG_BT_HCIUART_AG6XX=y
>> -CONFIG_BT_HCIUART_MRVL=y
>> -CONFIG_BT_HCIBCM203X=m
>> -CONFIG_BT_HCIBPA10X=m
>> -CONFIG_BT_HCIBFUSB=m
>> -CONFIG_BT_HCIVHCI=m
>> -CONFIG_BT_MRVL=m
>> -CONFIG_BT_MRVL_SDIO=m
>> -CONFIG_BT_ATH3K=m
>> -CONFIG_BT_WILINK=m
>> +# CONFIG_BT_INTEL is not set
>> +# CONFIG_BT_BCM is not set
>> +# CONFIG_BT_RTL is not set
>> +# CONFIG_BT_QCA is not set
>> +# CONFIG_BT_HCIBTUSB is not set
>> +# CONFIG_BT_HCIBTUSB_BCM is not set
>> +# CONFIG_BT_HCIBTUSB_RTL is not set
>> +# CONFIG_BT_HCIBTSDIO is not set
>> +# CONFIG_BT_HCIUART is not set
>> +# CONFIG_BT_HCIUART_H4 is not set
>> +# CONFIG_BT_HCIUART_BCSP is not set
>> +# CONFIG_BT_HCIUART_ATH3K is not set
>> +# CONFIG_BT_HCIUART_INTEL is not set
>> +# CONFIG_BT_HCIUART_QCA is not set
>> +# CONFIG_BT_HCIUART_AG6XX is not set
>> +# CONFIG_BT_HCIUART_MRVL is not set
>> +# CONFIG_BT_HCIBCM203X is not set
>> +# CONFIG_BT_HCIBPA10X is not set
>> +# CONFIG_BT_HCIBFUSB is not set
>> +# CONFIG_BT_HCIDTL1 is not set
>> +# CONFIG_BT_HCIBT3C is not set
>> +# CONFIG_BT_HCIBLUECARD is not set
>> +# CONFIG_BT_HCIBTUART is not set
>> +# CONFIG_BT_HCIVHCI is not set
>> +# CONFIG_BT_MRVL is not set
>> +# CONFIG_BT_MRVL_SDIO is not set
>> +# CONFIG_BT_ATH3K is not set
>> +# CONFIG_BT_WILINK is not set
>>  # CONFIG_AF_RXRPC is not set
>>  # CONFIG_AF_KCM is not set
>>  # CONFIG_STREAM_PARSER is not set
>> diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi
>> b/config/kernel/kernel.config.armv5tel-ipfire-multi
>> index cfa766005..f065eee0c 100644
>> --- a/config/kernel/kernel.config.armv5tel-ipfire-multi
>> +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
>> @@ -1593,47 +1593,51 @@ CONFIG_NET_FLOW_LIMIT=y
>>  # CONFIG_NET_DROP_MONITOR is not set
>>  # CONFIG_HAMRADIO is not set
>>  # CONFIG_CAN is not set
>> -CONFIG_BT=m
>> -CONFIG_BT_BREDR=y
>> -CONFIG_BT_RFCOMM=m
>> -CONFIG_BT_RFCOMM_TTY=y
>> -CONFIG_BT_BNEP=m
>> -CONFIG_BT_BNEP_MC_FILTER=y
>> -CONFIG_BT_BNEP_PROTO_FILTER=y
>> -CONFIG_BT_HIDP=m
>> -CONFIG_BT_HS=y
>> -CONFIG_BT_LE=y
>> -CONFIG_BT_LEDS=y
>> +# CONFIG_BT is not set
>> +# CONFIG_BT_BREDR is not set
>> +# CONFIG_BT_RFCOMM is not set
>> +# CONFIG_BT_RFCOMM_TTY is not set
>> +# CONFIG_BT_BNEP is not set
>> +# CONFIG_BT_BNEP_MC_FILTER is not set
>> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
>> +# CONFIG_BT_HIDP is not set
>> +# CONFIG_BT_HS is not set
>> +# CONFIG_BT_LE is not set
>> +# CONFIG_BT_LEDS is not set
>>  # CONFIG_BT_SELFTEST is not set
>> -CONFIG_BT_DEBUGFS=y
>> +# CONFIG_BT_DEBUGFS is not set
>>
>>  #
>>  # Bluetooth device drivers
>>  #
>> -CONFIG_BT_INTEL=m
>> -CONFIG_BT_BCM=m
>> -CONFIG_BT_RTL=m
>> -CONFIG_BT_QCA=m
>> -CONFIG_BT_HCIBTUSB=m
>> -CONFIG_BT_HCIBTUSB_BCM=y
>> -CONFIG_BT_HCIBTUSB_RTL=y
>> -CONFIG_BT_HCIBTSDIO=m
>> -CONFIG_BT_HCIUART=m
>> -CONFIG_BT_HCIUART_H4=y
>> -CONFIG_BT_HCIUART_BCSP=y
>> -CONFIG_BT_HCIUART_ATH3K=y
>> -CONFIG_BT_HCIUART_INTEL=y
>> -CONFIG_BT_HCIUART_QCA=y
>> -CONFIG_BT_HCIUART_AG6XX=y
>> -CONFIG_BT_HCIUART_MRVL=y
>> -CONFIG_BT_HCIBCM203X=m
>> -CONFIG_BT_HCIBPA10X=m
>> -CONFIG_BT_HCIBFUSB=m
>> -CONFIG_BT_HCIVHCI=m
>> -CONFIG_BT_MRVL=m
>> -CONFIG_BT_MRVL_SDIO=m
>> -CONFIG_BT_ATH3K=m
>> -CONFIG_BT_WILINK=m
>> +# CONFIG_BT_INTEL is not set
>> +# CONFIG_BT_BCM is not set
>> +# CONFIG_BT_RTL is not set
>> +# CONFIG_BT_QCA is not set
>> +# CONFIG_BT_HCIBTUSB is not set
>> +# CONFIG_BT_HCIBTUSB_BCM is not set
>> +# CONFIG_BT_HCIBTUSB_RTL is not set
>> +# CONFIG_BT_HCIBTSDIO is not set
>> +# CONFIG_BT_HCIUART is not set
>> +# CONFIG_BT_HCIUART_H4 is not set
>> +# CONFIG_BT_HCIUART_BCSP is not set
>> +# CONFIG_BT_HCIUART_ATH3K is not set
>> +# CONFIG_BT_HCIUART_INTEL is not set
>> +# CONFIG_BT_HCIUART_QCA is not set
>> +# CONFIG_BT_HCIUART_AG6XX is not set
>> +# CONFIG_BT_HCIUART_MRVL is not set
>> +# CONFIG_BT_HCIBCM203X is not set
>> +# CONFIG_BT_HCIBPA10X is not set
>> +# CONFIG_BT_HCIBFUSB is not set
>> +# CONFIG_BT_HCIDTL1 is not set
>> +# CONFIG_BT_HCIBT3C is not set
>> +# CONFIG_BT_HCIBLUECARD is not set
>> +# CONFIG_BT_HCIBTUART is not set
>> +# CONFIG_BT_HCIVHCI is not set
>> +# CONFIG_BT_MRVL is not set
>> +# CONFIG_BT_MRVL_SDIO is not set
>> +# CONFIG_BT_ATH3K is not set
>> +# CONFIG_BT_WILINK is not set
>>  # CONFIG_AF_RXRPC is not set
>>  # CONFIG_AF_KCM is not set
>>  # CONFIG_STREAM_PARSER is not set
>> diff --git a/config/kernel/kernel.config.i586-ipfire
>> b/config/kernel/kernel.config.i586-ipfire
>> index 4bb39fc20..fb34980f1 100644
>> --- a/config/kernel/kernel.config.i586-ipfire
>> +++ b/config/kernel/kernel.config.i586-ipfire
>> @@ -1532,51 +1532,51 @@ CONFIG_NET_FLOW_LIMIT=y
>>  # CONFIG_NET_DROP_MONITOR is not set
>>  # CONFIG_HAMRADIO is not set
>>  # CONFIG_CAN is not set
>> -CONFIG_BT=m
>> -CONFIG_BT_BREDR=y
>> -CONFIG_BT_RFCOMM=m
>> -CONFIG_BT_RFCOMM_TTY=y
>> -CONFIG_BT_BNEP=m
>> -CONFIG_BT_BNEP_MC_FILTER=y
>> -CONFIG_BT_BNEP_PROTO_FILTER=y
>> -CONFIG_BT_HIDP=m
>> -CONFIG_BT_HS=y
>> -CONFIG_BT_LE=y
>> -CONFIG_BT_LEDS=y
>> +# CONFIG_BT is not set
>> +# CONFIG_BT_BREDR is not set
>> +# CONFIG_BT_RFCOMM is not set
>> +# CONFIG_BT_RFCOMM_TTY is not set
>> +# CONFIG_BT_BNEP is not set
>> +# CONFIG_BT_BNEP_MC_FILTER is not set
>> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
>> +# CONFIG_BT_HIDP is not set
>> +# CONFIG_BT_HS is not set
>> +# CONFIG_BT_LE is not set
>> +# CONFIG_BT_LEDS is not set
>>  # CONFIG_BT_SELFTEST is not set
>> -CONFIG_BT_DEBUGFS=y
>> +# CONFIG_BT_DEBUGFS is not set
>>
>>  #
>>  # Bluetooth device drivers
>>  #
>> -CONFIG_BT_INTEL=m
>> -CONFIG_BT_BCM=m
>> -CONFIG_BT_RTL=m
>> -CONFIG_BT_QCA=m
>> -CONFIG_BT_HCIBTUSB=m
>> -CONFIG_BT_HCIBTUSB_BCM=y
>> -CONFIG_BT_HCIBTUSB_RTL=y
>> -CONFIG_BT_HCIBTSDIO=m
>> -CONFIG_BT_HCIUART=m
>> -CONFIG_BT_HCIUART_H4=y
>> -CONFIG_BT_HCIUART_BCSP=y
>> -CONFIG_BT_HCIUART_ATH3K=y
>> -CONFIG_BT_HCIUART_INTEL=y
>> -CONFIG_BT_HCIUART_QCA=y
>> -CONFIG_BT_HCIUART_AG6XX=y
>> -CONFIG_BT_HCIUART_MRVL=y
>> -CONFIG_BT_HCIBCM203X=m
>> -CONFIG_BT_HCIBPA10X=m
>> -CONFIG_BT_HCIBFUSB=m
>> +# CONFIG_BT_INTEL is not set
>> +# CONFIG_BT_BCM is not set
>> +# CONFIG_BT_RTL is not set
>> +# CONFIG_BT_QCA is not set
>> +# CONFIG_BT_HCIBTUSB is not set
>> +# CONFIG_BT_HCIBTUSB_BCM is not set
>> +# CONFIG_BT_HCIBTUSB_RTL is not set
>> +# CONFIG_BT_HCIBTSDIO is not set
>> +# CONFIG_BT_HCIUART is not set
>> +# CONFIG_BT_HCIUART_H4 is not set
>> +# CONFIG_BT_HCIUART_BCSP is not set
>> +# CONFIG_BT_HCIUART_ATH3K is not set
>> +# CONFIG_BT_HCIUART_INTEL is not set
>> +# CONFIG_BT_HCIUART_QCA is not set
>> +# CONFIG_BT_HCIUART_AG6XX is not set
>> +# CONFIG_BT_HCIUART_MRVL is not set
>> +# CONFIG_BT_HCIBCM203X is not set
>> +# CONFIG_BT_HCIBPA10X is not set
>> +# CONFIG_BT_HCIBFUSB is not set
>>  # CONFIG_BT_HCIDTL1 is not set
>>  # CONFIG_BT_HCIBT3C is not set
>> -CONFIG_BT_HCIBLUECARD=m
>> -CONFIG_BT_HCIBTUART=m
>> -CONFIG_BT_HCIVHCI=m
>> -CONFIG_BT_MRVL=m
>> -CONFIG_BT_MRVL_SDIO=m
>> -CONFIG_BT_ATH3K=m
>> -CONFIG_BT_WILINK=m
>> +# CONFIG_BT_HCIBLUECARD is not set
>> +# CONFIG_BT_HCIBTUART is not set
>> +# CONFIG_BT_HCIVHCI is not set
>> +# CONFIG_BT_MRVL is not set
>> +# CONFIG_BT_MRVL_SDIO is not set
>> +# CONFIG_BT_ATH3K is not set
>> +# CONFIG_BT_WILINK is not set
>>  # CONFIG_AF_RXRPC is not set
>>  # CONFIG_AF_KCM is not set
>>  # CONFIG_STREAM_PARSER is not set
>> @@ -5731,7 +5731,7 @@ CONFIG_MSI_WMI=m
>>  CONFIG_PEAQ_WMI=m
>>  CONFIG_TOPSTAR_LAPTOP=m
>>  CONFIG_ACPI_TOSHIBA=m
>> -CONFIG_TOSHIBA_BT_RFKILL=m
>> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>>  CONFIG_TOSHIBA_HAPS=m
>>  CONFIG_TOSHIBA_WMI=m
>>  CONFIG_ACPI_CMPC=m
>> diff --git a/config/kernel/kernel.config.i586-ipfire-pae
>> b/config/kernel/kernel.config.i586-ipfire-pae
>> index 318384613..7deff0b7e 100644
>> --- a/config/kernel/kernel.config.i586-ipfire-pae
>> +++ b/config/kernel/kernel.config.i586-ipfire-pae
>> @@ -1550,51 +1550,51 @@ CONFIG_NET_FLOW_LIMIT=y
>>  # CONFIG_NET_DROP_MONITOR is not set
>>  # CONFIG_HAMRADIO is not set
>>  # CONFIG_CAN is not set
>> -CONFIG_BT=m
>> -CONFIG_BT_BREDR=y
>> -CONFIG_BT_RFCOMM=m
>> -CONFIG_BT_RFCOMM_TTY=y
>> -CONFIG_BT_BNEP=m
>> -CONFIG_BT_BNEP_MC_FILTER=y
>> -CONFIG_BT_BNEP_PROTO_FILTER=y
>> -CONFIG_BT_HIDP=m
>> -CONFIG_BT_HS=y
>> -CONFIG_BT_LE=y
>> -CONFIG_BT_LEDS=y
>> +# CONFIG_BT is not set
>> +# CONFIG_BT_BREDR is not set
>> +# CONFIG_BT_RFCOMM is not set
>> +# CONFIG_BT_RFCOMM_TTY is not set
>> +# CONFIG_BT_BNEP is not set
>> +# CONFIG_BT_BNEP_MC_FILTER is not set
>> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
>> +# CONFIG_BT_HIDP is not set
>> +# CONFIG_BT_HS is not set
>> +# CONFIG_BT_LE is not set
>> +# CONFIG_BT_LEDS is not set
>>  # CONFIG_BT_SELFTEST is not set
>> -CONFIG_BT_DEBUGFS=y
>> +# CONFIG_BT_DEBUGFS is not set
>>
>>  #
>>  # Bluetooth device drivers
>>  #
>> -CONFIG_BT_INTEL=m
>> -CONFIG_BT_BCM=m
>> -CONFIG_BT_RTL=m
>> -CONFIG_BT_QCA=m
>> -CONFIG_BT_HCIBTUSB=m
>> -CONFIG_BT_HCIBTUSB_BCM=y
>> -CONFIG_BT_HCIBTUSB_RTL=y
>> -CONFIG_BT_HCIBTSDIO=m
>> -CONFIG_BT_HCIUART=m
>> -CONFIG_BT_HCIUART_H4=y
>> -CONFIG_BT_HCIUART_BCSP=y
>> -CONFIG_BT_HCIUART_ATH3K=y
>> -CONFIG_BT_HCIUART_INTEL=y
>> -CONFIG_BT_HCIUART_QCA=y
>> -CONFIG_BT_HCIUART_AG6XX=y
>> -CONFIG_BT_HCIUART_MRVL=y
>> -CONFIG_BT_HCIBCM203X=m
>> -CONFIG_BT_HCIBPA10X=m
>> -CONFIG_BT_HCIBFUSB=m
>> +# CONFIG_BT_INTEL is not set
>> +# CONFIG_BT_BCM is not set
>> +# CONFIG_BT_RTL is not set
>> +# CONFIG_BT_QCA is not set
>> +# CONFIG_BT_HCIBTUSB is not set
>> +# CONFIG_BT_HCIBTUSB_BCM is not set
>> +# CONFIG_BT_HCIBTUSB_RTL is not set
>> +# CONFIG_BT_HCIBTSDIO is not set
>> +# CONFIG_BT_HCIUART is not set
>> +# CONFIG_BT_HCIUART_H4 is not set
>> +# CONFIG_BT_HCIUART_BCSP is not set
>> +# CONFIG_BT_HCIUART_ATH3K is not set
>> +# CONFIG_BT_HCIUART_INTEL is not set
>> +# CONFIG_BT_HCIUART_QCA is not set
>> +# CONFIG_BT_HCIUART_AG6XX is not set
>> +# CONFIG_BT_HCIUART_MRVL is not set
>> +# CONFIG_BT_HCIBCM203X is not set
>> +# CONFIG_BT_HCIBPA10X is not set
>> +# CONFIG_BT_HCIBFUSB is not set
>>  # CONFIG_BT_HCIDTL1 is not set
>>  # CONFIG_BT_HCIBT3C is not set
>> -CONFIG_BT_HCIBLUECARD=m
>> -CONFIG_BT_HCIBTUART=m
>> -CONFIG_BT_HCIVHCI=m
>> -CONFIG_BT_MRVL=m
>> -CONFIG_BT_MRVL_SDIO=m
>> -CONFIG_BT_ATH3K=m
>> -CONFIG_BT_WILINK=m
>> +# CONFIG_BT_HCIBLUECARD is not set
>> +# CONFIG_BT_HCIBTUART is not set
>> +# CONFIG_BT_HCIVHCI is not set
>> +# CONFIG_BT_MRVL is not set
>> +# CONFIG_BT_MRVL_SDIO is not set
>> +# CONFIG_BT_ATH3K is not set
>> +# CONFIG_BT_WILINK is not set
>>  # CONFIG_AF_RXRPC is not set
>>  # CONFIG_AF_KCM is not set
>>  # CONFIG_STREAM_PARSER is not set
>> @@ -5738,7 +5738,7 @@ CONFIG_MSI_WMI=m
>>  CONFIG_PEAQ_WMI=m
>>  CONFIG_TOPSTAR_LAPTOP=m
>>  CONFIG_ACPI_TOSHIBA=m
>> -CONFIG_TOSHIBA_BT_RFKILL=m
>> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>>  CONFIG_TOSHIBA_HAPS=m
>>  CONFIG_TOSHIBA_WMI=m
>>  CONFIG_ACPI_CMPC=m
>> diff --git a/config/kernel/kernel.config.x86_64-ipfire
>> b/config/kernel/kernel.config.x86_64-ipfire
>> index b16d13504..f7bfbe715 100644
>> --- a/config/kernel/kernel.config.x86_64-ipfire
>> +++ b/config/kernel/kernel.config.x86_64-ipfire
>> @@ -1525,51 +1525,51 @@ CONFIG_NET_FLOW_LIMIT=y
>>  # CONFIG_NET_DROP_MONITOR is not set
>>  # CONFIG_HAMRADIO is not set
>>  # CONFIG_CAN is not set
>> -CONFIG_BT=m
>> -CONFIG_BT_BREDR=y
>> -CONFIG_BT_RFCOMM=m
>> -CONFIG_BT_RFCOMM_TTY=y
>> -CONFIG_BT_BNEP=m
>> -CONFIG_BT_BNEP_MC_FILTER=y
>> -CONFIG_BT_BNEP_PROTO_FILTER=y
>> -CONFIG_BT_HIDP=m
>> -CONFIG_BT_HS=y
>> -CONFIG_BT_LE=y
>> -CONFIG_BT_LEDS=y
>> +# CONFIG_BT is not set
>> +# CONFIG_BT_BREDR is not set
>> +# CONFIG_BT_RFCOMM is not set
>> +# CONFIG_BT_RFCOMM_TTY is not set
>> +# CONFIG_BT_BNEP is not set
>> +# CONFIG_BT_BNEP_MC_FILTER is not set
>> +# CONFIG_BT_BNEP_PROTO_FILTER is not set
>> +# CONFIG_BT_HIDP is not set
>> +# CONFIG_BT_HS is not set
>> +# CONFIG_BT_LE is not set
>> +# CONFIG_BT_LEDS is not set
>>  # CONFIG_BT_SELFTEST is not set
>> -CONFIG_BT_DEBUGFS=y
>> +# CONFIG_BT_DEBUGFS is not set
>>
>>  #
>>  # Bluetooth device drivers
>>  #
>> -CONFIG_BT_INTEL=m
>> -CONFIG_BT_BCM=m
>> -CONFIG_BT_RTL=m
>> -CONFIG_BT_QCA=m
>> -CONFIG_BT_HCIBTUSB=m
>> -CONFIG_BT_HCIBTUSB_BCM=y
>> -CONFIG_BT_HCIBTUSB_RTL=y
>> -CONFIG_BT_HCIBTSDIO=m
>> -CONFIG_BT_HCIUART=m
>> -CONFIG_BT_HCIUART_H4=y
>> -CONFIG_BT_HCIUART_BCSP=y
>> -CONFIG_BT_HCIUART_ATH3K=y
>> -CONFIG_BT_HCIUART_INTEL=y
>> -CONFIG_BT_HCIUART_QCA=y
>> -CONFIG_BT_HCIUART_AG6XX=y
>> -CONFIG_BT_HCIUART_MRVL=y
>> -CONFIG_BT_HCIBCM203X=m
>> -CONFIG_BT_HCIBPA10X=m
>> -CONFIG_BT_HCIBFUSB=m
>> -CONFIG_BT_HCIDTL1=m
>> -CONFIG_BT_HCIBT3C=m
>> -CONFIG_BT_HCIBLUECARD=m
>> -CONFIG_BT_HCIBTUART=m
>> -CONFIG_BT_HCIVHCI=m
>> -CONFIG_BT_MRVL=m
>> -CONFIG_BT_MRVL_SDIO=m
>> -CONFIG_BT_ATH3K=m
>> -CONFIG_BT_WILINK=m
>> +# CONFIG_BT_INTEL is not set
>> +# CONFIG_BT_BCM is not set
>> +# CONFIG_BT_RTL is not set
>> +# CONFIG_BT_QCA is not set
>> +# CONFIG_BT_HCIBTUSB is not set
>> +# CONFIG_BT_HCIBTUSB_BCM is not set
>> +# CONFIG_BT_HCIBTUSB_RTL is not set
>> +# CONFIG_BT_HCIBTSDIO is not set
>> +# CONFIG_BT_HCIUART is not set
>> +# CONFIG_BT_HCIUART_H4 is not set
>> +# CONFIG_BT_HCIUART_BCSP is not set
>> +# CONFIG_BT_HCIUART_ATH3K is not set
>> +# CONFIG_BT_HCIUART_INTEL is not set
>> +# CONFIG_BT_HCIUART_QCA is not set
>> +# CONFIG_BT_HCIUART_AG6XX is not set
>> +# CONFIG_BT_HCIUART_MRVL is not set
>> +# CONFIG_BT_HCIBCM203X is not set
>> +# CONFIG_BT_HCIBPA10X is not set
>> +# CONFIG_BT_HCIBFUSB is not set
>> +# CONFIG_BT_HCIDTL1 is not set
>> +# CONFIG_BT_HCIBT3C is not set
>> +# CONFIG_BT_HCIBLUECARD is not set
>> +# CONFIG_BT_HCIBTUART is not set
>> +# CONFIG_BT_HCIVHCI is not set
>> +# CONFIG_BT_MRVL is not set
>> +# CONFIG_BT_MRVL_SDIO is not set
>> +# CONFIG_BT_ATH3K is not set
>> +# CONFIG_BT_WILINK is not set
>>  # CONFIG_AF_RXRPC is not set
>>  # CONFIG_AF_KCM is not set
>>  # CONFIG_STREAM_PARSER is not set
>> @@ -5595,7 +5595,7 @@ CONFIG_MSI_WMI=m
>>  # CONFIG_PEAQ_WMI is not set
>>  CONFIG_TOPSTAR_LAPTOP=m
>>  CONFIG_ACPI_TOSHIBA=m
>> -CONFIG_TOSHIBA_BT_RFKILL=m
>> +# CONFIG_TOSHIBA_BT_RFKILL is not set
>>  # CONFIG_TOSHIBA_HAPS is not set
>>  # CONFIG_TOSHIBA_WMI is not set
>>  CONFIG_ACPI_CMPC=m

diff mbox series

Patch

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 32ad2df07..4c4b74651 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1336,47 +1336,51 @@  CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
+# CONFIG_BT is not set
+# CONFIG_BT_BREDR is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_RFCOMM_TTY is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_DEBUGFS is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+# CONFIG_BT_INTEL is not set
+# CONFIG_BT_BCM is not set
+# CONFIG_BT_RTL is not set
+# CONFIG_BT_QCA is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MRVL_SDIO is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_STREAM_PARSER is not set
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index cfa766005..f065eee0c 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1593,47 +1593,51 @@  CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
+# CONFIG_BT is not set
+# CONFIG_BT_BREDR is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_RFCOMM_TTY is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_DEBUGFS is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+# CONFIG_BT_INTEL is not set
+# CONFIG_BT_BCM is not set
+# CONFIG_BT_RTL is not set
+# CONFIG_BT_QCA is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MRVL_SDIO is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_STREAM_PARSER is not set
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 4bb39fc20..fb34980f1 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1532,51 +1532,51 @@  CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
+# CONFIG_BT is not set
+# CONFIG_BT_BREDR is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_RFCOMM_TTY is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_DEBUGFS is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_INTEL is not set
+# CONFIG_BT_BCM is not set
+# CONFIG_BT_RTL is not set
+# CONFIG_BT_QCA is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIDTL1 is not set
 # CONFIG_BT_HCIBT3C is not set
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MRVL_SDIO is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_STREAM_PARSER is not set
@@ -5731,7 +5731,7 @@  CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
+# CONFIG_TOSHIBA_BT_RFKILL is not set
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 318384613..7deff0b7e 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1550,51 +1550,51 @@  CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
+# CONFIG_BT is not set
+# CONFIG_BT_BREDR is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_RFCOMM_TTY is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_DEBUGFS is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_INTEL is not set
+# CONFIG_BT_BCM is not set
+# CONFIG_BT_RTL is not set
+# CONFIG_BT_QCA is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIDTL1 is not set
 # CONFIG_BT_HCIBT3C is not set
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MRVL_SDIO is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_STREAM_PARSER is not set
@@ -5738,7 +5738,7 @@  CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
+# CONFIG_TOSHIBA_BT_RFKILL is not set
 CONFIG_TOSHIBA_HAPS=m
 CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index b16d13504..f7bfbe715 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1525,51 +1525,51 @@  CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
+# CONFIG_BT is not set
+# CONFIG_BT_BREDR is not set
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_RFCOMM_TTY is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+# CONFIG_BT_HS is not set
+# CONFIG_BT_LE is not set
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BT_DEBUGFS=y
+# CONFIG_BT_DEBUGFS is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
+# CONFIG_BT_INTEL is not set
+# CONFIG_BT_BCM is not set
+# CONFIG_BT_RTL is not set
+# CONFIG_BT_QCA is not set
+# CONFIG_BT_HCIBTUSB is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_ATH3K is not set
+# CONFIG_BT_HCIUART_INTEL is not set
+# CONFIG_BT_HCIUART_QCA is not set
+# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_MRVL_SDIO is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_WILINK is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 # CONFIG_STREAM_PARSER is not set
@@ -5595,7 +5595,7 @@  CONFIG_MSI_WMI=m
 # CONFIG_PEAQ_WMI is not set
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
+# CONFIG_TOSHIBA_BT_RFKILL is not set
 # CONFIG_TOSHIBA_HAPS is not set
 # CONFIG_TOSHIBA_WMI is not set
 CONFIG_ACPI_CMPC=m