diff --git a/bsp/board/bl808dk/mcu/bl808_flash_d0.ld b/bsp/board/bl808dk/mcu/bl808_flash_d0.ld index f527e25a..0cc5b61e 100644 --- a/bsp/board/bl808dk/mcu/bl808_flash_d0.ld +++ b/bsp/board/bl808dk/mcu/bl808_flash_d0.ld @@ -200,6 +200,10 @@ SECTIONS *(.sdata2.*) . = ALIGN(4); + __bflog_tags_start__ = .; + *(.bflog_tags_array) + . = ALIGN(4); + __bflog_tags_end__ = .; __ram_data_end__ = .; } > ram_memory diff --git a/bsp/board/bl808dk/mcu/bl808_flash_m0.ld b/bsp/board/bl808dk/mcu/bl808_flash_m0.ld index 0e16e8c6..95965a23 100644 --- a/bsp/board/bl808dk/mcu/bl808_flash_m0.ld +++ b/bsp/board/bl808dk/mcu/bl808_flash_m0.ld @@ -215,6 +215,10 @@ SECTIONS *(.sdata2.*) . = ALIGN(4); + __bflog_tags_start__ = .; + *(.bflog_tags_array) + . = ALIGN(4); + __bflog_tags_end__ = .; __ram_data_end__ = .; } > ram_memory @@ -273,42 +277,5 @@ SECTIONS __HeapLimit = ORIGIN(ram_memory) + LENGTH(ram_memory); ASSERT(__HeapLimit - __HeapBase >= HeapMinSize, "heap region overflow") - .psmram_data (NOLOAD): - { - . = ALIGN(4); - __psram_data_start__ = .; - - /*__end__ = .;*/ - /*end = __end__;*/ - KEEP(*(.psram_data*)) - - . = ALIGN(4); - __psram_data_end__ = .; - } > ram_code - - .wifibss (NOLOAD) : - { - PROVIDE( __wifi_bss_start = ADDR(.wifibss) ); - PROVIDE( __wifi_bss_end = ADDR(.wifibss) + SIZEOF(.wifibss) ); - _sshram = . ; - *(SHAREDRAMIPC) - *(SHAREDRAM) - _eshram = . ; - *ipc_shared.o(COMMON) - *sdu_shared.o(COMMON) - *hal_desc.o(COMMON) - *txl_buffer_shared.o(COMMON) - *txl_frame_shared.o(COMMON) - *scan_shared.o(COMMON) - *scanu_shared.o(COMMON) - *mfp_bip.o(COMMON) - *me_mic.o(COMMON) - *(.wifi_ram*) - . = ALIGN(16); - } > ram_wifi - - PROVIDE( _heap_wifi_start = . ); - PROVIDE( _heap_wifi_size = ORIGIN(ram_wifi) + LENGTH(ram_wifi) - _heap_wifi_start ); - } diff --git a/examples/freertos/main.c b/examples/freertos/main.c index e13c9298..0f8aeab7 100644 --- a/examples/freertos/main.c +++ b/examples/freertos/main.c @@ -1,14 +1,9 @@ -#define DBG_TAG "MAIN" - -#include "bflb_mtimer.h" #include #include "semphr.h" -#include "log.h" #include "board.h" -BFLOG_DEFINE_TAG(MAIN, DBG_TAG, true); -#undef BFLOG_TAG -#define BFLOG_TAG BFLOG_GET_TAG(MAIN) +#define DBG_TAG "MAIN" +#include "log.h" static TaskHandle_t consumer_handle; static TaskHandle_t producer_handle; @@ -84,10 +79,6 @@ int main(void) LOG_I("[OS] Starting producer task...\r\n"); xTaskCreate(producer_task, (char *)"producer_task", 512, NULL, configMAX_PRIORITIES - 3, &producer_handle); -#ifdef CONFIG_BFLOG - log_restart(); -#endif - vTaskStartScheduler(); while (1) { diff --git a/examples/freertos/proj.conf b/examples/freertos/proj.conf index c880e088..32b0afe2 100644 --- a/examples/freertos/proj.conf +++ b/examples/freertos/proj.conf @@ -1,12 +1,12 @@ -set(CONFIG_BFLOG 1) +set(CONFIG_BFLOG 0) set(CONFIG_VSNPRINTF_FLOAT 1) set(CONFIG_VSNPRINTF_FLOAT_EX 1) set(CONFIG_VSNPRINTF_LONG_LONG 1) -set(CONFIG_LOG_DISABLE 0) -set(CONFIG_ASSERT_DISABLE 0) -set(CONFIG_LOG_LEVEL 3) -set(CONFIG_BFLOG_POOL_SIZE 1024) +#set(CONFIG_LOG_DISABLE 0) +#set(CONFIG_ASSERT_DISABLE 0) +#set(CONFIG_LOG_LEVEL 3) +#set(CONFIG_BFLOG_POOL_SIZE 1024) set(CONFIG_FREERTOS 1) \ No newline at end of file diff --git a/examples/helloworld/proj.conf b/examples/helloworld/proj.conf index eb155024..8a41a80b 100644 --- a/examples/helloworld/proj.conf +++ b/examples/helloworld/proj.conf @@ -4,7 +4,7 @@ set(CONFIG_VSNPRINTF_FLOAT 1) set(CONFIG_VSNPRINTF_FLOAT_EX 1) set(CONFIG_VSNPRINTF_LONG_LONG 1) -set(CONFIG_LOG_DISABLE 0) -set(CONFIG_ASSERT_DISABLE 0) -set(CONFIG_LOG_LEVEL 3) -set(CONFIG_BFLOG_POOL_SIZE 1024) \ No newline at end of file +#set(CONFIG_LOG_DISABLE 0) +#set(CONFIG_ASSERT_DISABLE 0) +#set(CONFIG_LOG_LEVEL 3) +#set(CONFIG_BFLOG_POOL_SIZE 1024) \ No newline at end of file