darwin: bring up darwin [2/3]

PD# 157184

bring up darwin

Change-Id: If73b5ac3a8c8a3b0eb292caca3a9ec652411eb5d

5 files changed, 12 insertions, 122 deletions

diff --git a/Kernel.mk b/Kernel.mk
index d8bd70b..e73070a 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -12,6 +12,8 @@ WIFI_MODULE := multiwifi
 
 INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
 
+BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dtb.img --kernel_offset $(BOARD_KERNEL_OFFSET)
+
 ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), true)
 TARGET_PREBUILT_KERNEL := device/amlogic/darwin-kernel/Image.gz
 INSTALLED_BOARDDTB_TARGET := $(PRODUCT_OUT)/dtb.img
@@ -77,9 +79,6 @@ $(KERNEL_OUT):
 $(KERNEL_CONFIG): $(KERNEL_OUT)
 	$(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
 
-BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dtb.img --kernel_offset $(BOARD_KERNEL_OFFSET)
-
-
 $(INTERMEDIATES_KERNEL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(INSTALLED_BOARDDTB_TARGET)
 	@echo "make Image"
 #	$(MAKE) -C $(KERNEL_ROOTDIR) O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE)
diff --git a/darwin.mk b/darwin.mk
index 04aa199..a5b4f24 100644
--- a/darwin.mk
+++ b/darwin.mk
@@ -195,8 +195,8 @@ endif
 #
 #########################################################################
 
-#WIFI_MODULE := rtl8188eu
-MULTI_WIFI_SUPPORT =false
+WIFI_MODULE := bcm4356
+WIFI_BUILD_IN := true
 include device/amlogic/common/wifi.mk
 
 # Change this to match target country
@@ -211,9 +211,10 @@ PRODUCT_DEFAULT_WIFI_CHANNELS := 11
 #
 #########################################################################
 
-BOARD_HAVE_BLUETOOTH := false
-BCM_BLUETOOTH_LPM_ENABLE := false
+BOARD_HAVE_BLUETOOTH := true
 BLUETOOTH_MODULE := bcm4356
+#MULTI_BLUETOOTH_SUPPORT := true
+BCM_BLUETOOTH_LPM_ENABLE := true
 include device/amlogic/common/bluetooth.mk
 
 
@@ -310,9 +311,9 @@ PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ p
 #                                                PPPOE
 #
 #################################################################################
-ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
-BUILD_WITH_PPPOE := true
-endif
+#ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
+#BUILD_WITH_PPPOE := true
+#endif
 
 ifeq ($(BUILD_WITH_PPPOE),true)
 PRODUCT_PACKAGES += \
diff --git a/device.mk b/device.mk
index 7d0c475..3e87fe5 100644
--- a/device.mk
+++ b/device.mk
@@ -44,7 +44,7 @@ PRODUCT_COPY_FILES += \
     device/amlogic/darwin/files/remote.conf:$(TARGET_COPY_OUT_VENDOR)/etc/remote.conf \
     device/amlogic/darwin/files/remote.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/remote.cfg \
     device/amlogic/darwin/files/remote.tab:$(TARGET_COPY_OUT_VENDOR)/etc/remote.tab \
-    device/amlogic/darwin/files/Vendor_0001_Product_0001.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
+    device/amlogic/common/products/tv/Vendor_0001_Product_0001.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl \
     device/amlogic/darwin/files/Generic.kl:/$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Generic.kl
 
 # recovery
diff --git a/files/Vendor_0001_Product_0001.kl b/files/Vendor_0001_Product_0001.kl
deleted file mode 100644
index 898d99a..0000000
--- a/files/Vendor_0001_Product_0001.kl
+++ b/dev/null
@@ -1,110 +0,0 @@
-key 116      POWER
-key 2        1
-key 3        2
-key 4        3
-key 5        4
-key 6        5
-key 7        6
-key 8        7
-key 9        8
-key 10       9
-key 11       0
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 43    BACKSLASH
-
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 14    DEL
-
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-
-key 56    ALT_LEFT
-key 100   ALT_RIGHT
-key 42    SHIFT_LEFT
-key 54    SHIFT_RIGHT
-key 57    SPACE
-key 58    SOFT_RIGHT
-key 465      LAST_CHANNEL
-key 402      CHANNEL_UP
-key 403      CHANNEL_DOWN
-key 115      VOLUME_UP
-key 114      VOLUME_DOWN
-key 113      VOLUME_MUTE
-key 28       DPAD_CENTER
-key 103      DPAD_UP
-key 108      DPAD_DOWN
-key 105      DPAD_LEFT
-key 106      DPAD_RIGHT
-key 158      CLEAR
-key 139      MENU
-key 102      HOME
-key 398      PROG_RED
-key 399      PROG_GREEN
-key 400      PROG_YELLOW
-key 401      PROG_BLUE
-key 165      MEDIA_PREVIOUS
-key 163      MEDIA_NEXT
-key 168      MEDIA_REWIND
-key 208      MEDIA_FAST_FORWARD
-key 164      MEDIA_PLAY_PAUSE
-key 166      MEDIA_STOP
-key 167      MEDIA_RECORD
-
-
-key 250      EARLY_POWER
-key 219      TV_SLEEP
-key 70       TV_BROWSER
-key 155      ENVELOPE
-key 12       MINUS
-key 13       EQUALS
-key 215      AT
-key 130      ZOOM_IN
-key 131      ZOOM_OUT
-key 15       BACK
-
-key 207      TV_SHORTCUTKEY_GLOBALSETUP
-key 466      TV_INPUT
-key 464      TV_SHORTCUTKEY_3DMODE
-key 469      TV_SHORTCUTKEY_VIEWMODE
-key 470      TV_SHORTCUTKEY_VOICEMODE
-key 471      TV_SHORTCUTKEY_DISPAYMODE
-key 358      INFO
-
-key 111   PAGE_UP
-key 112   PAGE_DOWN
-key 237   FAV
-key 238   LIST
-key 212   TV_REPEAT
-key 213   CAPTIONS
-key 214   MEDIA_AUDIO_TRACK
-key 216   NUM_LOCK
-key 217   GUIDE
diff --git a/manifest.xml b/manifest.xml
index 47ff9b8..1a7dc6e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -215,6 +215,6 @@
         </interface>
     </hal>
     <sepolicy>
-        <version>26.0</version>
+        <version>27.0</version>
     </sepolicy>
 </manifest>