diff --git a/BoardConfig9610.mk b/BoardConfig9610.mk
index 276f86f..0645a75 100644
--- a/BoardConfig9610.mk
+++ b/BoardConfig9610.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-TARGET_LINUX_KERNEL_VERSION := 4.4
+TARGET_LINUX_KERNEL_VERSION := 4.14
 
 TARGET_SOC_BASE := exynos9610
 
@@ -33,7 +33,7 @@
 BOARD_USE_DMA_BUF := true
 BOARD_USE_NON_CACHED_GRAPHICBUFFER := true
 BOARD_USE_GSC_RGB_ENCODER := true
-BOARD_USE_CSC_HW := false
+BOARD_USE_CSC_HW := true
 BOARD_USE_S3D_SUPPORT := false
 BOARD_USE_DEINTERLACING_SUPPORT := true
 BOARD_USE_HEVCENC_SUPPORT := true
@@ -41,12 +41,15 @@
 BOARD_USE_VP9DEC_SUPPORT := true
 BOARD_USE_VP9ENC_SUPPORT := true
 BOARD_USE_WFDENC_SUPPORT := false
-BOARD_USE_CUSTOM_COMPONENT_SUPPORT := false
+ifeq ($(BOARD_VENDOR), samsung)
+BOARD_USE_CUSTOM_COMPONENT_SUPPORT := true
+endif
 BOARD_USE_VIDEO_EXT_FOR_WFD_HDCP := true
 BOARD_USE_SINGLE_PLANE_IN_DRM := true
 BOARD_USE_WA_ION_BUF_REF := true
 
 # Audio
+ifneq ($(BOARD_VENDOR), samsung)
 BOARD_USES_GENERIC_AUDIO := false
 BOARD_USE_COMMON_AUDIOHAL := true
 BOARD_USE_CALLIOPE_AUDIOHAL := false
@@ -54,20 +57,16 @@
 BOARD_USE_OFFLOAD_AUDIO := true
 BOARD_USE_OFFLOAD_EFFECT := false
 BOARD_USE_SOUNDTRIGGER_HAL := false
+endif
 
 # HWComposer
-BOARD_HWC_VERSION := libhwc2.1
+BOARD_HWC_VERSION := hwc3
 TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
-BOARD_HDMI_INCAPABLE := true
 TARGET_USES_HWC2 := true
+ifneq ($(BOARD_VENDOR), samsung)
 HWC_SUPPORT_COLOR_TRANSFORM := true
+endif
 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
@@ -85,7 +84,10 @@
 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
+
+ifneq ($(BOARD_VENDOR), samsung)
+BOARD_USES_MOBICORE_TEE := true
 
 # MobiCore namespace
 PRODUCT_SOONG_NAMESPACES += hardware/samsung_slsi-linaro/exynos/tee/kinibi410
+endif
diff --git a/BoardConfig9611.mk b/BoardConfig9611.mk
new file mode 100644
index 0000000..fb4d03d
--- /dev/null
+++ b/BoardConfig9611.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/BoardConfig9610.mk
+TARGET_SOC_BASE := exynos9610