Merge branch 'bouffalolab:master' into override-makefile

README.md

@@ -135,7 +135,7 @@ If flash using serial port rather than USB, different USB2TTL chips support diff
 
 ## Chip Manual
 
-**Chip Reference Manual** and **Chip Data Manual** are listed on [document](https://dev.bouffalolab.com/document)
+**Chip Reference Manual** and **Chip Data Manual** are listed on [document](https://github.com/bouffalolab/bl_docs)
 
 ## Documentation Tutorial
 

README_zh.md

@@ -133,7 +133,7 @@ make flash CHIP=chip_name CPU_ID=m0 COMX=xxx # chip_name should be bl602/bl702/b
 
 # 芯片手册
 
-芯片数据手册和参考手册见 [文档](https://dev.bouffalolab.com/document)。
+芯片数据手册和参考手册见 [文档](https://github.com/bouffalolab/bl_docs)。
 
 # 文档教程
 

cmake/gen_c_cpp_properties_json.cmake

@@ -10,7 +10,8 @@ foreach(item ${C_CPP_PROPERTIES_INCLUDE})
 endforeach()
 
 foreach(item ${C_CPP_PROPERTIES_DEFINES})
-    string(APPEND C_CPP_PROPERTIES_DEFINES_IN "\n                \"${item}\",")
+    string(REGEX REPLACE "([^\"])([\"])" "\\1\\\\\"" nitem ${item})
+    string(APPEND C_CPP_PROPERTIES_DEFINES_IN "\n                \"${nitem}\",")
 endforeach()
 
 get_filename_component(SYS_INCLUDE_PATH ${CMAKE_C_COMPILER} DIRECTORY)

drivers/lhal/CMakeLists.txt

@@ -128,7 +128,9 @@ string(TOUPPER ${CPU_ID} CPU_ID_NAME)
 sdk_add_compile_definitions(-DCPU_${CPU_ID_NAME})
 endif()
 
+if(NOT ("${CPU_ID}" STREQUAL "d0"))
 sdk_add_static_library(src/pka/libpka.a)
+endif()
 # add_subdirectory(src/pka)
 if(("${CHIP}" STREQUAL "bl616") OR ("${CHIP}" STREQUAL "bl628"))
 # sdk_add_static_library(src/pec/libpec.a)

drivers/lhal/config/bl808/device_table.c

@@ -8,7 +8,7 @@
 struct bflb_device_s bl808_device_table[] = {
     { .name = "adc",
       .reg_base = AON_BASE,
-#if defined(CPU_M0) || defined(CPU_LP) || defined(CPU_LP)
+#if defined(CPU_M0) || defined(CPU_LP)
       .irq_num = BL808_IRQ_GPADC_DMA,
 #else
       .irq_num = 0xff,
@@ -527,4 +527,4 @@ struct bflb_device_s *bflb_device_get_by_id(uint8_t type, uint8_t idx)
 void bflb_device_set_userdata(struct bflb_device_s *device, void *user_data)
 {
     device->user_data = user_data;
-}
+}