!9 release v1.1

Merge pull request !9 from xxkit/master

bk7231/bk7231_sdk/Makefile

@@ -31,10 +31,13 @@ SDK_LIBS = $(shell ./get_libs.sh $(SDK_LIBS_DIR))
 SDK_DEP1 = $(shell ls $(SDK_LIBS_DIR))
 SDK_DEP = $(addprefix $(SDK_LIBS_DIR)/, $(SDK_DEP1))
 
-OHOS_LIBS = $(shell ./get_libs.sh $(OUTPUT_DST_DIR)/libs)
+OHOS_LIBS1 = $(shell ./get_libs.sh $(OUTPUT_DST_DIR)/libs)
 OHOS_DEP1 = $(shell ls $(OUTPUT_DST_DIR)/libs)
 OHOS_DEP = $(addprefix $(OUTPUT_DST_DIR)/libs/, $(OHOS_DEP1))
 
+EXCLUDE = -lhichainsdk -lhuks_static #-lcjson_static
+OHOS_LIBS = $(filter-out $(EXCLUDE), $(OHOS_LIBS1))
+
 SDK_OBJS_DIR = sdk_objs
 SDK_OBJS1 = $(shell ls $(SDK_OBJS_DIR))
 #SDK_OBJS = 
@@ -50,13 +53,13 @@ LIBS += -L$(SDK_LIBS_DIR) -L$(EXTRA_LIBS_DIR) $(SDK_LIBS) $(EXTRA_LIBS) $(SDK_LI
 PREFIX = arm-none-eabi-
 
 CFLAGS = $(C_INCLUDES)
-CFLAGS += -g -mcpu=arm968e-s -march=armv5te -marm -mthumb-interwork -mlittle-endian -Os -std=c99 -ffunction-sections -Wall -Wno-format -Wno-unknown-pragmas -fsigned-char -fdata-sections -fno-strict-aliasing
+CFLAGS += -g -mcpu=arm968e-s -march=armv5te -marm -mthumb-interwork -mlittle-endian -Os -std=c99 -ffunction-sections -Wall -Wno-format -Wno-unknown-pragmas -fsigned-char -fdata-sections -fno-strict-aliasing -fno-omit-frame-pointer
 
 LINK_FLAGS = 
 LINK_FLAGS += -g -Wl,--gc-sections -marm -mthumb-interwork -mcpu=arm968e-s
 
 EXTRA_FLAGS = 
-EXTRA_FLAGS += -Wl,-wrap,printf -Wl,-wrap,vsnprintf -Wl,-wrap,snprintf -Wl,-wrap,sprintf -Wl,-wrap,puts
+EXTRA_FLAGS += -Wl,-wrap,printf -Wl,-wrap,vprintf -Wl,-wrap,vsnprintf -Wl,-wrap,snprintf -Wl,-wrap,sprintf -Wl,-wrap,puts
 #EXTRA_FLAGS += -Wl,-wrap,malloc -Wl,-wrap,_malloc_r -Wl,-wrap,free -Wl,-wrap,_free_r -Wl,-wrap,zalloc -Wl,-wrap,calloc -Wl,-wrap,realloc  -Wl,-wrap,_realloc_r
 EXTRA_FLAGS += -Wl,-wrap,malloc -Wl,-wrap,free -Wl,-wrap,zalloc -Wl,-wrap,calloc -Wl,-wrap,realloc
 
@@ -108,7 +111,7 @@ $(BUILD_DIR)/$(TARGET_OTA).bin : $(BUILD_DIR)/$(TARGET_OTA).elf
 $(BUILD_DIR)/$(TARGET_OTA).elf : $(OBJECTS) $(SDK_OBJS_DIR)/arch_main.o $(OHOS_DEP) $(SDK_DEP) $(EXTRA_DEP)
 	$(CC) $(OBJECTS) $(SDK_OBJS) $(EXTRA_FLAGS) -specs=nano.specs -T$(LDSCRIPT_OTA) $(LIBS) $(LINK_FLAGS) -Xlinker -Map=$(BUILD_DIR)/$(MAP_FILE_OTA) -o $@
 
-$(SDK_OBJS_DIR)/arch_main.o : $(SDK_LIBS_DIR)/libbk7231_sdk.a
+$(SDK_OBJS_DIR)/arch_main.o : #$(SDK_LIBS_DIR)/libbk7231_sdk.a
 	@echo "uppack libbk7231_sdk.a..."
 	rm -rf $(SDK_OBJS_DIR)
 	mkdir $(SDK_OBJS_DIR)

bk7231/bk7231_sdk/bk7231.ld

@@ -30,7 +30,7 @@
 /* Split memory into area for vectors and ram */
 MEMORY
 {
-	flash  (rx) : ORIGIN = 0x00000000, LENGTH = 2M
+	flash  (rx) : ORIGIN = 0x00010000, LENGTH = 4M
         tcm   (rw!x): ORIGIN = 0x003F0000, LENGTH = 60k
         itcm   (rwx): ORIGIN = 0x003FF000, LENGTH = 4k
         ram   (rw!x): ORIGIN = 0x00400100, LENGTH = 192k - 0x100
@@ -354,6 +354,11 @@ SECTIONS
 	    *(.data .data.*)
 	    *(.sdata) 
 	    *(.gnu.linkonce.d*)
+
+	    *(.igot.plt)
+	    *(.got) 
+	    *(.got.plt)
+	    
     	SORT(CONSTRUCTORS)
         } >ram AT>flash
         _end_data = .;

bk7231/bk7231_sdk/bk7231_ota.ld

@@ -30,7 +30,7 @@
 /* Split memory into area for vectors and ram */
 MEMORY
 {
-        flash  (rx) : ORIGIN = 0x00010000, LENGTH = 1088K
+        flash  (rx) : ORIGIN = 0x00010000, LENGTH = 1496K
         tcm   (rw!x): ORIGIN = 0x003F0000, LENGTH = 60k
         itcm   (rwx): ORIGIN = 0x003FF000, LENGTH = 4k
         ram   (rw!x): ORIGIN = 0x00400100, LENGTH = 192k - 0x100
@@ -372,6 +372,11 @@ SECTIONS
 	    *(.data .data.*)
 	    *(.sdata) 
 	    *(.gnu.linkonce.d*)
+	    
+	    *(.igot.plt)
+	    *(.got) 
+	    *(.got.plt)
+
     	SORT(CONSTRUCTORS)
         } >ram AT>flash
         _end_data = .;

bk7231/bk7231_sdk/config.gni

@@ -38,7 +38,7 @@ board_cflags = [
 board_cxx_flags = board_cflags
 board_ld_flags = []
 
-beken_sdk_dir = "${ohos_root_path}/device/bk_corp/bk72xx_liteosm_sdk"
+beken_sdk_dir = "${ohos_root_path}/device/bk_corp/bk7231/bk72xx_liteosm_sdk"
 
 # Board related headfiles search path.
 board_include_dirs = [

bk7231/bk7231_sdk/ohos_entry/BUILD.gn

@@ -0,0 +1,34 @@
+import("//build/lite/config/component/lite_component.gni")
+
+lite_component("ohos") {
+  features = [ ":ohos_entry" ]
+}
+
+static_library("ohos_entry") {
+  sources = [
+    "ohos_entry.c",
+
+  ]
+  deps = [
+    "${beken_sdk_dir}/os/liteos_m/kal:kal",
+    "//base/security/deviceauth/frameworks/deviceauth_lite:hichainsdk",
+    "//base/security/huks/frameworks/huks_lite:huks_sdk",
+    "${device_path}/../hals/communication/bluetooth:bluetooth",
+    "${device_path}/../hals/ohos_connect_adapter:hilink",
+
+  ]
+
+  include_dirs = [
+    "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr",
+    "//foundation/distributedschedule/samgr_lite/interfaces/kits/communication/broadcast",
+    "//foundation/distributedschedule/samgr_lite/samgr/adapter",
+    "//foundation/distributedschedule/samgr_lite/samgr/source",
+    "//foundation/communication/wifi_lite/interfaces/wifiservice",
+    "//utils/native/lite/hals/file",
+    "//foundation/hilink/include",
+    "//third_party/cJSON",
+    "//foundation/communication/bluetooth/interfaces/innerkits/native_c/include",
+    "//third_party/mbedtls/include",
+
+  ]
+}

bk7231/bk7231_sdk/ohos_entry/core_main.h

@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2020 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef LITE_CORE_MAIN_H
+#define LITE_CORE_MAIN_H
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif
+
+#define SYS_NAME(name, step) ".zinitcall.sys." #name #step ".init"
+#define MODULE_NAME(name, step) ".zinitcall." #name #step ".init"
+
+#define SYS_CALL(name, step)                                      \
+    do {                                                          \
+        InitCall *initcall = (InitCall *)(SYS_BEGIN(name, step)); \
+        InitCall *initend = (InitCall *)(SYS_END(name, step));    \
+        for (; initcall < initend; initcall++) {                  \
+            (*initcall)();                                        \
+        }                                                         \
+    } while (0)
+
+#define MODULE_CALL(name, step)                                      \
+    do {                                                             \
+        InitCall *initcall = (InitCall *)(MODULE_BEGIN(name, step)); \
+        InitCall *initend = (InitCall *)(MODULE_END(name, step));    \
+        for (; initcall < initend; initcall++) {                     \
+            (*initcall)();                                           \
+        }                                                            \
+    } while (0)
+
+#if (defined(__GNUC__) || defined(__clang__))
+
+#define SYS_BEGIN(name, step)                                 \
+    ({        extern InitCall __zinitcall_sys_##name##_start;       \
+        InitCall *initCall = &__zinitcall_sys_##name##_start; \
+        (initCall);                                           \
+    })
+
+#define SYS_END(name, step)                                 \
+    ({        extern InitCall __zinitcall_sys_##name##_end;       \
+        InitCall *initCall = &__zinitcall_sys_##name##_end; \
+        (initCall);                                         \
+    })
+
+#define MODULE_BEGIN(name, step)                          \
+    ({        extern InitCall __zinitcall_##name##_start;       \
+        InitCall *initCall = &__zinitcall_##name##_start; \
+        (initCall);                                       \
+    })
+#define MODULE_END(name, step)                          \
+    ({        extern InitCall __zinitcall_##name##_end;       \
+        InitCall *initCall = &__zinitcall_##name##_end; \
+        (initCall);                                     \
+    })
+
+#define SYS_INIT(name)     \
+    do {                   \
+        SYS_CALL(name, 0); \
+    } while (0)
+
+#define MODULE_INIT(name)     \
+    do {                      \
+        MODULE_CALL(name, 0); \
+    } while (0)
+
+#elif (defined(__ICCARM__))
+
+#define SYS_BEGIN(name, step) __section_begin(SYS_NAME(name, step))
+#define SYS_END(name, step) __section_end(SYS_NAME(name, step))
+#define MODULE_BEGIN(name, step) __section_begin(MODULE_NAME(name, step))
+#define MODULE_END(name, step) __section_end(MODULE_NAME(name, step))
+
+#pragma section = SYS_NAME(service, 0)
+#pragma section = SYS_NAME(service, 1)
+#pragma section = SYS_NAME(service, 2)
+#pragma section = SYS_NAME(service, 3)
+#pragma section = SYS_NAME(service, 4)
+#pragma section = SYS_NAME(feature, 0)
+#pragma section = SYS_NAME(feature, 1)
+#pragma section = SYS_NAME(feature, 2)
+#pragma section = SYS_NAME(feature, 3)
+#pragma section = SYS_NAME(feature, 4)
+#pragma section = MODULE_NAME(bsp, 0)
+#pragma section = MODULE_NAME(bsp, 1)
+#pragma section = MODULE_NAME(bsp, 2)
+#pragma section = MODULE_NAME(bsp, 3)
+#pragma section = MODULE_NAME(bsp, 4)
+#pragma section = MODULE_NAME(device, 0)
+#pragma section = MODULE_NAME(device, 1)
+#pragma section = MODULE_NAME(device, 2)
+#pragma section = MODULE_NAME(device, 3)
+#pragma section = MODULE_NAME(device, 4)
+#pragma section = MODULE_NAME(core, 0)
+#pragma section = MODULE_NAME(core, 1)
+#pragma section = MODULE_NAME(core, 2)
+#pragma section = MODULE_NAME(core, 3)
+#pragma section = MODULE_NAME(core, 4)
+#pragma section = MODULE_NAME(run, 0)
+#pragma section = MODULE_NAME(run, 1)
+#pragma section = MODULE_NAME(run, 2)
+#pragma section = MODULE_NAME(run, 3)
+#pragma section = MODULE_NAME(run, 4)
+
+#define SYS_INIT(name)     \
+    do {                   \
+        SYS_CALL(name, 0); \
+        SYS_CALL(name, 1); \
+        SYS_CALL(name, 2); \
+        SYS_CALL(name, 3); \
+        SYS_CALL(name, 4); \
+    } while (0)
+
+#define MODULE_INIT(name)     \
+    do {                      \
+        MODULE_CALL(name, 0); \
+        MODULE_CALL(name, 1); \
+        MODULE_CALL(name, 2); \
+        MODULE_CALL(name, 3); \
+        MODULE_CALL(name, 4); \
+    } while (0)
+
+#else
+#error Not support current compiler!
+#endif
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+#endif // LITE_CORE_MAIN_H

bk7231/bk7231_sdk/ohos_entry/ohos_entry.c

@@ -0,0 +1,123 @@
+#include <stdio.h>
+
+//#include "los_context.h"
+//#include "los_task.h"
+
+#include "core_main.h"
+#include <ohos_init.h>
+#include <samgr_lite.h>
+
+#include "cmsis_os2.h"
+#include "libc.h"
+#include "utils_file.h"
+#include "los_memory.h"
+#include "rtos_pub.h"
+#include "kitframework_client.h"
+#include "oem_auth_config.h"
+#include "oem_auth_result_storage.h"
+#include "ble_cfg_net_api.h"
+#include "ohos_bt_gatt_server.h"
+void StatusCallback(const AuthStatus* status)
+{
+    printf("Receiving Status!\n");
+    return;
+}
+#if 1
+unsigned int __stack_chk_guard = 0xd00a0dff;
+void __stack_chk_fail(VOID)
+{
+	printf("here you go!!!\n");
+    LOS_Panic("stack-protector: Kernel stack is corrupted in: %p\n",
+              __builtin_return_address(0));
+}
+#endif
+
+const char * const FUN_ARG_S = "0123456I";
+
+void HiLogPrintf(uint8 module, uint8 level, const char *nums, const char *fmt, ...)
+{
+}
+
+#include <stdarg.h>
+#include "uart_pub.h"
+void __wrap_vprintf(const char *fmt, va_list ap)
+{
+	char string[128];
+
+	__wrap_vsnprintf(string, sizeof(string) - 1, fmt, ap);
+	string[127] = 0;
+	bk_send_string(uart_print_port, string);
+}
+
+
+#include "wlan_cli_pub.h"
+#include "hilink.h"
+#include "ohos_bt_gatt.h"
+int HILINK_GetDevSurfacePower (char *power)
+{
+	return -1;
+}
+
+void hilink_bt_test_command(char *pcWriteBuffer, int xWriteBufferLen, int argc, char **argv)
+{
+	ble_test_main();
+}
+UINT32 OsGetAllTskInfo(VOID);
+
+extern void bk_token_cli_init(void);
+extern void bk_hilink_cli_init(void);
+
+static void hilink_handle(void const *argument)
+{
+	extended_app_waiting_for_launch();
+	bk_token_cli_init();
+	bk_hilink_cli_init();
+	hilink_start();
+}
+
+
+static int test_task222(void)
+{
+	osThreadId_t id;
+	osThreadAttr_t attr;
+
+    attr.name = "test_task222";
+    attr.attr_bits = 0U;
+    attr.cb_mem = NULL;
+    attr.cb_size = 0U;
+    attr.stack_mem = NULL;
+    attr.stack_size = 1024*2;
+    attr.priority = 30;
+	
+    id = osThreadNew((osThreadFunc_t)hilink_handle, NULL, &attr);
+    if (!id) {
+        printf("Task [test222] create failed\n");
+    } else {
+    	printf("Task [test222] create %p\n", id);
+    }
+	
+	return 0;
+}
+
+void OHOS_SystemInit(void)
+{
+	printf("@-OHOS-@\n");
+	printf("libc : %s\n", libc_get_version_string());
+
+    MODULE_INIT(bsp);
+    MODULE_INIT(device);
+    MODULE_INIT(core);
+    SYS_INIT(service);
+    SYS_INIT(feature);
+
+	MODULE_INIT(app_service);
+	MODULE_INIT(app_feature);
+    MODULE_INIT(run);
+	
+    SAMGR_Bootstrap();
+	printf("OHOS_SystemInit ok\n");
+
+	test_task222();
+
+    return;
+}

bk7231/bk7231_sdk/pack.json

@@ -12,7 +12,7 @@
         {
             "firmware": "bk7231_ota.bin",
             "partition": "app",
-            "size": "1156K",
+            "size": "1980K",
             "start_addr": "0x00011000",
             "version": "2M.1220"
         }

bk7231/bk72xx_liteosm_sdk/.config

@@ -0,0 +1,156 @@
+# Autogenerated by Makefile, DON'T EDIT
+ASSERT_HALT=1
+ASSERT_IGNORE=2
+ASSERT_REBOOT=3
+AT_SERVICE_CFG=0
+BLE_DEFAULT_WIFI_REQUEST=2
+BLE_VERSION_4_2=1
+BLE_VERSION_5_x=2
+BLE_WIFI_CO_REQUEST=3
+CFG_AIRKISS_TEST=0
+CFG_AP_MONITOR_COEXIST=0
+CFG_AP_SUPPORT_HT_IE=0
+CFG_ASSERT_OPTION=2
+CFG_BK_AWARE=0
+CFG_BK_AWARE_OUI="\xC8\x47\x8C"
+CFG_BLE_ADV_NUM=1
+CFG_BLE_CONN_NUM=1
+CFG_BLE_INIT_NUM=0
+CFG_BLE_SCAN_NUM=1
+CFG_BLE_VERSION=2
+CFG_EASY_FLASH=0
+CFG_ENABLE_BUTTON=0
+CFG_ENABLE_DEMO_TEST=0
+CFG_ENABLE_WPA_LOG=0
+CFG_FLASH_SELECTION_TYPE=0x400000
+CFG_FREERTOS_VER=1
+CFG_GENERAL_DMA=1
+CFG_IEEE80211N=1
+CFG_IEEE80211W=0
+CFG_INT_WDG_ENABLED=1
+CFG_INT_WDG_PERIOD_MS=10000
+CFG_IPERF_DONT_MALLOC_BUFFER=1
+CFG_IPERF_OPTIMIZE_THROUGHPUT=0
+CFG_IPERF_TEST=1
+CFG_IPERF_TEST_ACCEL=1
+CFG_JTAG_ENABLE=0
+CFG_LESS_MEMERY_IN_RWNX=0
+CFG_LWIP_MEM_POLICY=2
+CFG_MAC_PHY_BAPASS=1
+CFG_MSDU_RESV_HEAD_LEN=96
+CFG_MSDU_RESV_TAIL_LEN=16
+CFG_PERIPHERAL_TEST=0
+CFG_REAL_SDIO=0
+CFG_RELEASE_FIRMWARE=0
+CFG_ROLE_LAUNCH=0
+CFG_RUNNING_PLATFORM=1
+CFG_RWNX_QOS_MSDU=1
+CFG_RX_SENSITIVITY_TEST=1
+CFG_SARADC_CALIBRATE=1
+CFG_SDIO=0
+CFG_SDIO_TRANS=0
+CFG_SOC_NAME=5
+CFG_SUPPORT_BKREG=1
+CFG_SUPPORT_BLE=1
+CFG_SUPPORT_BLE_MESH=0
+CFG_SUPPORT_BSSID_CONNECT=0
+CFG_SUPPORT_CALIBRATION=1
+CFG_SUPPORT_CCD=CFG_SUPPORT_CCD
+CFG_SUPPORT_HID=CFG_SUPPORT_HID
+CFG_SUPPORT_MANUAL_CALI=1
+CFG_SUPPORT_MSD=CFG_SUPPORT_MSD
+CFG_SUPPORT_OTA_HTTP=1
+CFG_SUPPORT_OTA_TFTP=0
+CFG_SUPPORT_RTOS=4
+CFG_SUPPORT_SARADC=1
+CFG_SUPPORT_SPI_TEST=0
+CFG_SUPPORT_TIANZHIHENG_DRONE=0
+CFG_SUPPORT_TPC_PA_MAP=1
+CFG_SUPPORT_UVC=CFG_SUPPORT_UVC
+CFG_SYS_REDUCE_NORMAL_POWER=0
+CFG_TASK_WDG_ENABLED=1
+CFG_TASK_WDG_PERIOD_MS=60000
+CFG_TCP_SERVER_TEST=0
+CFG_TX_EVM_TEST=1
+CFG_UART_DEBUG=0
+CFG_UDISK_MP3=0
+CFG_USB=0
+CFG_USE_AP_IDLE=0
+CFG_USE_AP_PS=0
+CFG_USE_AUD_ADC=0
+CFG_USE_AUD_DAC=0
+CFG_USE_AUDIO=0
+CFG_USE_BLE_PS=1
+CFG_USE_CAMERA_INTF=0
+CFG_USE_DEEP_PS=1
+CFG_USE_DHCP=1
+CFG_USE_FAKERTC_PS=0
+CFG_USE_FORCE_LOWVOL_PS=0
+CFG_USE_FTPD_UPGRADE=0
+CFG_USE_I2C1=0
+CFG_USE_I2C2=1
+CFG_USE_LWIP_NETSTACK=1
+CFG_USE_MCU_PS=1
+CFG_USE_PTA=0
+CFG_USE_SDCARD_HOST=0
+CFG_USE_SPI_DMA=1
+CFG_USE_SPIDMA=0
+CFG_USE_SPI_MASTER=1
+CFG_USE_SPI_SLAVE=1
+CFG_USE_STA_PS=1
+CFG_USE_TEMPERATURE_DETECT=1
+CFG_USE_TICK_CAL=1
+CFG_USE_UART1=1
+CFG_USE_USB_CHARGE=0
+CFG_USE_USB_HOST=0
+CFG_USE_WPA_29=1
+CFG_WFA_CERT=0
+CFG_WIFI_RAW_TX_CMD=0
+CFG_WIFI_SENSOR=0
+CFG_WLAN_FAST_CONNECT=0
+CFG_WPA3=0
+CFG_WPA_CTRL_IFACE=1
+CFG_XTAL_85DEGREE=0
+CFG_XTAL_FREQUENCE=26000000
+CFG_XTAL_FREQUENCE_26M=26000000
+CFG_XTAL_FREQUENCE_40M=40000000
+CONFIG_APP_MP3PLAYER=0
+ENC_METHOD_AES=3
+ENC_METHOD_NULL=1
+ENC_METHOD_XOR=2
+FAST_CONNECT_INFO_ENC_METHOD=1
+FLASH_SELECTION_TYPE_2M=0x200000
+FLASH_SELECTION_TYPE_4M=0x400000
+FLASH_SELECTION_TYPE_8M=0x800000
+FLASH_SELECTION_TYPE_DYNAMIC=0
+FOR_SDIO_BLK_512=FOR_SDIO_BLK_512
+FPGA_PLATFORM=0
+FREERTOS_V10=2
+FREERTOS_V9=1
+LWIP_DEFAULT_MEM_POLICY=1
+LWIP_REDUCE_THE_PLAN=2
+OSMALLOC_STATISTICAL=0
+RF_USE_POLICY=1
+RTOS_ALIOS_THINGS=1
+RTOS_FREERTOS=3
+RTOS_LITEOS=4
+RTOS_RT_THREAD=2
+SOC_BK7221U=3
+SOC_BK7231=1
+SOC_BK7231N=5
+SOC_BK7231U=2
+SOC_BK7271=4
+SOC_PLATFORM=1
+THD_APPLICATION_PRIORITY=3
+THD_CORE_PRIORITY=2
+THDD_KEY_SCAN_PRIORITY=7
+THD_EXTENDED_APP_PRIORITY=5
+THD_HOSTAPD_PRIORITY=5
+THD_INIT_PRIORITY=4
+THD_LWIP_PRIORITY=4
+THD_MEDIA_PRIORITY=4
+THD_RECONNECT_PRIORITY=4
+THD_UBG_PRIORITY=5
+THD_UMP3_PRIORITY=4
+THD_WPAS_PRIORITY=5
+WIFI_DEFAULT_BLE_REQUEST=1

bk7231/bk72xx_liteosm_sdk/application.mk

@@ -67,6 +67,7 @@ INCLUDES += -I./os/liteos_m/components/cpup
 INCLUDES += -I./os/liteos_m/components/power
 INCLUDES += -I./os/liteos_m/components/port
 INCLUDES += -I./os/liteos_m/components/bounds_checking_function/include/
+INCLUDES += -I./os/liteos_m/components/backtrace
 INCLUDES += -I./os/liteos_m/kernel/include/
 INCLUDES += -I./os/liteos_m/kernel/arch/include/
 INCLUDES +=  -I./os/liteos_m/targets/bk72xx/
@@ -188,6 +189,7 @@ SRC_OS += ./os/FreeRTOSv9.0.0/FreeRTOS/Source/timers.c
 endif
 
 ifeq ("${CFG_SUPPORT_RTOS}", "4")
+SRC_C += ./demos/common/json/cJSON.c
 SRC_C += ./os/liteos_m/kernel/src/mm/los_membox.c
 SRC_C += ./os/liteos_m/kernel/src/mm/los_memory.c
 SRC_C += ./os/liteos_m/kernel/src/los_event.c
@@ -245,6 +247,7 @@ SRC_C += ./os/liteos_m/components/bounds_checking_function/src/wcstok_s.c
 SRC_C += ./os/liteos_m/components/bounds_checking_function/src/wmemcpy_s.c                           
 SRC_C += ./os/liteos_m/components/bounds_checking_function/src/wmemmove_s.c                          
 SRC_C += ./os/liteos_m/components/bounds_checking_function/src/wscanf_s.c                         
+SRC_C += ./os/liteos_m/components/backtrace/los_backtrace.c                         
 SRC_C += ./os/liteos_m/components/power/los_pm.c                       
 SRC_C += ./os/liteos_m/components/exchook/los_exc_info.c
 SRC_C += ./os/liteos_m/utils/los_error.c
@@ -355,6 +358,7 @@ CFLAGS = -DCFG_SUPPORT_LITEOS=1
 endif
 CFLAGS += -g -mthumb -mcpu=arm968e-s -march=armv5te -mthumb-interwork -mlittle-endian -Os -std=c99 -ffunction-sections -Wall -Werror -Wno-format -Wno-unknown-pragmas -fsigned-char -fdata-sections -nostdlib -fno-strict-aliasing
 CFLAGS += -DWIFI_BLE_COEXIST
+CFLAGS += -fno-common
 
 ifeq ("${CFG_MBEDTLS}", "1")
 CFLAGS += -DMBEDTLS_CONFIG_FILE=\"tls_config.h\"
@@ -426,7 +430,7 @@ endif
 	$(Q)$(ENCRYPT) $(BIN_DIR)/$(SOC_NAME_BIN) 0 $(ENCRYPT_ARGS) > /dev/null
 	$(Q)$(LD) $(LFLAGS) -o $(BIN_DIR)/$(SOC_NAME_BSP_ELF) $(OBJ_LIST) $(OBJ_S_LIST) $(OBJ_OS_LIST) $(LIBFLAGS) -T./build/$(SOC_NAME_BSP_LDS) -Xlinker -Map=$(BIN_DIR)/$(SOC_NAME_BSP_MAP)
 	$(Q)$(OBJCOPY) -O binary $(BIN_DIR)/$(SOC_NAME_BSP_ELF) $(BIN_DIR)/$(SOC_NAME_BSP_BIN)
-	$(Q)(cd ./tools/beken_packager; $(ECHO) "  $(GREEN)PACK $(SOC_NAME_BSP_BIN)$(NC)"; if [ "$(Q)" = "@" ]; then python ./beken_packager_wrapper -i $(CFG_SOC_NAME) > /dev/null; else python ./beken_packager_wrapper -i $(CFG_SOC_NAME); fi)
+	$(Q)(cd ./tools/beken_packager; $(ECHO) "  $(GREEN)PACK $(SOC_NAME_BSP_BIN)$(NC)"; if [ "$(Q)" = "@" ]; then python ./beken_packager_wrapper -i $(CFG_SOC_NAME) -s $(CFG_FLASH_SELECTION_TYPE) > /dev/null; else python ./beken_packager_wrapper -i $(CFG_SOC_NAME) -s $(CFG_FLASH_SELECTION_TYPE); fi)
 
 ifeq ("${CFG_SUPPORT_RTOS}", "4")
 # -------------------------------------------------------------------	

bk7231/bk72xx_liteosm_sdk/beken378/app/app.h

@@ -52,7 +52,7 @@ typedef struct bus_message
 #if (CFG_SUPPORT_ALIOS)
 #define CORE_STACK_SIZE           (4 * 1024)
 #else
-#define CORE_STACK_SIZE           (2 * 1024)
+#define CORE_STACK_SIZE           (1 * 1024)
 #endif
 
 typedef struct _wifi_core_

bk7231/bk72xx_liteosm_sdk/beken378/app/config/sys_config_bk7231n.h

@@ -109,8 +109,9 @@
 #define CFG_UART_DEBUG                             0
 #define CFG_SUPPORT_BKREG                          1
 #define CFG_ENABLE_WPA_LOG                         0
-#define CFG_IPERF_TEST                             0
+#define CFG_IPERF_TEST                             1
 #if CFG_IPERF_TEST
+#define CFG_IPERF_OPTIMIZE_THROUGHPUT              0
 #define CFG_IPERF_TEST_ACCEL                       1
 #define CFG_IPERF_DONT_MALLOC_BUFFER               1
 #endif
@@ -279,7 +280,7 @@
 
 #define LWIP_DEFAULT_MEM_POLICY                   1
 #define LWIP_REDUCE_THE_PLAN                      2
-#if CFG_IPERF_TEST
+#if CFG_IPERF_OPTIMIZE_THROUGHPUT
 /* for iperf test, temporary enlarge lwip MEM_SIZE */
 #define CFG_LWIP_MEM_POLICY                       LWIP_DEFAULT_MEM_POLICY
 #else

bk7231/bk72xx_liteosm_sdk/beken378/beken_src.mk

@@ -736,6 +736,9 @@ endif
 SRC_S +=  ./beken378/driver/entry/boot_vectors.S
 
 ifeq ("${CFG_SUPPORT_RTOS}", "4")
+ifeq ("${CFG_IPERF_TEST}", "1")
+SRC_C += ./demos/net/iperf/iperf.c
+endif
 SRC_S +=  ./beken378/driver/entry/boot_handlers_liteos.S
 endif