diff --git a/BoardConfig850.mk b/BoardConfig850.mk
new file mode 100644
index 0000000..b7d5639
--- /dev/null
+++ b/BoardConfig850.mk
@@ -0,0 +1,86 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 4.14
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
+
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := 3
+BOARD_USES_ALIGN_RESTRICTION := true
+BOARD_USES_ALIGN_RESTRICTION := true
+
+# Samsung OpenMAX Video
+BOARD_USE_DMA_BUF := true
+BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
+BOARD_USE_GSC_RGB_ENCODER := true
+BOARD_USE_CSC_HW := false
+BOARD_USE_S3D_SUPPORT := false
+BOARD_USE_DEINTERLACING_SUPPORT := true
+BOARD_USE_HEVCENC_SUPPORT := true
+BOARD_USE_HEVC_HWIP := false
+BOARD_USE_VP9DEC_SUPPORT := true
+BOARD_USE_VP9ENC_SUPPORT := true
+BOARD_USE_WFDENC_SUPPORT := false
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
+BOARD_USE_SINGLE_PLANE_IN_DRM := true
+BOARD_USE_WA_ION_BUF_REF := true
+
+# Audio
+BOARD_USES_GENERIC_AUDIO := true
+BOARD_USE_COMMON_AUDIOHAL := true
+BOARD_USE_CALLIOPE_AUDIOHAL := false
+BOARD_USE_AUDIOHAL := false
+BOARD_USE_AUDIOHAL_COMV1 := true
+BOARD_USE_SOUNDTRIGGER_HAL := false
+BOARD_USE_SOUNDTRIGGER_HAL_MMAP := false
+
+# HWComposer
+BOARD_HWC_VERSION := libhwc2.1
+TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
+BOARD_HDMI_INCAPABLE := true
+TARGET_USES_HWC2 := true
+HWC_SKIP_VALIDATE := true
+HWC_SUPPORT_COLOR_TRANSFORM := false
+TARGET_HAS_WIDE_COLOR_DISPLAY := false
+TARGET_USES_DISPLAY_RENDER_INTENTS := false
+#BOARD_USES_DISPLAYPORT := true
+#BOARD_USES_EXTERNAL_DISPLAY_POWERMODE := true
+BOARD_USES_EXYNOS_AFBC_FEATURE := false
+#BOARD_USES_HDRUI_GLES_CONVERSION := true
+BOARD_USES_HWC_SERVICES := false
+VSYNC_EVENT_PHASE_OFFSET_NS := 0
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 0
+
+# SCALER
+BOARD_USES_DEFAULT_CSC_HW_SCALER := true
+BOARD_DEFAULT_CSC_HW_SCALER := 4
+BOARD_USES_SCALER_M2M1SHOT := true
+BOARD_HAS_SCALER_ALIGN_RESTRICTION := true
+
+# LIBHWJPEG
+TARGET_USES_UNIVERSAL_LIBHWJPEG := true
+
+# Acryl
+BOARD_LIBACRYL_DEFAULT_SCALER := mscl_3830
+#BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
+#BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
+
+# MobiCore namespace
+PRODUCT_SOONG_NAMESPACES += hardware/samsung_slsi-linaro/exynos/tee/kinibi500
diff --git a/BoardConfig8895.mk b/BoardConfig8895.mk
new file mode 100644
index 0000000..c3e8e38
--- /dev/null
+++ b/BoardConfig8895.mk
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 4.4
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
+
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := 1
+BOARD_USES_ALIGN_RESTRICTION := true
+BOARD_USES_GRALLOC_ION_SYNC := true
+
+# Samsung OpenMAX Video
+BOARD_USE_DMA_BUF := true
+BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
+BOARD_USE_GSC_RGB_ENCODER := true
+BOARD_USE_CSC_HW := false
+BOARD_USE_S3D_SUPPORT := false
+BOARD_USE_DEINTERLACING_SUPPORT := true
+BOARD_USE_HEVCENC_SUPPORT := true
+BOARD_USE_HEVC_HWIP := false
+BOARD_USE_VP9DEC_SUPPORT := true
+BOARD_USE_VP9ENC_SUPPORT := true
+BOARD_USE_WFDENC_SUPPORT := false
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
+BOARD_USE_SINGLE_PLANE_IN_DRM := true
+BOARD_USE_WA_ION_BUF_REF := true
+
+# HWComposer
+BOARD_HWC_VERSION := libhwc2
+BOARD_HDMI_INCAPABLE := true
+BOARD_USES_HWC_SERVICES := false
+TARGET_USES_HWC2 := true
+HWC_SKIP_VALIDATE := true
+
+
+# SCALER
+BOARD_USES_DEFAULT_CSC_HW_SCALER := true
+BOARD_DEFAULT_CSC_HW_SCALER := 4
+BOARD_USES_SCALER_M2M1SHOT := true
+BOARD_HAS_SCALER_ALIGN_RESTRICTION := true
+
+# LIBHWJPEG
+TARGET_USES_UNIVERSAL_LIBHWJPEG := true
+
+# Acryl
+BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_8895
diff --git a/BoardConfig9610.mk b/BoardConfig9610.mk
new file mode 100644
index 0000000..276f86f
--- /dev/null
+++ b/BoardConfig9610.mk
@@ -0,0 +1,91 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 4.4
+
+TARGET_SOC_BASE := exynos9610
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
+
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := 3
+BOARD_USES_ALIGN_RESTRICTION := true
+BOARD_USES_GRALLOC_ION_SYNC := true
+BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
+BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
+
+# Samsung OpenMAX Video
+BOARD_USE_DMA_BUF := true
+BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
+BOARD_USE_GSC_RGB_ENCODER := true
+BOARD_USE_CSC_HW := false
+BOARD_USE_S3D_SUPPORT := false
+BOARD_USE_DEINTERLACING_SUPPORT := true
+BOARD_USE_HEVCENC_SUPPORT := true
+BOARD_USE_HEVC_HWIP := false
+BOARD_USE_VP9DEC_SUPPORT := true
+BOARD_USE_VP9ENC_SUPPORT := true
+BOARD_USE_WFDENC_SUPPORT := false
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
+BOARD_USE_SINGLE_PLANE_IN_DRM := true
+BOARD_USE_WA_ION_BUF_REF := true
+
+# Audio
+BOARD_USES_GENERIC_AUDIO := false
+BOARD_USE_COMMON_AUDIOHAL := true
+BOARD_USE_CALLIOPE_AUDIOHAL := false
+BOARD_USE_AUDIOHAL := true
+BOARD_USE_OFFLOAD_AUDIO := true
+BOARD_USE_OFFLOAD_EFFECT := false
+BOARD_USE_SOUNDTRIGGER_HAL := false
+
+# HWComposer
+BOARD_HWC_VERSION := libhwc2.1
+TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
+BOARD_HDMI_INCAPABLE := true
+TARGET_USES_HWC2 := true
+HWC_SUPPORT_COLOR_TRANSFORM := true
+HWC_SKIP_VALIDATE := true
+TARGET_HAS_WIDE_COLOR_DISPLAY := true
+TARGET_USES_DISPLAY_RENDER_INTENTS := true
+#BOARD_USES_DISPLAYPORT := true
+#BOARD_USES_EXTERNAL_DISPLAY_POWERMODE := true
+BOARD_USES_EXYNOS_AFBC_FEATURE := true
+#BOARD_USES_HDRUI_GLES_CONVERSION := true
+BOARD_USES_HWC_SERVICES := false
+VSYNC_EVENT_PHASE_OFFSET_NS := 0
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 0
+
+# SCALER
+BOARD_USES_DEFAULT_CSC_HW_SCALER := true
+BOARD_DEFAULT_CSC_HW_SCALER := 4
+BOARD_USES_SCALER_M2M1SHOT := true
+BOARD_HAS_SCALER_ALIGN_RESTRICTION := true
+
+# LIBHWJPEG
+TARGET_USES_UNIVERSAL_LIBHWJPEG := true
+
+# Acryl
+BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_9610
+BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
+BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
+BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
+
+# MobiCore namespace
+PRODUCT_SOONG_NAMESPACES += hardware/samsung_slsi-linaro/exynos/tee/kinibi410
diff --git a/BoardConfig9810.mk b/BoardConfig9810.mk
new file mode 100644
index 0000000..6ba9336
--- /dev/null
+++ b/BoardConfig9810.mk
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 4.4
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
+
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := 3
+BOARD_USES_ALIGN_RESTRICTION := true
+BOARD_USES_GRALLOC_ION_SYNC := true
+BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
+BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
+
+# Samsung OpenMAX Video
+BOARD_USE_DMA_BUF := true
+BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
+BOARD_USE_GSC_RGB_ENCODER := true
+BOARD_USE_CSC_HW := false
+BOARD_USE_S3D_SUPPORT := false
+BOARD_USE_DEINTERLACING_SUPPORT := true
+BOARD_USE_HEVCENC_SUPPORT := true
+BOARD_USE_HEVC_HWIP := false
+BOARD_USE_VP9DEC_SUPPORT := true
+BOARD_USE_VP9ENC_SUPPORT := true
+BOARD_USE_WFDENC_SUPPORT := false
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
+BOARD_USE_SINGLE_PLANE_IN_DRM := true
+BOARD_USE_WA_ION_BUF_REF := true
+
+# HWComposer
+BOARD_HWC_VERSION := libhwc2.1
+TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
+BOARD_HDMI_INCAPABLE := true
+TARGET_USES_HWC2 := true
+HWC_SUPPORT_COLOR_TRANSFORM := true
+HWC_SKIP_VALIDATE := true
+TARGET_HAS_WIDE_COLOR_DISPLAY := true
+TARGET_USES_DISPLAY_RENDER_INTENTS := true
+#BOARD_USES_DISPLAYPORT := true
+#BOARD_USES_EXTERNAL_DISPLAY_POWERMODE := true
+BOARD_USES_EXYNOS_AFBC_FEATURE := true
+#BOARD_USES_HDRUI_GLES_CONVERSION := true
+BOARD_USES_HWC_SERVICES := false
+VSYNC_EVENT_PHASE_OFFSET_NS := 0
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 0
+
+# SCALER
+BOARD_USES_DEFAULT_CSC_HW_SCALER := true
+BOARD_DEFAULT_CSC_HW_SCALER := 4
+BOARD_USES_SCALER_M2M1SHOT := true
+BOARD_HAS_SCALER_ALIGN_RESTRICTION := true
+
+# LIBHWJPEG
+TARGET_USES_UNIVERSAL_LIBHWJPEG := true
+
+# Acryl
+BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_9810
+BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
+BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
+BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
diff --git a/BoardConfig9820.mk b/BoardConfig9820.mk
new file mode 100644
index 0000000..154b1bc
--- /dev/null
+++ b/BoardConfig9820.mk
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_LINUX_KERNEL_VERSION := 4.14
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
+
+USE_OPENGL_RENDERER := true
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
+BOARD_USES_EXYNOS_GRALLOC_VERSION := 3
+BOARD_USES_ALIGN_RESTRICTION := true
+BOARD_USES_GRALLOC_ION_SYNC := true
+BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
+BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
+
+# Samsung OpenMAX Video
+BOARD_USE_DMA_BUF := true
+BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
+BOARD_USE_GSC_RGB_ENCODER := true
+BOARD_USE_CSC_HW := false
+BOARD_USE_S3D_SUPPORT := false
+BOARD_USE_DEINTERLACING_SUPPORT := true
+BOARD_USE_HEVCENC_SUPPORT := true
+BOARD_USE_HEVC_HWIP := false
+BOARD_USE_VP9DEC_SUPPORT := true
+BOARD_USE_VP9ENC_SUPPORT := true
+BOARD_USE_WFDENC_SUPPORT := false
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
+BOARD_USE_SINGLE_PLANE_IN_DRM := true
+BOARD_USE_WA_ION_BUF_REF := true
+
+# HWComposer
+BOARD_HWC_VERSION := libhwc2.1
+TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
+BOARD_HDMI_INCAPABLE := true
+TARGET_USES_HWC2 := true
+HWC_SUPPORT_COLOR_TRANSFORM := true
+HWC_SKIP_VALIDATE := true
+TARGET_HAS_WIDE_COLOR_DISPLAY := true
+TARGET_USES_DISPLAY_RENDER_INTENTS := true
+#BOARD_USES_DISPLAYPORT := true
+#BOARD_USES_EXTERNAL_DISPLAY_POWERMODE := true
+BOARD_USES_EXYNOS_AFBC_FEATURE := true
+#BOARD_USES_HDRUI_GLES_CONVERSION := true
+BOARD_USES_HWC_SERVICES := false
+VSYNC_EVENT_PHASE_OFFSET_NS := 0
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 0
+
+# SCALER
+BOARD_USES_DEFAULT_CSC_HW_SCALER := true
+BOARD_DEFAULT_CSC_HW_SCALER := 4
+BOARD_USES_SCALER_M2M1SHOT := true
+BOARD_HAS_SCALER_ALIGN_RESTRICTION := true
+
+# LIBHWJPEG
+TARGET_USES_UNIVERSAL_LIBHWJPEG := true
+
+# Acryl
+BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_9820
+BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
+BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9820_blter
+BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
diff --git a/BoardConfig9825.mk b/BoardConfig9825.mk
new file mode 100644
index 0000000..0a09cbc
--- /dev/null
+++ b/BoardConfig9825.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include hardware/samsung_slsi-linaro/config/BoardConfig9820.mk
+TARGET_SOC_BASE := exynos9820
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
new file mode 100644
index 0000000..fbdcb50
--- /dev/null
+++ b/BoardConfigCommon.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2022 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.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGET_BOARD_KERNEL_HEADERS := hardware/samsung_slsi-linaro/exynos/kernel-$(TARGET_LINUX_KERNEL_VERSION)-headers/kernel-headers
+TARGET_SLSI_VARIANT := linaro
+TARGET_SOC_NAME := exynos
+BOARD_USES_DT := true