summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEyal Reizer2014-04-09 11:11:03 -0500
committerGerrit Code Review2014-04-09 11:32:59 -0500
commitdaf1518144d6c359621ddc1b52facc2f1437c5ea (patch)
tree50cd63533dfded5ea653232cbdcc296c6dd762a0
parent5c394be6db1fb0a0d6831b07abbfe5a76c707abe (diff)
downloaddevice-ti-jacinto6evm-daf1518144d6c359621ddc1b52facc2f1437c5ea.tar.gz
device-ti-jacinto6evm-daf1518144d6c359621ddc1b52facc2f1437c5ea.tar.xz
device-ti-jacinto6evm-daf1518144d6c359621ddc1b52facc2f1437c5ea.zip
jacinto6evm: re-enable WLAN and BT
WLAN/BT were disabled initially during KitKat bringup. Enable them back. Change-Id: I6e9ccd3235fef64f6c8b669e3caf9ee87e889b15 Signed-off-by: Eyal Reizer <eyalr@ti.com>
-rw-r--r--BoardConfig.mk2
-rw-r--r--device.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5ec3057..31f1d75 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -65,7 +65,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/ti/jacinto6evm
65#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true 65#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
66 66
67# Connectivity - Wi-Fi 67# Connectivity - Wi-Fi
68#USES_TI_MAC80211 := true 68USES_TI_MAC80211 := true
69ifdef USES_TI_MAC80211 69ifdef USES_TI_MAC80211
70BOARD_WPA_SUPPLICANT_DRIVER := NL80211 70BOARD_WPA_SUPPLICANT_DRIVER := NL80211
71WPA_SUPPLICANT_VERSION := VER_0_8_X_TI 71WPA_SUPPLICANT_VERSION := VER_0_8_X_TI
diff --git a/device.mk b/device.mk
index a6b77a0..6986588 100644
--- a/device.mk
+++ b/device.mk
@@ -154,10 +154,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
154 154
155$(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) 155$(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk)
156$(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk) 156$(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk)
157#$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) 157$(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk)
158$(call inherit-product-if-exists, vendor/ti/omap5sevm/device-vendor.mk) 158$(call inherit-product-if-exists, vendor/ti/omap5sevm/device-vendor.mk)
159$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) 159$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk)
160#$(call inherit-product-if-exists, device/ti/common-open/s3d/s3d-products.mk) 160#$(call inherit-product-if-exists, device/ti/common-open/s3d/s3d-products.mk)
161$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk) 161$(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk)
162#$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) 162$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk)
163#$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) 163$(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk)