From 75623db85c799b0dffa650cc13107ab7f314fa9a Mon Sep 17 00:00:00 2001 From: Larson Jiang Date: Thu, 27 Apr 2017 17:14:21 +0800 Subject: [PATCH] PD#138714: add bt/wifi config Change-Id: Id1e0fcc80f7aa25db1768ac4c5e5987ba2dff4e3 Signed-off-by: Larson Jiang --- arch/arm/configs/meson32_defconfig | 6 ++++++ drivers/amlogic/bluetooth/Kconfig | 2 -- drivers/amlogic/wifi/Kconfig | 4 +--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/meson32_defconfig b/arch/arm/configs/meson32_defconfig index 9927545c3493..d0d97aea6d1e 100644 --- a/arch/arm/configs/meson32_defconfig +++ b/arch/arm/configs/meson32_defconfig @@ -149,6 +149,10 @@ CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y CONFIG_NET_ACT_MIRRED=y +CONFIG_BT=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_RFKILL=y CONFIG_AMLOGIC_DRIVER=y CONFIG_AMLOGIC_CPUFREQ=y CONFIG_AMLOGIC_UART=y @@ -187,6 +191,8 @@ CONFIG_AMLOGIC_M8B_TEMP_SENSOR=y CONFIG_AMLOGIC_CPUCORE_THERMAL=y CONFIG_AMLOGIC_GPU_THERMAL=y CONFIG_AMLOGIC_GPUCORE_THERMAL=y +CONFIG_AMLOGIC_WIFI=y +CONFIG_AMLOGIC_BT_DEVICE=y CONFIG_AMLOGIC_POWER=y CONFIG_AMLOGIC_PMU_OF=y CONFIG_AMLOGIC_PMU=y diff --git a/drivers/amlogic/bluetooth/Kconfig b/drivers/amlogic/bluetooth/Kconfig index ab1afc8de8a5..9a4be05bb31a 100644 --- a/drivers/amlogic/bluetooth/Kconfig +++ b/drivers/amlogic/bluetooth/Kconfig @@ -1,5 +1,3 @@ -comment "Amlogic Bt Rfkill Driver" - config AMLOGIC_BT_DEVICE bool "BT Device support" depends on BT && RFKILL diff --git a/drivers/amlogic/wifi/Kconfig b/drivers/amlogic/wifi/Kconfig index 1f3c445817e6..1ff06f16e717 100644 --- a/drivers/amlogic/wifi/Kconfig +++ b/drivers/amlogic/wifi/Kconfig @@ -1,6 +1,4 @@ -comment "Amlogic Wifi Driver" - -menuconfig AMLOGIC_WIFI +config AMLOGIC_WIFI bool "WiFi support" default n help