Merge branch 'master' into Add-xml-definition-for-service-area-cluster

Author: hicklin

src/platform/Ameba/CHIPDevicePlatformConfig.h

@@ -25,8 +25,13 @@
 #pragma once
 
 // ==================== Platform Adaptations ====================
-#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
+#endif
+
+#ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
+#endif
 
 #if CHIP_ENABLE_OPENTHREAD
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1