Bruno: Enable BlueZ
Change-Id: Ibbba440ec9e34dd88580bb1df7eeeea8f1e81248
diff --git a/configs/gftv100_defconfig b/configs/gftv100_defconfig
index 6d8e3c9..4d3f32e 100644
--- a/configs/gftv100_defconfig
+++ b/configs/gftv100_defconfig
@@ -35,16 +35,14 @@
# BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS is not set
# BR2_PACKAGE_ALSA_UTILS_ALSACTL is not set
# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_PKG_CONFIG=y
BR2_PACKAGE_TAR=y
+BR2_PACKAGE_DBUS_PYTHON=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
+BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_GPTFDISK=y
-BR2_PACKAGE_GPTFDISK_GDISK=y
-BR2_PACKAGE_GPTFDISK_SGDISK=y
BR2_PACKAGE_HDPARM=y
BR2_PACKAGE_HWDATA=y
# BR2_PACKAGE_MTD_UBINIZE is not set
@@ -56,13 +54,15 @@
BR2_PACKAGE_PYTHON_PYEXPAT=y
BR2_PACKAGE_PYTHON_READLINE=y
BR2_PACKAGE_PYTHON_SSL=y
-BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_PYTHON_IPV6=y
-BR2_PACKAGE_PY_DNS=y
BR2_PACKAGE_PY_GOOGLE_API=y
+BR2_PACKAGE_PY_DNS=y
BR2_PACKAGE_PY_MONOTIME=y
BR2_PACKAGE_PYTHON_CRYPTO=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
+BR2_PACKAGE_OPENSSL_BIN=y
# BR2_PACKAGE_AVAHI_AUTOIPD is not set
+BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_BRIDGE_UTILS=y
BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y
@@ -97,6 +97,9 @@
BR2_PACKAGE_VCONFIG=y
BR2_PACKAGE_ACL=y
BR2_PACKAGE_MODULE_INIT_TOOLS=y
+BR2_PACKAGE_GPTFDISK=y
+BR2_PACKAGE_GPTFDISK_GDISK=y
+BR2_PACKAGE_GPTFDISK_SGDISK=y
BR2_PACKAGE_UTIL_LINUX_MOUNT=y
BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT=y
BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y
@@ -108,18 +111,20 @@
BR2_PACKAGE_GOOGLE_STORAGE_BOX=y
BR2_PACKAGE_GOOGLE_TV_BOX=y
BR2_PACKAGE_CATAWAMPUS=y
+BR2_PACKAGE_BCM_COMMON_PLATFORM="97425"
+BR2_PACKAGE_BCM_COMMON_PLATFORM_REV="B2"
BR2_PACKAGE_BCM_DRIVERS=y
BR2_PACKAGE_BCM_DRIVER_MOCA=y
+BR2_PACKAGE_BACKPORTS=y
+BR2_PACKAGE_BACKPORTS_DEFCONFIG="gftv100_defconfig"
BR2_TARGET_ROOTFS_SQUASHFS=y
BR2_PACKAGE_SIMPLERAMFS=y
BR2_TARGET_ROOTFS_GINSTALL=y
BR2_TARGET_ROOTFS_GINSTALL_V2=y
+BR2_TARGET_ROOTFS_GINSTALL_LOADER_DIR="../vendor/broadcom/cfe-bin/gftv100"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="repo://kernel/bruno"
BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="HEAD"
BR2_LINUX_KERNEL_DEFCONFIG="bruno_gfhd100b2"
BR2_LINUX_KERNEL_VMLINUX=y
-BR2_TARGET_ROOTFS_GINSTALL_LOADER_DIR="../vendor/broadcom/cfe-bin/gftv100"
-BR2_PACKAGE_BCM_COMMON_PLATFORM="97425"
-BR2_PACKAGE_BCM_COMMON_PLATFORM_REV="B2"
diff --git a/fs/skeleton/bin/is-bluez-platform b/fs/skeleton/bin/is-bluez-platform
index fa46396..deaf696 100755
--- a/fs/skeleton/bin/is-bluez-platform
+++ b/fs/skeleton/bin/is-bluez-platform
@@ -5,6 +5,8 @@
BT_MRVL_PATH="/sys/bus/mmc/devices/mmc0:0001/mmc0:0001:2"
+[ -e "/config/BLUEZ" ] && exit 0
+
if [ -e "$BT_MRVL_PATH" ] &&
[ -e "$BT_MRVL_PATH/vendor" ] && [ -e "$BT_MRVL_PATH/device" ]; then
VENDOR=$(cat "$BT_MRVL_PATH/vendor")
diff --git a/fs/skeleton/etc/init.d/S09drivers.platform_gfibertv b/fs/skeleton/etc/init.d/S09drivers.platform_gfibertv
index 7b8be5a..3f6e5f4 100755
--- a/fs/skeleton/etc/init.d/S09drivers.platform_gfibertv
+++ b/fs/skeleton/etc/init.d/S09drivers.platform_gfibertv
@@ -40,5 +40,5 @@
[ -e ${MODULE_PATH}/btusb.ko ] && insmod ${MODULE_PATH}/btusb.ko
[ -e ${MODULE_PATH}/bthid.ko ] && insmod ${MODULE_PATH}/bthid.ko
else
- modprobe -a bluetooth hidp btmrvl btmrvl_sdio
+ modprobe -a bluetooth hidp btmrvl btmrvl_sdio btusb
fi
diff --git a/package/backports/gftv100_defconfig b/package/backports/gftv100_defconfig
new file mode 100644
index 0000000..605ddfb
--- /dev/null
+++ b/package/backports/gftv100_defconfig
@@ -0,0 +1,8 @@
+CPTCFG_BACKPORT_USERSEL_BUILD_ALL=y
+CPTCFG_BT=m
+CPTCFG_BT_RFCOMM=m
+CPTCFG_BT_HIDP=m
+CPTCFG_BT_HCIBTUSB=m
+CPTCFG_BT_HCIBTSDIO=m
+CPTCFG_BT_MRVL=m
+CPTCFG_BT_MRVL_SDIO=m
