diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a445ce9..e18382d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -58,6 +58,13 @@ BOARD_INCLUDE_DTB_IN_BOOTIMG := true
# Filesystem
TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs
+# HIDL
+DEVICE_MANIFEST_FILE := \
+ $(COMMON_PATH)/vintf/manifest_kalama.xml
+
+DEVICE_MATRIX_FILE := \
+ $(COMMON_PATH)/vintf/compatibility_matrix.xml
+
# Init Boot
BOARD_INIT_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
diff --git a/vintf/compatibility_matrix.xml b/vintf/compatibility_matrix.xml
new file mode 100644
index 0000000..4187436
--- /dev/null
+++ b/vintf/compatibility_matrix.xml
@@ -0,0 +1,96 @@
+
+
+
+ android.frameworks.sensorservice
+ 1.0
+
+ ISensorManager
+ default
+
+
+
+ android.hidl.allocator
+ 1.0
+
+ IAllocator
+ ashmem
+
+
+
+ android.hidl.manager
+ 1.0
+
+ IServiceManager
+ default
+
+
+
+ android.hidl.memory
+ 1.0
+
+ IMapper
+ ashmem
+
+
+
+ android.hidl.token
+ 1.0
+
+ ITokenManager
+ default
+
+
+
+ android.system.wifi.keystore
+ 1.0
+
+ IKeystore
+ default
+
+
+
+ vendor.qti.hardware.sigma_miracast
+ hwbinder
+ 1.0
+
+ Isigma_miracast
+ sigmahal
+ sigmahal64
+
+
+
+ vendor.qti.hardware.qccsyshal
+ hwbinder
+ 1.0-2
+
+ IQccsyshal
+ qccsyshal
+
+
+
diff --git a/vintf/manifest_kalama.xml b/vintf/manifest_kalama.xml
new file mode 100644
index 0000000..456bc7a
--- /dev/null
+++ b/vintf/manifest_kalama.xml
@@ -0,0 +1,607 @@
+
+
+
+
+ vendor.qti.hardware.capabilityconfigstore
+ hwbinder
+ 1.0
+
+ ICapabilityConfigStore
+ default
+
+
+
+ android.hardware.audio
+ hwbinder
+ 7.1
+
+ IDevicesFactory
+ default
+
+
+
+ android.hardware.audio.effect
+ hwbinder
+ 7.0
+
+ IEffectsFactory
+ default
+
+
+
+ android.hardware.media.omx
+ hwbinder
+
+ 1.0
+
+ IOmx
+ default
+
+
+ IOmxStore
+ default
+
+
+
+
+ vendor.qti.hardware.dsp
+ hwbinder
+ 1.0
+
+ IDspService
+ dspservice
+
+
+
+ android.hardware.keymaster
+ hwbinder
+ @4.0::IKeymasterDevice/strongbox
+
+
+ android.hardware.gatekeeper
+ hwbinder
+
+ 1.0
+
+ IGatekeeper
+ default
+
+
+
+
+ android.hardware.nfc
+ hwbinder
+ 1.2
+
+ INfc
+ default
+
+
+
+ vendor.nxp.hardware.nfc
+ hwbinder
+ 2.0
+
+ INqNfc
+ default
+
+
+
+
+ android.hardware.secure_element
+ hwbinder
+ 1.2
+
+ ISecureElement
+ eSE1
+ SIM1
+ SIM2
+
+
+
+
+ vendor.qti.esepowermanager
+ hwbinder
+ 1.1
+
+ IEsePowerManager
+ default
+
+
+
+
+ vendor.qti.hardware.qseecom
+ hwbinder
+ 1.0
+
+ IQSEECom
+ default
+
+
+
+
+ vendor.qti.hardware.sensorscalibrate
+ hwbinder
+ 1.0
+
+ ISensorsCalibrate
+ default
+
+
+
+
+ android.hardware.radio
+ hwbinder
+ @1.2::ISap/slot1
+ @1.2::ISap/slot2
+
+
+
+ com.qualcomm.qti.dpm.api
+ hwbinder
+ 1.0
+
+ IdpmQmi
+ dpmQmiService
+
+
+
+
+
+ vendor.qti.hardware.radio.uim_remote_client
+ hwbinder
+ 1.0
+
+ IUimRemoteServiceClient
+ uimRemoteClient0
+ uimRemoteClient1
+
+
+
+
+
+ vendor.qti.hardware.radio.uim_remote_server
+ hwbinder
+ 1.0
+
+ IUimRemoteServiceServer
+ uimRemoteServer0
+ uimRemoteServer1
+
+
+
+
+
+ vendor.qti.hardware.radio.lpa
+ hwbinder
+ 1.3
+
+ IUimLpa
+ UimLpa0
+ UimLpa1
+
+
+
+
+
+ vendor.qti.hardware.radio.uim
+ hwbinder
+ 1.2
+
+ IUim
+ Uim0
+ Uim1
+
+
+
+
+
+ vendor.qti.hardware.radio.internal.deviceinfo
+ hwbinder
+ 1.0
+
+ IDeviceInfo
+ deviceinfo
+
+
+
+
+
+ vendor.qti.imsrtpservice
+ hwbinder
+ 3.1
+
+ IRTPService
+ imsrtpservice
+
+
+
+
+ com.qualcomm.qti.uceservice
+ hwbinder
+ 2.3
+
+ IUceService
+ com.qualcomm.qti.uceservice
+
+
+
+
+ vendor.qti.ims.callinfo
+ hwbinder
+ 1.0
+
+ IService
+ default
+
+
+
+
+ com.qualcomm.qti.imscmservice
+ hwbinder
+ 2.2
+
+ IImsCmService
+ qti.ims.connectionmanagerservice
+
+
+
+ vendor.qti.ims.factory
+ hwbinder
+ 1.1
+ 2.2
+
+ IImsFactory
+ default
+
+
+
+ vendor.qti.data.factory
+ hwbinder
+ 2.7
+
+ IFactory
+ default
+
+
+
+
+ android.hardware.tetheroffload.config
+ hwbinder
+ 1.0
+
+ IOffloadConfig
+ default
+
+
+
+
+ android.hardware.tetheroffload.control
+ hwbinder
+ 1.1
+
+ IOffloadControl
+ default
+
+
+
+ vendor.qti.hardware.data.iwlan
+ hwbinder
+ 1.1
+
+ IIWlan
+ slot1
+ slot2
+
+
+
+
+ vendor.qti.hardware.data.latency
+ hwbinder
+ 1.0
+
+ ILinkLatency
+ default
+
+
+
+ vendor.qti.hardware.data.connection
+ hwbinder
+ 1.1
+
+ IDataConnection
+ slot1
+ slot2
+
+
+
+ vendor.qti.hardware.cacert
+ hwbinder
+ 1.0
+
+ IService
+ default
+
+
+
+
+ vendor.qti.hardware.factory
+ hwbinder
+ 1.1
+
+ IFactory
+ default
+
+
+
+
+ vendor.qti.hardware.iop
+ hwbinder
+ 2.0
+
+ IIop
+ default
+
+
+
+
+ vendor.qti.hardware.secureprocessor.device
+ hwbinder
+ 1.0
+
+ ISecureProcessor
+ qti-tee
+
+
+
+
+ android.hardware.bluetooth
+ hwbinder
+ 1.1
+
+ IBluetoothHci
+ default
+
+
+
+ vendor.qti.hardware.bluetooth_audio
+ hwbinder
+ 2.1
+
+ IBluetoothAudioProvidersFactory
+ default
+
+
+
+ vendor.qti.hardware.btconfigstore
+ hwbinder
+ 2.0
+
+ IBTConfigStore
+ default
+
+
+
+
+ vendor.qti.hardware.fm
+ hwbinder
+ 1.0
+
+ IFmHci
+ default
+
+
+
+
+ com.dsi.ant
+ hwbinder
+ 1.0
+
+ IAnt
+ default
+
+
+
+
+
+ vendor.qti.hardware.tui_comm
+ hwbinder
+ 1.0
+
+ ITuiComm
+ default
+
+
+
+
+
+ vendor.qti.hardware.soter
+ hwbinder
+ 1.0
+
+ ISoter
+ default
+
+
+
+
+ vendor.qti.hardware.alarm
+ hwbinder
+ 1.0
+
+ IAlarm
+ default
+
+
+
+
+
+ vendor.qti.hardware.wifi.wifilearner
+ hwbinder
+ 1.0
+
+ IWifiStats
+ wifiStats
+
+
+
+
+ vendor.qti.qspmhal
+ hwbinder
+ 1.0
+
+ IQspmhal
+ default
+
+
+
+
+ vendor.qti.hardware.trustedui
+ hwbinder
+ @1.2::ITrustedUI/default
+ @1.2::ITrustedUI/qtee-vm
+ @1.1::ITrustedInput/default
+ @1.1::ITrustedInput/qtee-vm
+
+
+
+ vendor.qti.hardware.bluetooth_sar
+ hwbinder
+ 1.1
+
+ IBluetoothSar
+ default
+
+
+
+
+ vendor.qti.spu
+ hwbinder
+ 1.1
+
+ ISPUManager
+ default
+
+
+
+ vendor.qti.spu
+ hwbinder
+ 2.0
+
+ ISPUManager
+ default
+
+
+
+
+ vendor.qti.hardware.qccvndhal
+ hwbinder
+ 1.0
+
+ IQccvndhal
+ qccvndhal
+
+
+
+
+ vendor.qti.hardware.embmssl
+ hwbinder
+ 1.1
+
+ IEmbms
+ embmsslServer0
+
+
+
+
+ vendor.qti.hardware.dpmservice
+ hwbinder
+ 1.1
+
+ IDpmService
+ DpmService
+
+
+
+
+ vendor.qti.qesdhal
+ hwbinder
+ 1.3
+
+ IQesdhal
+ default
+
+
+
+
+ vendor.qti.hardware.mwqemadapter
+ hwbinder
+ 1.0
+
+ IMwqemAdapter
+ MwqemAdapter
+
+
+