diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index d1f71a5..3948179 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -1,15 +1,36 @@
-include build/make/target/board/generic_arm_ab/BoardConfig.mk
-include device/wephone/cat/board-base.mk
+#
+# Copyright (C) 2017 The Android Open-Source 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.
+#
 
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
-endif
+include build/make/target/board/BoardConfigGsiCommon.mk
 
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_VARIANT := generic
+
+# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch
 TARGET_USES_64_BIT_BINDER := true
-BOARD_SYSTEMIMAGE_AS_SYSTEM := true
 
-# Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect MGSI
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+# TODO(jiyong) These might be SoC specific.
+#BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist
+#BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+#BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image
+#BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
 
-# Disable 64 bit mediadrmserver
-TARGET_ENABLE_MEDIADRM_64 :=
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy