3 files changed, 23 insertions, 8 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index cd72bc3..beec598 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -29,6 +29,7 @@ TARGET_CPU_ABI2 := armeabi
 
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/samsung/crespo/bluetooth
 
 TARGET_NO_BOOTLOADER := true
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..5651c92
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BTM_DEF_LOCAL_NAME   "Nexus S"
+
+#endif
diff --git a/init.herring.rc b/init.herring.rc
index 58dbbf1..accca47 100755
--- a/init.herring.rc
+++ b/init.herring.rc
@@ -144,14 +144,6 @@ service iprenew_bnep0 /system/bin/dhcpcd -n
     disabled
     oneshot
 
-service hciattach /system/bin/brcm_patchram_plus --enable_hci --enable_lpm \
-    --baudrate 3000000 --patchram /vendor/firmware/bcm4329.hcd /dev/s3c2410_serial0
-    class main
-    user bluetooth
-    group bluetooth net_bt_admin
-    disabled
-    oneshot
-
 # bugreport is triggered by holding down volume down, volume up and power
 #service bugreport /system/bin/bugmailer.sh -v
 #    class main