From 042377c2ef9470a8d00967c4133ca782c819dd62 Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Sat, 11 Nov 2017 10:18:28 +0100 Subject: shinano: move BT/FM (Broadcom) Config from shinano.mk to boardconfig Change-Id: Idbc1b1a8501647a4b525beacd7f1455a74473f35 --- BoardConfigCommon.mk | 6 +++++- shinano.mk | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 8ead391..66999ea 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -54,7 +54,11 @@ BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/shinano-common/bluetooth BOARD_CUSTOM_BT_CONFIG := device/sony/shinano-common/bluetooth/vnd_shinano.txt -N_BRCM_HCI := 26 + +# BT/FM (Broadcom): Adjust the sysfs patch for 3.4 kernel +BOARD_HAVE_BCM_FM_SYSFS := "/sys/bus/platform/drivers/bcm_ldisc/bcm_ldisc/" +BOARD_BRCM_HCI_NUM := 26 + # Camera TARGET_USES_MEDIA_EXTENSIONS := true diff --git a/shinano.mk b/shinano.mk index 9d6b0a2..780a8be 100644 --- a/shinano.mk +++ b/shinano.mk @@ -165,9 +165,5 @@ PRODUCT_COPY_FILES += \ # BCM Wifi $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk) -# BT/FM (Broadcom): Adjust the sysfs patch for 3.4 kernel -BOARD_HAVE_BCM_FM_SYSFS := "/sys/bus/platform/drivers/bcm_ldisc/bcm_ldisc/" -BOARD_BRCM_HCI_NUM := 26 - # Include non-opensource parts $(call inherit-product, vendor/sony/shinano-common/shinano-common-vendor.mk) -- cgit v1.2.3