From 8391c5e994e28af68df23203fbeba85aa18cdd51 Mon Sep 17 00:00:00 2001 From: arian Date: Sun, 7 Apr 2019 19:20:08 +0200 Subject: shinano-common: Clean up BoardConfigCommon * reorganize alphabetically * use COMMON_PATH * Commonize some kernel configs * drop MALLOC_SVELTE which is deprecated * drop TARGET_DTB_EXTRA_FLAGS which is deprecated * drop doubled BOARD_USES_ALSA_AUDIO * drop doubled USE_LEGACY_LOCAL_AUDIO_HAL * enable AUDIO_FEATURE_ENABLED_HFP * drop BOARD_HAVE_ALTERNATE_FM which is deprecated * drop BOARD_DISABLE_FMRADIO_LIBJNI which is deprecated * drop TARGET_PROVIDES_GPS_LOC_API which is deprecated Change-Id: I72cd88b52134dd68c7756635471feeb73c717afe --- BoardConfigCommon.mk | 103 +++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e3bec4b..41b1a0f 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -1,4 +1,5 @@ -# Copyright (C) 2013 The CyanogenMod Project +# Copyright (C) 2013-2016 The CyanogenMod Project +# (C) 2017-2019 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,98 +16,88 @@ # inherit from msm8974-common include device/sony/msm8974-common/BoardConfigCommon.mk -TARGET_SPECIFIC_HEADER_PATH += device/sony/shinano-common/include +COMMON_PATH := device/sony/shinano-common + +TARGET_SPECIFIC_HEADER_PATH += $(COMMON_PATH)/include # Platform BOARD_VENDOR_PLATFORM := shinano PRODUCT_PLATFORM:= shinano -# Kernel information -BOARD_KERNEL_BASE := 0x00000000 -BOARD_KERNEL_PAGESIZE := 2048 -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M -BOARD_KERNEL_IMAGE_NAME := zImage -BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01E00000 -BOARD_KERNEL_SEPARATED_DT := true -TARGET_DTB_EXTRA_FLAGS := --force-v2 +# Kernel +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M # Audio -BOARD_USES_ALSA_AUDIO := true +AUDIO_FEATURE_DISABLED_FM_VIRTUAL_RECORD := true AUDIO_FEATURE_ENABLED_ANC_HEADSET := true -AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true -AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true +AUDIO_FEATURE_ENABLED_AUXPCM_BT := true AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true +AUDIO_FEATURE_ENABLED_HFP := true +AUDIO_FEATURE_ENABLED_HWDEP_CAL := true +AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true +AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL := true AUDIO_FEATURE_ENABLED_NEW_SAMPLE_RATE = true +AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true -AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL := true -AUDIO_FEATURE_DISABLED_FM_VIRTUAL_RECORD := true -AUDIO_FEATURE_ENABLED_AUXPCM_BT := true -AUDIO_FEATURE_ENABLED_HWDEP_CAL := true + USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 -# FM -BOARD_HAVE_ALTERNATE_FM := true -BOARD_HAVE_BCM_FM := true +# Binder API version +TARGET_USES_64_BIT_BINDER := true # Bluetooth BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/shinano-common/bluetooth -BOARD_CUSTOM_BT_CONFIG := device/sony/shinano-common/bluetooth/vnd_shinano.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth +BOARD_CUSTOM_BT_CONFIG := $(COMMON_PATH)/bluetooth/vnd_shinano.txt # BT/FM (Broadcom): Adjust the sysfs patch for 3.4 kernel BOARD_HAVE_BCM_FM_SYSFS := "/sys/bus/platform/drivers/bcm_ldisc/bcm_ldisc/" BOARD_BRCM_HCI_NUM := 26 -# Binder API version -TARGET_USES_64_BIT_BINDER := true - # Camera TARGET_USES_MEDIA_EXTENSIONS := true -# GPS -TARGET_PROVIDES_GPS_LOC_API := true +# Filesystem +BOARD_FLASH_BLOCK_SIZE := 131072 +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_USE_F2FS := true + +# FM +BOARD_HAVE_BCM_FM := true # Init TARGET_INIT_VENDOR_LIB := libinit_shinano -# Keystore -TARGET_KEYMASTER_WAIT_FOR_QSEE := true +# Partition information +BOARD_BOOTIMAGE_PARTITION_SIZE := 20971520 +BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216 +BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2671771648 + +# Recovery +TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_PIXEL_FORMAT := "RGBA_8888" # SELinux BOARD_SEPOLICY_DIRS += \ - device/sony/shinano-common/sepolicy + $(COMMON_PATH)/sepolicy -#Sensors +# Sensors USE_SENSOR_MULTI_HAL := true -# Wifi -BOARD_WLAN_DEVICE := bcmdhd -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -WPA_SUPPLICANT_VERSION := VER_0_8_X -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd -WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" - # Shims TARGET_LD_SHIM_LIBS += \ /system/lib/libsomc_chokoballpal.so|/vendor/lib/libshim_camera.so -# Filesystem -BOARD_FLASH_BLOCK_SIZE := 131072 -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_USERIMAGES_USE_F2FS := true - -# Partition information -BOARD_BOOTIMAGE_PARTITION_SIZE := 20971520 -BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216 -BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2671771648 - -# Recovery -TARGET_RECOVERY_FSTAB := device/sony/shinano-common/rootdir/etc/fstab.qcom -TARGET_RECOVERY_PIXEL_FORMAT := "RGBA_8888" +# Wifi +BOARD_WLAN_DEVICE := bcmdhd +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" +WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" -- cgit v1.2.3