[Bouffalolab] Improve BL602&BL702 key-value accessing (project-chip#2…

…4574) * enable hardware crypto engine for mbedtls * remove duplicate dependency * fix restyle * move platform init to platform.cpp * update PSM region * enable ipv6 for wifi sub-module * fix restyle * fix compile error
wy-hh · Jan 22, 2023 · 8f926b8 · 8f926b8
1 parent 0783425
commit 8f926b8
Show file tree

Hide file tree

Showing 17 changed files with 226 additions and 164 deletions.
diff --git a/examples/lighting-app/bouffalolab/bl602/BUILD.gn b/examples/lighting-app/bouffalolab/bl602/BUILD.gn
@@ -110,6 +110,7 @@ bouffalolab_executable("lighting_app") {
     "${examples_plat_common_dir}/plat/aos_task.c",
     "${examples_plat_common_dir}/plat/demo_pwm.c",
     "${examples_plat_common_dir}/plat/main.cpp",
+    "${examples_plat_common_dir}/plat/platform.cpp",
     "${examples_plat_common_dir}/plat/uart.c",
   ]
 

diff --git a/examples/lighting-app/bouffalolab/bl602/CHIPProjectConfig.h b/examples/lighting-app/bouffalolab/bl602/CHIPProjectConfig.h
@@ -146,3 +146,5 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
 
 #define CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE 128
+
+#define CHIP_BLE_DEVICE_NAME "MatterLight"
diff --git a/examples/lighting-app/bouffalolab/bl702/BUILD.gn b/examples/lighting-app/bouffalolab/bl702/BUILD.gn
@@ -122,6 +122,7 @@ bouffalolab_executable("lighting_app") {
     "${examples_plat_common_dir}/plat/LEDWidget.cpp",
     "${examples_plat_common_dir}/plat/demo_pwm.c",
     "${examples_plat_common_dir}/plat/main.cpp",
+    "${examples_plat_common_dir}/plat/platform.cpp",
     "${examples_plat_common_dir}/plat/uart.c",
   ]
 

diff --git a/examples/lighting-app/bouffalolab/bl702/CHIPProjectConfig.h b/examples/lighting-app/bouffalolab/bl702/CHIPProjectConfig.h
@@ -133,3 +133,5 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
 
 #define CHIP_CONFIG_MAX_DEVICE_ADMINS 4 // 3 fabrics + 1 for rotation slack
+
+#define CHIP_BLE_DEVICE_NAME "MatterLight"
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp
@@ -17,8 +17,8 @@
  *    limitations under the License.
  */
 
-#include "AppConfig.h"
-#include "LEDWidget.h"
+#include <LEDWidget.h>
+#include <plat.h>
 
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
@@ -42,10 +42,8 @@
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 #include <NetworkCommissioningDriver.h>
-#include <app/clusters/network-commissioning/network-commissioning.h>
 #include <route_hook/bl_route_hook.h>
 #endif
-#include <PlatformManagerImpl.h>
 
 #if HEAP_MONITORING
 #include "MemMonitoring.h"
@@ -58,20 +56,11 @@
 #include <utils_list.h>
 #endif
 
-#if PW_RPC_ENABLED
-#include "PigweedLogger.h"
-#include "Rpc.h"
-#endif
-
 #if CONFIG_ENABLE_CHIP_SHELL
 #include <ChipShellCollection.h>
 #include <lib/shell/Engine.h>
 #endif
 
-#if CONFIG_ENABLE_CHIP_SHELL || PW_RPC_ENABLED
-#include "uart.h"
-#endif
-
 extern "C" {
 #include "board.h"
 #include <bl_gpio.h>
@@ -84,11 +73,6 @@ extern "C" {
 
 namespace {
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-chip::app::Clusters::NetworkCommissioning::Instance
-    sWiFiNetworkCommissioningInstance(0 /* Endpoint Id */, &(NetworkCommissioning::BLWiFiDriver::GetInstance()));
-#endif
-
 #if defined(BL706_NIGHT_LIGHT) || defined(BL602_NIGHT_LIGHT)
 ColorLEDWidget sLightLED;
 #else
@@ -117,118 +101,6 @@ AppTask AppTask::sAppTask;
 StackType_t AppTask::appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)];
 StaticTask_t AppTask::appTaskStruct;
 
-void PlatformManagerImpl::PlatformInit(void)
-{
-#if CONFIG_ENABLE_CHIP_SHELL || PW_RPC_ENABLED
-    uartInit();
-#endif
-
-#if PW_RPC_ENABLED
-    PigweedLogger::pw_init();
-#elif CONFIG_ENABLE_CHIP_SHELL
-    AppTask::StartAppShellTask();
-#endif
-
-#if HEAP_MONITORING
-    MemMonitoring::startHeapMonitoring();
-#endif
-
-    ChipLogProgress(NotSpecified, "Initializing CHIP stack");
-    CHIP_ERROR ret = PlatformMgr().InitChipStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        ChipLogError(NotSpecified, "PlatformMgr().InitChipStack() failed");
-        appError(ret);
-    }
-
-    chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("MatterLight");
-
-#if CHIP_ENABLE_OPENTHREAD
-
-#if CONFIG_ENABLE_CHIP_SHELL
-    cmd_otcli_init();
-#endif
-
-    ChipLogProgress(NotSpecified, "Initializing OpenThread stack");
-    ret = ThreadStackMgr().InitThreadStack();
-    if (ret != CHIP_NO_ERROR)
-    {
-        ChipLogError(NotSpecified, "ThreadStackMgr().InitThreadStack() failed");
-        appError(ret);
-    }
-
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
-#else
-    ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice);
-#endif
-    if (ret != CHIP_NO_ERROR)
-    {
-        ChipLogError(NotSpecified, "ConnectivityMgr().SetThreadDeviceType() failed");
-        appError(ret);
-    }
-
-#elif CHIP_DEVICE_CONFIG_ENABLE_WIFI
-
-    ret = sWiFiNetworkCommissioningInstance.Init();
-    if (CHIP_NO_ERROR != ret)
-    {
-        ChipLogError(NotSpecified, "sWiFiNetworkCommissioningInstance.Init() failed");
-    }
-#endif
-
-    chip::DeviceLayer::PlatformMgr().LockChipStack();
-
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
-#if CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY
-    chip::app::DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(EXT_DISCOVERY_TIMEOUT_SECS);
-#endif
-
-    // Init ZCL Data Model
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-
-    ret = chip::Server::GetInstance().Init(initParams);
-    if (ret != CHIP_NO_ERROR)
-    {
-        ChipLogError(NotSpecified, "chip::Server::GetInstance().Init(initParams) failed");
-        appError(ret);
-    }
-    chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-
-#if CHIP_ENABLE_OPENTHREAD
-    ChipLogProgress(NotSpecified, "Starting OpenThread task");
-    // Start OpenThread task
-    ret = ThreadStackMgrImpl().StartThreadTask();
-    if (ret != CHIP_NO_ERROR)
-    {
-        ChipLogError(NotSpecified, "ThreadStackMgr().StartThreadTask() failed");
-        appError(ret);
-    }
-#endif
-
-    ConfigurationMgr().LogDeviceConfig();
-
-    PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
-    PlatformMgr().AddEventHandler(AppTask::ChipEventHandler, 0);
-
-#ifdef OTA_ENABLED
-    chip::DeviceLayer::PlatformMgr().LockChipStack();
-    OTAConfig::Init();
-    chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-#endif // OTA_ENABLED
-
-#if PW_RPC_ENABLED
-    chip::rpc::Init();
-#endif
-
-    GetAppTask().PostEvent(AppTask::APP_EVENT_TIMER);
-
-    vTaskResume(GetAppTask().sAppTaskHandle);
-}
-
 void StartAppTask(void)
 {
     GetAppTask().sAppTaskHandle = xTaskCreateStatic(GetAppTask().AppTaskMain, APP_TASK_NAME, ArraySize(GetAppTask().appStack), NULL,
@@ -298,6 +170,8 @@ void AppTask::AppTaskMain(void * pvParameter)
         ChipLogError(NotSpecified, "PlatformMgr().StartEventLoopTask() failed");
         appError(ret);
     }
+
+    GetAppTask().PostEvent(AppTask::APP_EVENT_TIMER);
     vTaskSuspend(NULL);
 
 #ifndef LED_BTN_RESET

diff --git a/examples/lighting-app/bouffalolab/common/AppTask.h b/examples/lighting-app/bouffalolab/common/AppTask.h
@@ -1,7 +1,6 @@
 /*
  *
  *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +30,14 @@
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
+#define APP_BUTTON_PRESS_JITTER 50
+#define APP_BUTTON_PRESS_SHORT 1000
+#define APP_BUTTON_PRESS_LONG 4000
+
+#define APP_LIGHT_ENDPOINT_ID 1
+#define APP_REBOOT_RESET_COUNT 3
+#define APP_REBOOT_RESET_COUNT_KEY "app_reset_cnt"
+
 // Application-defined error codes in the CHIP_ERROR space.
 #define APP_ERROR_EVENT_QUEUE_FAILED CHIP_APPLICATION_ERROR(0x01)
 #define APP_ERROR_CREATE_TASK_FAILED CHIP_APPLICATION_ERROR(0x02)

diff --git a/examples/lighting-app/bouffalolab/common/ZclCallbacks.cpp b/examples/lighting-app/bouffalolab/common/ZclCallbacks.cpp
@@ -20,7 +20,7 @@
  *   This file implements the handler for data model messages.
  */
 
-#include "AppConfig.h"
+#include <plat.h>
 
 #include <AppTask.h>
 #include <app-common/zap-generated/ids/Attributes.h>

diff --git a/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_2M.toml b/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_2M.toml
@@ -41,7 +41,7 @@ type = 4
 name = "PSM"
 device = 0
 address0 = 0x1E9000
-size0 = 0x8000
+size0 = 0x4000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0

diff --git a/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_4M.toml b/examples/platform/bouffalolab/bl602/flash_config/partition_cfg_4M.toml
@@ -41,7 +41,7 @@ type = 4
 name = "PSM"
 device = 0
 address0 = 0x3C3000
-size0 = 0x33000
+size0 = 0x4000
 address1 = 0
 size1 = 0
 # compressed image must set len,normal image can left it to 0

diff --git a/examples/platform/bouffalolab/common/plat/MemMonitoring.cpp b/examples/platform/bouffalolab/common/plat/MemMonitoring.cpp
@@ -16,10 +16,9 @@
  *    limitations under the License.
  */
 
-#include "MemMonitoring.h"
-
-#include "AppConfig.h"
-#include "FreeRTOS.h"
+#include <FreeRTOS.h>
+#include <MemMonitoring.h>
+#include <plat.h>
 #include <platform/CHIPDeviceLayer.h>
 
 static StackType_t monitoringStack[MONITORING_STACK_SIZE_byte / sizeof(StackType_t)];

diff --git a/examples/platform/bouffalolab/common/plat/aos_task.c b/examples/platform/bouffalolab/common/plat/aos_task.c
@@ -6,17 +6,18 @@
  * web site:    https://www.bouffalolab.com/
  */
 
+#ifdef SYS_AOS_LOOP_ENABLE
+
 #include <FreeRTOS.h>
 #include <timers.h>
 
-#ifdef SYS_AOS_LOOP_ENABLE
 #include <vfs.h>
 
 #include <aos/kernel.h>
 #include <aos/yloop.h>
 #include <event_device.h>
 
-#include <AppConfig.h>
+#include <plat.h>
 
 static void aos_loop_proc(void * pvParameters)
 {

diff --git a/examples/platform/bouffalolab/common/plat/main.cpp b/examples/platform/bouffalolab/common/plat/main.cpp
@@ -25,11 +25,11 @@
 
 #include <FreeRTOS.h>
 
-#include "AppConfig.h"
 #include <AppTask.h>
 #include <easyflash.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPPlatformMemory.h>
+#include <plat.h>
 
 extern "C" {
 
@@ -329,6 +329,7 @@ extern "C" void START_ENTRY(void)
     app_init();
 
     easyflash_init();
+    ef_load_env_cache();
 
     ChipLogProgress(NotSpecified, "Init CHIP Memory");
     chip::Platform::MemoryInit(NULL, 0);

diff --git a/...ghting-app/bouffalolab/common/AppConfig.h → ...s/platform/bouffalolab/common/plat/plat.h b/...ghting-app/bouffalolab/common/AppConfig.h → ...s/platform/bouffalolab/common/plat/plat.h
@@ -1,7 +1,6 @@
 /*
  *
  *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,30 +18,14 @@
 
 #pragma once
 
-// ---- Lighting Example App Config ----
-
 #define APP_TASK_NAME "APP"
-
-#define APP_BUTTON_PRESS_JITTER 50
-#define APP_BUTTON_PRESS_SHORT 1000
-#define APP_BUTTON_PRESS_LONG 4000
-
 #define APP_TASK_PRIORITY 15
-#define EXT_DISCOVERY_TIMEOUT_SECS 20
-#define APP_LIGHT_ENDPOINT_ID 1
-#define APP_REBOOT_RESET_COUNT 3
-#define APP_REBOOT_RESET_COUNT_KEY "app_reset_cnt"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BL_LOG(...) printf(__VA_ARGS__);
-void appError(int err);
+#define EXT_DISCOVERY_TIMEOUT_SECS 20
 
 #ifdef __cplusplus
-}
-
 #include <lib/core/CHIPError.h>
 void appError(CHIP_ERROR error);
+#else
+void appError(int err);
 #endif