More cleanup, reorder files and sync with AOSP

- move CM specific defines to a seperate BoardConfigCM.mk

Change-Id: I1b00e4bef03f4553cc62dc1f5f25a417ffb00866

6 files changed, 25 insertions, 42 deletions

diff --git a/BoardConfigCM.mk b/BoardConfigCM.mk
new file mode 100644
index 0000000..e36c6f3
--- /dev/null
+++ b/BoardConfigCM.mk
@@ -0,0 +1,12 @@
+# Charger
+BOARD_CHARGER_SHOW_PERCENTAGE := true
+
+# F2FS filesystem
+TARGET_USERIMAGES_USE_F2FS := true
+
+# Liblights
+TARGET_PROVIDES_LIBLIGHT := true
+
+# Recovery
+TARGET_RECOVERY_DEVICE_DIRS += device/samsung/espressowifi
+BOARD_HAS_DOWNLOAD_MODE := true
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 047e050..9d3a153 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -14,12 +14,14 @@
 # limitations under the License.
 #
 
+# Inherit CM specific board config
+-include device/samsung/espressowifi/BoardConfigCM.mk
+
 # Inherit common omap4 board config
 -include hardware/ti/omap4/BoardConfigCommon.mk
 
 TARGET_NO_BOOTLOADER := true
 
-TARGET_BOARD_OMAP_CPU := 4430
 TARGET_BOOTLOADER_BOARD_NAME := piranha
 
 # Inline kernel building
@@ -29,7 +31,7 @@ BOARD_NAND_PAGE_SIZE := 4096
 BOARD_NAND_SPARE_SIZE := 128
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_KERNEL_BASE := 0x40000000
-# BOARD_KERNEL_CMDLINE :=
+BOARD_KERNEL_CMDLINE := androidboot.hardware=espresso
 
 # External SGX Module
 SGX_MODULES:
@@ -50,16 +52,7 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 5003787264
 BOARD_FLASH_BLOCK_SIZE := 4096
 
-# F2FS filesystem
-TARGET_USERIMAGES_USE_F2FS := true
-
-# Vold
-BOARD_VOLD_MAX_PARTITIONS := 12
-BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
-BOARD_VOLD_DISC_HAS_MULTIPLE_MAJORS := true
-TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/class/android_usb/f_mass_storage/lun%d/file"
-
-# Wifi
+# Wi-Fi
 BOARD_WLAN_DEVICE                := bcmdhd
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
@@ -73,22 +66,14 @@ WIFI_DRIVER_FW_PATH_AP           := "/system/etc/wifi/bcmdhd_apsta.bin"
 WIFI_DRIVER_FW_PATH_P2P          := "/system/etc/wifi/bcmdhd_p2p.bin"
 WIFI_DRIVER_MODULE_NAME          := "bcmdhd"
 WIFI_DRIVER_MODULE_ARG           := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
-WIFI_DRIVER_MODULE_AP_ARG        := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
 WIFI_BAND                        := 802_11_ABG
 
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/espressowifi/bluetooth
-BOARD_BLUEDROID_VENDOR_CONF := device/samsung/espressowifi/bluetooth/vnd_espresso.txt
-
-# Charger
-BOARD_CHARGER_SHOW_PERCENTAGE := true
-
-# Liblights
-TARGET_PROVIDES_LIBLIGHT := true
 
-# Selinux
+# SELinux
 BOARD_SEPOLICY_DIRS += \
     device/samsung/espressowifi/sepolicy
 
@@ -96,5 +81,3 @@ BOARD_SEPOLICY_DIRS += \
 RECOVERY_FSTAB_VERSION := 2
 TARGET_RECOVERY_FSTAB := device/samsung/espressowifi/rootdir/etc/fstab.tab2
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
-TARGET_RECOVERY_DEVICE_DIRS += device/samsung/espressowifi
-BOARD_HAS_DOWNLOAD_MODE := true
diff --git a/bluetooth/vnd_espresso.txt b/bluetooth/vnd_espresso.txt
deleted file mode 100644
index e487dc4..0000000
--- a/bluetooth/vnd_espresso.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyO1"
-FW_PATCHFILE_LOCATION = "/vendor/firmware/"
-FW_PATCH_SETTLEMENT_DELAY_MS = 50
-BTVND_DBG = FALSE
-BTHW_DBG = TRUE
-VNDUSERIAL_DBG = FALSE
-UPIO_DBG = FALSE
-SCO_USE_I2S_INTERFACE = TRUE
-SCO_I2SPCM_IF_MODE = 1
-SCO_I2SPCM_IF_ROLE = 0
-SCO_I2SPCM_IF_SAMPLE_RATE = 0
-SCO_I2SPCM_IF_CLOCK_RATE = 0
diff --git a/espresso-common.mk b/device-common.mk
index 4017c18..325589c 100644
--- a/espresso-common.mk
+++ b/device-common.mk
@@ -14,12 +14,15 @@
 # limitations under the License.
 #
 
+LOCAL_PATH := device/samsung/espressowifi
+
+TARGET_BOARD_OMAP_CPU := 4430
+
 # Include common omap4 makefile
 $(call inherit-product, hardware/ti/omap4/omap4.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/aosp-common
-
-LOCAL_PATH := device/samsung/espressowifi
+DEVICE_PACKAGE_OVERLAYS += \
+    $(LOCAL_PATH)/overlay/aosp-common
 
 PRODUCT_AAPT_CONFIG := large
 PRODUCT_AAPT_PREF_CONFIG := mdpi
diff --git a/device.mk b/device.mk
index bd22354..969bc42 100644
--- a/device.mk
+++ b/device.mk
@@ -15,7 +15,7 @@
 #
 
 # Include common device configuration
-$(call inherit-product, device/samsung/espressowifi/espresso-common.mk)
+$(call inherit-product, device/samsung/espressowifi/device-common.mk)
 
 # Include wifi-only overlays
 DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/aosp
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 0a6e40e..887cad6 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -18,9 +18,6 @@
 /system/bin/geomagneticd                    u:object_r:geomagneticd_exec:s0
 /system/bin/orientationd                    u:object_r:orientationd_exec:s0
 
-# GFX
-/dev/gcioctl                                u:object_r:video_device:s0
-
 # Bluetooth
 /dev/ttyO1                                                   u:object_r:hci_attach_dev:s0
 /efs/bluetooth(/.*)?                                         u:object_r:bluetooth_efs_file:s0