Merge pull request #142 from BaikalHu/iot_link

update Kconfig for GD
LiteOS · Jul 31, 2019 · b13d5a7 · b13d5a7
2 parents 85625d9 + b9f442a
commit b13d5a7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/Kconfig b/Kconfig
@@ -45,7 +45,6 @@ mainmenu "Huawei IoT Stack Configuration"
 					select DTLS
 				config EC20
 					bool "ec20"
-					select MQTT
 					select AT_ENABLE
 					select CJSON_ENABLE
 			endchoice

diff --git a/targets/GD32VF103V_EVAL/Demos/Kconfig b/targets/GD32VF103V_EVAL/Demos/Kconfig
@@ -21,6 +21,6 @@ endchoice
 config USER_DEMO
 	string
 	default "hello_world_demo" if Demo_Helloworld
-	default "oc_develop_template" if Demo_Develop
-	default "oc_oceanlink_template" if Demo_Oceanlink
+	default "oc_develop_demo" if Demo_Develop
+	default "oc_oceanlink_demo" if Demo_Oceanlink
 	default "none"
diff --git a/targets/GD32VF103V_EVAL/Demos/oc_develop_demo/defaults.sdkconfig b/targets/GD32VF103V_EVAL/Demos/oc_develop_demo/defaults.sdkconfig
@@ -16,13 +16,10 @@
 #CONFIG_OC_LWM2M_DEMO_TYPE:"none"  "oc_lwm2m_demo_dtls" and "oc_lwm2m_demo_nodtls" "oc_lwm2m_demo_bs_dtls"  "oc_lwm2m_demo_bearpi_template"
 #CONFIG_OC_MQTT_DEMO_TYPE:"none" "oc_mqtt_demo_static" "oc_mqtt_demo_bs"
 
-#this is for IoT Studio automatic generating kconfig compatibility
 CONFIG_OS_LiteOS=y
 CONFIG_RISCV32=y
 CONFIG_OC_MQTT=y
 CONFIG_EC20=y
-CONFIG_MQTT=y
-#
 
 CONFIG_OS_TYPE       = "liteos"
 CONFIG_ARCH_CPU_TYPE = "riscv32"
@@ -43,3 +40,4 @@ CONFIG_OC_LWM2M_DEMO_TYPE= "none"
 CONFIG_OC_MQTT_DEMO_TYPE= "none"
 
 CONFIG_USER_DEMO  = "oc_develop_demo"
+CONFIG_Demo_Develop = y
diff --git a/targets/GD32VF103V_EVAL/Demos/oc_oceanlink_demo/defaults.sdkconfig b/targets/GD32VF103V_EVAL/Demos/oc_oceanlink_demo/defaults.sdkconfig
@@ -16,13 +16,10 @@
 #CONFIG_OC_LWM2M_DEMO_TYPE:"none"  "oc_lwm2m_demo_dtls" and "oc_lwm2m_demo_nodtls" "oc_lwm2m_demo_bs_dtls"  "oc_lwm2m_demo_bearpi_template"
 #CONFIG_OC_MQTT_DEMO_TYPE:"none" "oc_mqtt_demo_static" "oc_mqtt_demo_bs"
 
-#this is for IoT Studio automatic generating kconfig compatibility
 CONFIG_OS_LiteOS=y
 CONFIG_RISCV32=y
 CONFIG_OC_MQTT=y
 CONFIG_EC20=y
-CONFIG_MQTT=y
-#
 
 CONFIG_OS_TYPE       = "liteos"
 CONFIG_ARCH_CPU_TYPE = "riscv32"
@@ -43,3 +40,4 @@ CONFIG_OC_LWM2M_DEMO_TYPE= "none"
 CONFIG_OC_MQTT_DEMO_TYPE= "none"
 
 CONFIG_USER_DEMO  = "oc_oceanlink_demo"
+CONFIG_Demo_Oceanlink = y