diff --git a/ttp/titan_pocket/BoardConfig.mk b/ttp/titan_pocket/BoardConfig.mk
index 69d7dae..c6efb47 100644
--- a/ttp/titan_pocket/BoardConfig.mk
+++ b/ttp/titan_pocket/BoardConfig.mk
@@ -1,8 +1,23 @@
-include build/make/target/board/generic_arm64_ab/BoardConfig.mk
-#include device/wephone/ttp/board-base.mk
+include build/make/target/board/BoardConfigGsiCommon.mk
 
-#ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-#else
-#BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-#endif
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+# 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
+
+# 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
\ No newline at end of file
diff --git a/ttp/ttp.mk b/ttp/ttp.mk
index 9925d15..a0b30c8 100644
--- a/ttp/ttp.mk
+++ b/ttp/ttp.mk
@@ -1,7 +1,7 @@
 include build/make/target/product/aosp_arm64_ab.mk
 
 PRODUCT_NAME := ttp
-#PRODUCT_DEVICE := titan_pocket
+PRODUCT_DEVICE := titan_pocket
 #PRODUCT_BRAND := wephone
 
 # This is for a device