diff --git a/cat/bluetooth/bdroid_buildcfg.h b/cat/bluetooth/bdroid_buildcfg.h
new file mode 100644
index 0000000..166bd4a
--- /dev/null
+++ b/cat/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ *  Not a Contribution, Apache license notifications and license are retained
+ *  for attribution purposes only.
+ *
+ * Copyright (C) 2012 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.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+//#include <cutils/properties.h>
+#include <string.h>
+
+static inline const char* BtmDefLocalName()
+{
+#if 0
+    static char product_device[PROPERTY_VALUE_MAX];
+    //Huawei-defined property
+    property_get("ro.config.marketing_name", product_device, "");
+
+    if (strcmp(product_device, "") != 0)
+        return product_device;
+
+    // Fallback to ro.product.model
+    return "";
+#endif
+    return "hello";
+}
+
+static inline int BtmBypassExtraAclSetup() {
+#if 0
+    int8_t prop = property_get_bool("persist.sys.bt_acl_bypass", false);
+    return prop == true;
+#endif
+    return 1;
+}
+
+#define BTM_DEF_LOCAL_NAME BtmDefLocalName()
+#define BTM_BYPASS_EXTRA_ACL_SETUP BtmBypassExtraAclSetup()
+
+#endif
diff --git a/cat/board-base.mk b/cat/board-base.mk
new file mode 100644
index 0000000..52ae9b4
--- /dev/null
+++ b/cat/board-base.mk
@@ -0,0 +1,6 @@
+TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/wephone/cat/bluetooth
+TARGET_EXFAT_DRIVER := exfat
+DEVICE_FRAMEWORK_MANIFEST_FILE := device/phh/treble/framework_manifest.xml
+
+BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs
diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index c6861ba..5709423 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -1,26 +1,8 @@
-include build/make/target/board/BoardConfigGsiCommon.mk
-
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armvi8-a
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_ABI := armeabi-v8a
-TARGET_CPU_ABI2 := armeabi
-
-# TODO(b/111434759, b/111287060) SoC specific hacks
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
-BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
-
-# 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
-
-#TARGET_ENABLE_MEDIADRM_64 :=
-
-TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)
+include build/make/target/board/generic_arm_ab/BoardConfig.mk
+include device/wephone/cat/board-base.mk
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-else
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
 endif
+
+TARGET_USES_64_BIT_BINDER := true
diff --git a/cat/framework_manifest.xml b/cat/framework_manifest.xml
new file mode 100644
index 0000000..ea103c6
--- /dev/null
+++ b/cat/framework_manifest.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="framework">
+    <hal format="hidl">
+        <name>android.hardware.wifi.hostapd</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IHostapd</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>