From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH v2 1/2] Kernel: drop bluetooth support Date: Wed, 01 Apr 2020 15:23:00 +0000 Message-ID: <32199ad6-fd13-2850-07f3-b08305ba24fd@ipfire.org> In-Reply-To: <98b0f6b1-08b2-b07a-8047-9313a0776a7a@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4763437364413811768==" List-Id: --===============4763437364413811768== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The bluetooth addon was recently removed by commit 592be1d206e45ad42736b352d96e42ebca50123a, which is why we do not need to carry the corresponding kernel modules around anymore. The second version of this patch correctly updates kernel configuration files via "make oldconfig" as requested by Arne. Cc: Arne Fitzenreiter Cc: Michael Tremer Signed-off-by: Peter M=C3=BCller --- config/kernel/kernel.config.aarch64-ipfire | 42 +------------------ config/kernel/kernel.config.armv5tel-ipfire-multi | 42 +------------------ config/kernel/kernel.config.i586-ipfire | 48 +--------------------- config/kernel/kernel.config.i586-ipfire-pae | 48 +--------------------- config/kernel/kernel.config.x86_64-ipfire | 50 ++-------------------= -- 5 files changed, 9 insertions(+), 221 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kerne= l.config.aarch64-ipfire index 32ad2df07..10a35457a 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1336,47 +1336,7 @@ CONFIG_NET_FLOW_LIMIT=3Dy # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_BT=3Dm -CONFIG_BT_BREDR=3Dy -CONFIG_BT_RFCOMM=3Dm -CONFIG_BT_RFCOMM_TTY=3Dy -CONFIG_BT_BNEP=3Dm -CONFIG_BT_BNEP_MC_FILTER=3Dy -CONFIG_BT_BNEP_PROTO_FILTER=3Dy -CONFIG_BT_HIDP=3Dm -CONFIG_BT_HS=3Dy -CONFIG_BT_LE=3Dy -CONFIG_BT_LEDS=3Dy -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=3Dy - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=3Dm -CONFIG_BT_BCM=3Dm -CONFIG_BT_RTL=3Dm -CONFIG_BT_QCA=3Dm -CONFIG_BT_HCIBTUSB=3Dm -CONFIG_BT_HCIBTUSB_BCM=3Dy -CONFIG_BT_HCIBTUSB_RTL=3Dy -CONFIG_BT_HCIBTSDIO=3Dm -CONFIG_BT_HCIUART=3Dm -CONFIG_BT_HCIUART_H4=3Dy -CONFIG_BT_HCIUART_BCSP=3Dy -CONFIG_BT_HCIUART_ATH3K=3Dy -CONFIG_BT_HCIUART_INTEL=3Dy -CONFIG_BT_HCIUART_QCA=3Dy -CONFIG_BT_HCIUART_AG6XX=3Dy -CONFIG_BT_HCIUART_MRVL=3Dy -CONFIG_BT_HCIBCM203X=3Dm -CONFIG_BT_HCIBPA10X=3Dm -CONFIG_BT_HCIBFUSB=3Dm -CONFIG_BT_HCIVHCI=3Dm -CONFIG_BT_MRVL=3Dm -CONFIG_BT_MRVL_SDIO=3Dm -CONFIG_BT_ATH3K=3Dm -CONFIG_BT_WILINK=3Dm +# CONFIG_BT 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/kerne= l/kernel.config.armv5tel-ipfire-multi index cfa766005..40f1a9633 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1593,47 +1593,7 @@ CONFIG_NET_FLOW_LIMIT=3Dy # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_BT=3Dm -CONFIG_BT_BREDR=3Dy -CONFIG_BT_RFCOMM=3Dm -CONFIG_BT_RFCOMM_TTY=3Dy -CONFIG_BT_BNEP=3Dm -CONFIG_BT_BNEP_MC_FILTER=3Dy -CONFIG_BT_BNEP_PROTO_FILTER=3Dy -CONFIG_BT_HIDP=3Dm -CONFIG_BT_HS=3Dy -CONFIG_BT_LE=3Dy -CONFIG_BT_LEDS=3Dy -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=3Dy - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=3Dm -CONFIG_BT_BCM=3Dm -CONFIG_BT_RTL=3Dm -CONFIG_BT_QCA=3Dm -CONFIG_BT_HCIBTUSB=3Dm -CONFIG_BT_HCIBTUSB_BCM=3Dy -CONFIG_BT_HCIBTUSB_RTL=3Dy -CONFIG_BT_HCIBTSDIO=3Dm -CONFIG_BT_HCIUART=3Dm -CONFIG_BT_HCIUART_H4=3Dy -CONFIG_BT_HCIUART_BCSP=3Dy -CONFIG_BT_HCIUART_ATH3K=3Dy -CONFIG_BT_HCIUART_INTEL=3Dy -CONFIG_BT_HCIUART_QCA=3Dy -CONFIG_BT_HCIUART_AG6XX=3Dy -CONFIG_BT_HCIUART_MRVL=3Dy -CONFIG_BT_HCIBCM203X=3Dm -CONFIG_BT_HCIBPA10X=3Dm -CONFIG_BT_HCIBFUSB=3Dm -CONFIG_BT_HCIVHCI=3Dm -CONFIG_BT_MRVL=3Dm -CONFIG_BT_MRVL_SDIO=3Dm -CONFIG_BT_ATH3K=3Dm -CONFIG_BT_WILINK=3Dm +# CONFIG_BT 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.c= onfig.i586-ipfire index 4bb39fc20..385712464 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1532,51 +1532,7 @@ CONFIG_NET_FLOW_LIMIT=3Dy # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_BT=3Dm -CONFIG_BT_BREDR=3Dy -CONFIG_BT_RFCOMM=3Dm -CONFIG_BT_RFCOMM_TTY=3Dy -CONFIG_BT_BNEP=3Dm -CONFIG_BT_BNEP_MC_FILTER=3Dy -CONFIG_BT_BNEP_PROTO_FILTER=3Dy -CONFIG_BT_HIDP=3Dm -CONFIG_BT_HS=3Dy -CONFIG_BT_LE=3Dy -CONFIG_BT_LEDS=3Dy -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=3Dy - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=3Dm -CONFIG_BT_BCM=3Dm -CONFIG_BT_RTL=3Dm -CONFIG_BT_QCA=3Dm -CONFIG_BT_HCIBTUSB=3Dm -CONFIG_BT_HCIBTUSB_BCM=3Dy -CONFIG_BT_HCIBTUSB_RTL=3Dy -CONFIG_BT_HCIBTSDIO=3Dm -CONFIG_BT_HCIUART=3Dm -CONFIG_BT_HCIUART_H4=3Dy -CONFIG_BT_HCIUART_BCSP=3Dy -CONFIG_BT_HCIUART_ATH3K=3Dy -CONFIG_BT_HCIUART_INTEL=3Dy -CONFIG_BT_HCIUART_QCA=3Dy -CONFIG_BT_HCIUART_AG6XX=3Dy -CONFIG_BT_HCIUART_MRVL=3Dy -CONFIG_BT_HCIBCM203X=3Dm -CONFIG_BT_HCIBPA10X=3Dm -CONFIG_BT_HCIBFUSB=3Dm -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -CONFIG_BT_HCIBLUECARD=3Dm -CONFIG_BT_HCIBTUART=3Dm -CONFIG_BT_HCIVHCI=3Dm -CONFIG_BT_MRVL=3Dm -CONFIG_BT_MRVL_SDIO=3Dm -CONFIG_BT_ATH3K=3Dm -CONFIG_BT_WILINK=3Dm +# CONFIG_BT is not set # CONFIG_AF_RXRPC is not set # CONFIG_AF_KCM is not set # CONFIG_STREAM_PARSER is not set @@ -5731,7 +5687,7 @@ CONFIG_MSI_WMI=3Dm CONFIG_PEAQ_WMI=3Dm CONFIG_TOPSTAR_LAPTOP=3Dm CONFIG_ACPI_TOSHIBA=3Dm -CONFIG_TOSHIBA_BT_RFKILL=3Dm +# CONFIG_TOSHIBA_BT_RFKILL is not set CONFIG_TOSHIBA_HAPS=3Dm CONFIG_TOSHIBA_WMI=3Dm CONFIG_ACPI_CMPC=3Dm diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index 318384613..a871d85b8 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1550,51 +1550,7 @@ CONFIG_NET_FLOW_LIMIT=3Dy # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_BT=3Dm -CONFIG_BT_BREDR=3Dy -CONFIG_BT_RFCOMM=3Dm -CONFIG_BT_RFCOMM_TTY=3Dy -CONFIG_BT_BNEP=3Dm -CONFIG_BT_BNEP_MC_FILTER=3Dy -CONFIG_BT_BNEP_PROTO_FILTER=3Dy -CONFIG_BT_HIDP=3Dm -CONFIG_BT_HS=3Dy -CONFIG_BT_LE=3Dy -CONFIG_BT_LEDS=3Dy -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=3Dy - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=3Dm -CONFIG_BT_BCM=3Dm -CONFIG_BT_RTL=3Dm -CONFIG_BT_QCA=3Dm -CONFIG_BT_HCIBTUSB=3Dm -CONFIG_BT_HCIBTUSB_BCM=3Dy -CONFIG_BT_HCIBTUSB_RTL=3Dy -CONFIG_BT_HCIBTSDIO=3Dm -CONFIG_BT_HCIUART=3Dm -CONFIG_BT_HCIUART_H4=3Dy -CONFIG_BT_HCIUART_BCSP=3Dy -CONFIG_BT_HCIUART_ATH3K=3Dy -CONFIG_BT_HCIUART_INTEL=3Dy -CONFIG_BT_HCIUART_QCA=3Dy -CONFIG_BT_HCIUART_AG6XX=3Dy -CONFIG_BT_HCIUART_MRVL=3Dy -CONFIG_BT_HCIBCM203X=3Dm -CONFIG_BT_HCIBPA10X=3Dm -CONFIG_BT_HCIBFUSB=3Dm -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -CONFIG_BT_HCIBLUECARD=3Dm -CONFIG_BT_HCIBTUART=3Dm -CONFIG_BT_HCIVHCI=3Dm -CONFIG_BT_MRVL=3Dm -CONFIG_BT_MRVL_SDIO=3Dm -CONFIG_BT_ATH3K=3Dm -CONFIG_BT_WILINK=3Dm +# CONFIG_BT is not set # CONFIG_AF_RXRPC is not set # CONFIG_AF_KCM is not set # CONFIG_STREAM_PARSER is not set @@ -5738,7 +5694,7 @@ CONFIG_MSI_WMI=3Dm CONFIG_PEAQ_WMI=3Dm CONFIG_TOPSTAR_LAPTOP=3Dm CONFIG_ACPI_TOSHIBA=3Dm -CONFIG_TOSHIBA_BT_RFKILL=3Dm +# CONFIG_TOSHIBA_BT_RFKILL is not set CONFIG_TOSHIBA_HAPS=3Dm CONFIG_TOSHIBA_WMI=3Dm CONFIG_ACPI_CMPC=3Dm diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index b16d13504..f035a242a 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.170-ipfire Kernel Configuration +# Linux/x86 4.14.173-ipfire Kernel Configuration # CONFIG_64BIT=3Dy CONFIG_X86_64=3Dy @@ -1525,51 +1525,7 @@ CONFIG_NET_FLOW_LIMIT=3Dy # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_BT=3Dm -CONFIG_BT_BREDR=3Dy -CONFIG_BT_RFCOMM=3Dm -CONFIG_BT_RFCOMM_TTY=3Dy -CONFIG_BT_BNEP=3Dm -CONFIG_BT_BNEP_MC_FILTER=3Dy -CONFIG_BT_BNEP_PROTO_FILTER=3Dy -CONFIG_BT_HIDP=3Dm -CONFIG_BT_HS=3Dy -CONFIG_BT_LE=3Dy -CONFIG_BT_LEDS=3Dy -# CONFIG_BT_SELFTEST is not set -CONFIG_BT_DEBUGFS=3Dy - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=3Dm -CONFIG_BT_BCM=3Dm -CONFIG_BT_RTL=3Dm -CONFIG_BT_QCA=3Dm -CONFIG_BT_HCIBTUSB=3Dm -CONFIG_BT_HCIBTUSB_BCM=3Dy -CONFIG_BT_HCIBTUSB_RTL=3Dy -CONFIG_BT_HCIBTSDIO=3Dm -CONFIG_BT_HCIUART=3Dm -CONFIG_BT_HCIUART_H4=3Dy -CONFIG_BT_HCIUART_BCSP=3Dy -CONFIG_BT_HCIUART_ATH3K=3Dy -CONFIG_BT_HCIUART_INTEL=3Dy -CONFIG_BT_HCIUART_QCA=3Dy -CONFIG_BT_HCIUART_AG6XX=3Dy -CONFIG_BT_HCIUART_MRVL=3Dy -CONFIG_BT_HCIBCM203X=3Dm -CONFIG_BT_HCIBPA10X=3Dm -CONFIG_BT_HCIBFUSB=3Dm -CONFIG_BT_HCIDTL1=3Dm -CONFIG_BT_HCIBT3C=3Dm -CONFIG_BT_HCIBLUECARD=3Dm -CONFIG_BT_HCIBTUART=3Dm -CONFIG_BT_HCIVHCI=3Dm -CONFIG_BT_MRVL=3Dm -CONFIG_BT_MRVL_SDIO=3Dm -CONFIG_BT_ATH3K=3Dm -CONFIG_BT_WILINK=3Dm +# CONFIG_BT is not set # CONFIG_AF_RXRPC is not set # CONFIG_AF_KCM is not set # CONFIG_STREAM_PARSER is not set @@ -5595,7 +5551,7 @@ CONFIG_MSI_WMI=3Dm # CONFIG_PEAQ_WMI is not set CONFIG_TOPSTAR_LAPTOP=3Dm CONFIG_ACPI_TOSHIBA=3Dm -CONFIG_TOSHIBA_BT_RFKILL=3Dm +# CONFIG_TOSHIBA_BT_RFKILL is not set # CONFIG_TOSHIBA_HAPS is not set # CONFIG_TOSHIBA_WMI is not set CONFIG_ACPI_CMPC=3Dm --=20 2.16.4 --===============4763437364413811768==--