land: Inherit initial board fragments

Change-Id: I4850a63a1b66d8ce8984dca97313606c2f749f3d

BoardConfig.mk

@@ -15,8 +15,37 @@
 #
 
 DEVICE_PATH := device/xiaomi/land
+CM_PATH := vendor/cm/device/board
 
-include $(DEVICE_PATH)/PlatformConfig.mk
+# Inherit common ARM64 board fragments
+include $(CM_PATH)/common/arm64/architecture.mk
+include $(CM_PATH)/common/arm64/binder.mk
+
+# Inherit common board fragments
+include $(CM_PATH)/common/bluetooth.mk
+include $(CM_PATH)/common/bootloader.mk
+include $(CM_PATH)/common/camera.mk
+include $(CM_PATH)/common/cpusets.mk
+include $(CM_PATH)/common/gps.mk
+include $(CM_PATH)/common/lights.mk
+include $(CM_PATH)/common/recovery.mk
+include $(CM_PATH)/common/sepolicy.mk
+
+# Inherit QCOM board fragments
+include $(CM_PATH)/qcom/bluetooth.mk
+include $(CM_PATH)/qcom/cne.mk
+include $(CM_PATH)/qcom/fm.mk
+include $(CM_PATH)/qcom/per-mgr.mk
+include $(CM_PATH)/qcom/platform.mk
+include $(CM_PATH)/qcom/crypto.mk
+include $(CM_PATH)/qcom/ril.mk
+include $(CM_PATH)/qcom/sepolicy.mk
+include $(CM_PATH)/qcom/time.mk
+
+# Inherit Cyanogen board fragments
+include $(CM_PATH)/cyanogen/hardware.mk
+
+# Inherit device-specific board fragments
 include $(DEVICE_PATH)/board/*.mk
 
 # Inherit the proprietary files

PlatformConfig.mk

@@ -1,16 +0,0 @@
-# Platform
-TARGET_BOARD_PLATFORM := msm8937
-
-# Architecture
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-
-# Second architecture
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a53

board/00-qcom-platform-msm8937.mk

@@ -0,0 +1,2 @@
+# Platform
+TARGET_BOARD_PLATFORM := msm8937

board/bluetooth.mk

@@ -1,2 +0,0 @@
-# Bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth

board/bootloader.mk

@@ -1,4 +1,2 @@
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := MSM8937
-
-TARGET_NO_BOOTLOADER := true

board/camera.mk

@@ -1,2 +0,0 @@
-# Camera
-USE_DEVICE_SPECIFIC_CAMERA := true

board/cpusets.mk

@@ -1,2 +0,0 @@
-# CPUsets
-ENABLE_CPUSETS := true

board/gps.mk

@@ -1,2 +0,0 @@
-# GPS
-USE_DEVICE_SPECIFIC_GPS := true

board/hardware.mk

@@ -1,4 +0,0 @@
-# CM Hardware
-BOARD_USES_CYANOGEN_HARDWARE := true
-BOARD_HARDWARE_CLASS += \
-    hardware/cyanogen/cmhw

board/lights.mk

@@ -1,3 +1,2 @@
 # Lights
 BOARD_LIGHTS_VARIANT := aw2013
-TARGET_PROVIDES_LIBLIGHT := true

board/qcom-bluetooth.mk

@@ -1,4 +1,3 @@
-BOARD_HAVE_BLUETOOTH_QCOM := true
-
+# Bluetooth
 BLUETOOTH_HCI_USE_MCT := true
 QCOM_BT_USE_SMD_TTY := true

board/qcom-cne.mk

@@ -1,2 +0,0 @@
-# CNE
-BOARD_USES_QCNE := true

board/qcom-fm.mk

@@ -1,4 +0,0 @@
-# FM
-AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
-
-TARGET_QCOM_NO_FM_FIRMWARE := true

board/qcom-init.mk

@@ -0,0 +1,4 @@
+# Init
+TARGET_INIT_VENDOR_LIB := libinit_land
+TARGET_PLATFORM_DEVICE_BASE := /devices/soc.0/
+TARGET_RECOVERY_DEVICE_MODULES := libinit_land

board/qcom-keymaster.mk

@@ -1,5 +1,2 @@
-# Encryption
-TARGET_HW_DISK_ENCRYPTION := true
-
 # Keystore
 TARGET_KEYMASTER_WAIT_FOR_QSEE := true

board/qcom-platform.mk

@@ -1,22 +0,0 @@
-# Binder
-TARGET_USES_64_BIT_BINDER := true
-
-# Init
-TARGET_INIT_VENDOR_LIB := libinit_land
-TARGET_PLATFORM_DEVICE_BASE := /devices/soc.0/
-TARGET_RECOVERY_DEVICE_MODULES := libinit_land
-
-# Peripheral manager
-TARGET_PER_MGR_ENABLED := true
-
-# Power
-TARGET_POWERHAL_VARIANT := qcom
-
-# QCOM support
-BOARD_USES_QCOM_HARDWARE := true
-
-# RIL
-TARGET_RIL_VARIANT := caf
-
-# Time
-BOARD_USES_QC_TIME_SERVICES := true

board/qcom-sepolicy.mk

@@ -1,2 +0,0 @@
-# SELinux
-include device/qcom/sepolicy/sepolicy.mk

board/recovery.mk

@@ -1 +0,0 @@
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/fstab.qcom

board/sepolicy.mk

@@ -1,3 +0,0 @@
-# SELinux
-BOARD_SEPOLICY_DIRS += \
-    $(DEVICE_PATH)/sepolicy

device.mk

@@ -20,7 +20,7 @@ CM_PATH := vendor/cm/device/product
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay
 
-# Include common package config fragments
+# Include common product fragments
 include $(CM_PATH)/common/ant.mk
 include $(CM_PATH)/common/audio.mk
 include $(CM_PATH)/common/fingerprint.mk
@@ -30,11 +30,11 @@ include $(CM_PATH)/common/media.mk
 include $(CM_PATH)/common/perf.mk
 include $(CM_PATH)/common/snap.mk
 
-# Include QCOM package config fragments
+# Include QCOM product fragments
 include $(CM_PATH)/qcom/fm.mk
 include $(CM_PATH)/qcom/media.mk
 
-# Include device-specific package config fragments
+# Include device-specific product fragments
 include $(LOCAL_PATH)/product/*.mk
 
 # Inherit proprietary files