diff --git a/APP_Framework/Framework/Make.defs b/APP_Framework/Framework/Make.defs
index 40d65f37f..68a24a4f8 100644
--- a/APP_Framework/Framework/Make.defs
+++ b/APP_Framework/Framework/Make.defs
@@ -1,5 +1,6 @@
 ############################################################################
 # APP_Framework/Framework/Make.defs
 ############################################################################
+CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework
 CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/transform_layer/nuttx
 include $(wildcard $(APPDIR)/../../../APP_Framework/Framework/*/Make.defs)
diff --git a/APP_Framework/Framework/Makefile b/APP_Framework/Framework/Makefile
index 10b9168ba..32a3a1005 100644
--- a/APP_Framework/Framework/Makefile
+++ b/APP_Framework/Framework/Makefile
@@ -1,29 +1,40 @@
-SRC_FILES := framework_init.c
-SRC_DIR :=  transform_layer 
+include $(KERNEL_ROOT)/.config
 
-ifeq ($(CONFIG_SUPPORT_SENSOR_FRAMEWORK),y)
-	SRC_DIR += sensor
+ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
+    include $(APPDIR)/Make.defs
+    CSRCS += framework_init.c
+    include $(APPDIR)/Application.mk
 endif
 
-ifeq ($(CONFIG_SUPPORT_CONNECTION_FRAMEWORK),y)
-	SRC_DIR += connection
+ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
+    SRC_FILES := framework_init.c
+    SRC_DIR :=  transform_layer 
+
+    ifeq ($(CONFIG_SUPPORT_SENSOR_FRAMEWORK),y)
+        SRC_DIR += sensor
+    endif
+
+    ifeq ($(CONFIG_SUPPORT_CONNECTION_FRAMEWORK),y)
+        SRC_DIR += connection
+    endif
+
+    ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK),y)
+        SRC_DIR += knowing
+    endif
+
+    ifeq ($(CONFIG_SUPPORT_CONTROL_FRAMEWORK),y)
+        SRC_DIR += control
+    endif
+
+    ifeq ($(CONFIG_CRYPTO),y)
+        SRC_DIR += security
+    endif
+
+    ifeq ($(CONFIG_MBEDTLS), y)
+        SRC_DIR += security
+    endif
+
+    include $(KERNEL_ROOT)/compiler.mk
+
 endif
 
-ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK),y)
-	SRC_DIR += knowing
-endif
-
-ifeq ($(CONFIG_SUPPORT_CONTROL_FRAMEWORK),y)
-	SRC_DIR += control
-endif
-
-ifeq ($(CONFIG_CRYPTO),y)
-	SRC_DIR += security
-endif
-
-ifeq ($(CONFIG_MBEDTLS), y)
-	SRC_DIR += security
-endif
-
-include $(KERNEL_ROOT)/compiler.mk
-