From 43afc97890ab12f21fa89618a906609df415203a Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sat, 2 Jul 2016 14:04:29 +0200 Subject: More cleanup, reorder files and sync with AOSP - move CM specific defines to a seperate BoardConfigCM.mk Change-Id: I1b00e4bef03f4553cc62dc1f5f25a417ffb00866 --- BoardConfigCommon.mk | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'BoardConfigCommon.mk') 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 -- cgit v1.1