blob: dae3243fb82a61479c2bd58147ed99bb34e635cb [file] [log] [blame]
Andrew Geissler220dafd2023-10-04 10:18:08 -05001From d59c5c17d3345f923d66fc85a7681fc6c4fd657d Mon Sep 17 00:00:00 2001
Patrick Williams2194f502022-10-16 14:26:09 -05002From: Vishnu Banavath <vishnu.banavath@arm.com>
3Date: Wed, 21 Sep 2022 15:54:14 +0100
4Subject: [PATCH] arm64: defconfig: disable config options that does not apply
5 anymore
6
7Following config options should be not set to be more accurate and
8works with build system like yocto
Andrew Geissler220dafd2023-10-04 10:18:08 -05009CONFIG_BT_HCIBTUSB
10CONFIG_BT_HCIBTUSB_MTK
Patrick Williams2194f502022-10-16 14:26:09 -050011CONFIG_BT_HCIUART_MRVL
12CONFIG_BT_MRVL
13CONFIG_BT_MRVL_SDIO
14CONFIG_BT_QCOMSMD
15
16Upstream-Status: Pending [not submitted upstream yet]
17Signed-off-by: Adam Johnston <adam.johnston@arm.com>
18Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
Andrew Geissler220dafd2023-10-04 10:18:08 -050019Signed-off-by: Xueliang Zhong <xueliang.zhong@arm.com>
Patrick Williams2194f502022-10-16 14:26:09 -050020---
Andrew Geissler220dafd2023-10-04 10:18:08 -050021 arch/arm64/configs/defconfig | 12 ++++++------
22 1 file changed, 6 insertions(+), 6 deletions(-)
Patrick Williams2194f502022-10-16 14:26:09 -050023
24diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
Andrew Geissler220dafd2023-10-04 10:18:08 -050025index cd73d1704dd2..958a43bd00e6 100644
Patrick Williams2194f502022-10-16 14:26:09 -050026--- a/arch/arm64/configs/defconfig
27+++ b/arch/arm64/configs/defconfig
Andrew Geissler220dafd2023-10-04 10:18:08 -050028@@ -181,16 +181,16 @@ CONFIG_BT_HIDP=m
29 # CONFIG_BT_LE is not set
30 CONFIG_BT_LEDS=y
31 # CONFIG_BT_DEBUGFS is not set
32-CONFIG_BT_HCIBTUSB=m
33-CONFIG_BT_HCIBTUSB_MTK=y
34+# CONFIG_BT_HCIBTUSB is not set
35+# CONFIG_BT_HCIBTUSB_MTK is not set
36 CONFIG_BT_HCIUART=m
Patrick Williams2194f502022-10-16 14:26:09 -050037 CONFIG_BT_HCIUART_LL=y
38 CONFIG_BT_HCIUART_BCM=y
39 CONFIG_BT_HCIUART_QCA=y
40-CONFIG_BT_HCIUART_MRVL=y
41-CONFIG_BT_MRVL=m
42-CONFIG_BT_MRVL_SDIO=m
43-CONFIG_BT_QCOMSMD=m
44+# CONFIG_BT_HCIUART_MRVL is not set
45+# CONFIG_BT_MRVL is not set
46+# CONFIG_BT_MRVL_SDIO is not set
47+# CONFIG_BT_QCOMSMD is not set
48 CONFIG_CFG80211=m
49 CONFIG_MAC80211=m
50 CONFIG_MAC80211_LEDS=y