diff --git a/Makefile b/Makefile index 7b9e5641..71dd16b4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BOARD?=bl706_iot CHIP?=bl702 APP_DIR?=examples APP?=helloworld -CPU_ID?=m0 +CPU_ID?=none COMx?= SUPPORT_SHELL?=n @@ -47,7 +47,7 @@ download: ./tools/bflb_flash_tool/bflb_mcu_tool --chipname=$(CHIP) --interface=$(INTERFACE) --port=$(COMx) --baudrate=$(BAUDRATE) format: - find $(FORMAT_DIR)/ -name "*.c" -o -name "*.h" | xargs clang-format -style=file -i + find $(FORMAT_DIR)/ -name "*.c" -o -name "*.h" -o -name "*.cc" -o -name "*.cpp"| xargs clang-format -style=file -i clean: $(RM) out diff --git a/bl_mcu_flash.launch b/bl_mcu_flash.launch index 7bd6483d..ab0eea80 100644 --- a/bl_mcu_flash.launch +++ b/bl_mcu_flash.launch @@ -46,7 +46,7 @@ - + diff --git a/project.build b/project.build index 3e6feefd..ba6c6e6c 100644 --- a/project.build +++ b/project.build @@ -1,5 +1,8 @@ -cmake_definition+= -DCHIP=$(CHIP) +ifneq ($(CPU_ID),none) cmake_definition+= -DCPU_ID=$(CPU_ID) +endif + +cmake_definition+= -DCHIP=$(CHIP) cmake_definition+= -DBOARD=$(BOARD) cmake_definition+= -DSUPPORT_FLOAT=$(SUPPORT_FLOAT) cmake_definition+= -DSUPPORT_SHELL=$(SUPPORT_SHELL) diff --git a/tools/cmake/compiler_flags.cmake b/tools/cmake/compiler_flags.cmake index 9192ae05..26100cc5 100644 --- a/tools/cmake/compiler_flags.cmake +++ b/tools/cmake/compiler_flags.cmake @@ -1,7 +1,7 @@ include(${CMAKE_SOURCE_DIR}/drivers/${CHIP}_driver/cpu_flags.cmake) list(APPEND GLOBAL_C_FLAGS -Os -g3) -list(APPEND GLOBAL_C_FLAGS -fshort-enums -fno-common -fms-extensions -ffunction-sections -fdata-sections -fstrict-volatile-bitfields) +list(APPEND GLOBAL_C_FLAGS -fshort-enums -fno-common -fms-extensions -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -ffast-math) list(APPEND GLOBAL_C_FLAGS -Wall -Wshift-negative-value -Wchar-subscripts -Wformat -Wuninitialized -Winit-self -Wignored-qualifiers -Wunused -Wundef) list(APPEND GLOBAL_C_FLAGS -msmall-data-limit=4) @@ -15,6 +15,7 @@ if(${SUPPORT_FLOAT} STREQUAL "y") list(APPEND GLOBAL_LD_FLAGS -u _printf_float) endif() + if(${SUPPORT_SHELL} STREQUAL "y") list(APPEND GLOBAL_C_FLAGS -DSHELL_SUPPORT) endif() diff --git a/tools/cmake/tools.cmake b/tools/cmake/tools.cmake index 08f943d0..2336564c 100644 --- a/tools/cmake/tools.cmake +++ b/tools/cmake/tools.cmake @@ -252,7 +252,7 @@ function(check_all_library) endif() if(${SUPPORT_TFLITE} STREQUAL "y") - check_add_library(xz ${CMAKE_SOURCE_DIR}/components/tflite) + check_add_library(tflite ${CMAKE_SOURCE_DIR}/components/tflite) endif() endfunction(check_all_library)