diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index 891000a..db8e668 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -10,7 +10,8 @@ TARGET_CPU_ABI2 := armeabi
 # Builds upon the mainline config.
 #
 
-include build/make/target/board/BoardConfigMainlineCommon.mk
+include build/make/target/board/BoardConfigGsiCommon.mk
+#include build/make/target/board/BoardConfigMainlineCommon.mk
 
 TARGET_NO_KERNEL := true