diff --git a/.cproject b/.cproject index 7d96c806..17aa5b68 100644 --- a/.cproject +++ b/.cproject @@ -169,7 +169,7 @@ make - INTERFACE=jlink + INTERFACE=uart download true false diff --git a/CMakeLists.txt b/CMakeLists.txt index 23ad3a59..fb04d345 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,13 +6,14 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/tools.cmake) PROJECT(${BOARD} C CXX ASM) # set(CMAKE_VERBOSE_MAKEFILE ON) - +ENABLE_LANGUAGE(ASM) + include_directories(${CMAKE_SOURCE_DIR}/common/misc) include_directories(${CMAKE_SOURCE_DIR}/bsp/bsp_common/platform) if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/bsp/board/${BOARD}) include_directories(${CMAKE_SOURCE_DIR}/bsp/board/${BOARD}) -else() +else() message(FATAL_ERROR "${CMAKE_SOURCE_DIR}/bsp/board/${BOARD} is not exist") endif() diff --git a/Makefile b/Makefile index d3ed94de..c2bae14b 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,18 @@ CPU_ID?=m0 SUPPORT_SHELL?=n SUPPORT_FREERTOS?=n +SUPPORT_CRYPTO?=n SUPPORT_LVGL?=n SUPPORT_FLOAT?=n SUPPORT_BLE?=n SUPPORT_XZ?=n +SUPPORT_LWIP?=n +SUPPORT_TFLITE?=n -INTERFACE?=jlink -BAUDRATE ?=12000 +INTERFACE?=uart +BAUDRATE ?=2000000 + +FORMAT_DIR?=. export BOARD export CHIP @@ -21,10 +26,13 @@ export APP export CPU_ID export SUPPORT_SHELL export SUPPORT_FREERTOS +export SUPPORT_CRYPTO export SUPPORT_LVGL export SUPPORT_FLOAT export SUPPORT_BLE export SUPPORT_XZ +export SUPPORT_LWIP +export SUPPORT_TFLITE # The command to remove a file. RM = cmake -E rm -rf @@ -36,9 +44,13 @@ build: download: ./tools/bflb_flash_tool/bflb_mcu_tool --chipname=$(CHIP) --interface=$(INTERFACE) --baudrate=$(BAUDRATE) - + +format: + find $(FORMAT_DIR)/ -name "*.c" -o -name "*.h" | xargs clang-format -style=file -i + clean: $(RM) out $(RM) build -.PHONY:build clean download + +.PHONY:build clean download format diff --git a/bl_mcu_flash.launch b/bl_mcu_flash.launch index 40b67e0f..7bd6483d 100644 --- a/bl_mcu_flash.launch +++ b/bl_mcu_flash.launch @@ -16,7 +16,7 @@ - + diff --git a/bl_mcu_ram.launch b/bl_mcu_ram.launch index 4c3d4ed2..b1f4679b 100644 --- a/bl_mcu_ram.launch +++ b/bl_mcu_ram.launch @@ -16,7 +16,7 @@ - + diff --git a/examples/power/lowpower_test/CMakeLists.txt b/examples/power/lowpower_test/CMakeLists.txt index bfd0e557..34f441c3 100644 --- a/examples/power/lowpower_test/CMakeLists.txt +++ b/examples/power/lowpower_test/CMakeLists.txt @@ -1,3 +1,4 @@ +set(TARGET_REQUIRED_LIBS shell) set(mains main.c) generate_bin() diff --git a/project.build b/project.build index 83fa69fa..3e6feefd 100644 --- a/project.build +++ b/project.build @@ -3,15 +3,18 @@ cmake_definition+= -DCPU_ID=$(CPU_ID) cmake_definition+= -DBOARD=$(BOARD) cmake_definition+= -DSUPPORT_FLOAT=$(SUPPORT_FLOAT) cmake_definition+= -DSUPPORT_SHELL=$(SUPPORT_SHELL) -cmake_definition+= -DSUPPORT_FREERTOS=$(SUPPORT_FREERTOS) +cmake_definition+= -DSUPPORT_FREERTOS=$(SUPPORT_FREERTOS) +cmake_definition+= -DSUPPORT_CRYPTO=$(SUPPORT_CRYPTO) cmake_definition+= -DSUPPORT_LVGL=$(SUPPORT_LVGL) cmake_definition+= -DSUPPORT_BLE=$(SUPPORT_BLE) cmake_definition+= -DSUPPORT_XZ=$(SUPPORT_XZ) +cmake_definition+= -DSUPPORT_LWIP=$(SUPPORT_LWIP) +cmake_definition+= -DSUPPORT_TFLITE=$(SUPPORT_TFLITE) cmake_definition+= -DAPP_DIR=$(APP_DIR) cmake_definition+= -DAPP=$(APP) __build: - cmake $(cmake_definition) .. + cmake $(cmake_definition) .. make -j4 .PHONY:__build \ No newline at end of file diff --git a/tools/openocd/if_rv_dbg_plus.cfg b/tools/openocd/if_rv_dbg_plus.cfg new file mode 100644 index 00000000..d42ceedc --- /dev/null +++ b/tools/openocd/if_rv_dbg_plus.cfg @@ -0,0 +1,21 @@ +# BouffaloLab USB-JTAG/TTL adapter +interface ftdi +#adapter driver ftdi +ftdi_vid_pid 0x0403 0x6010 + +ftdi_channel 0 +#ftdi_tdo_sample_edge falling +transport select jtag +adapter_khz 5000 +#adapter speed 1000 + +ftdi_layout_init 0x00f8 0x00fb +#ftdi_layout_signal nTRST -data 0x0400 +#ftdi_layout_signal nSRST -ndata 0x0020 + +#reset_config srst_only srst_push_pull +#adapter_nsrst_delay 100 +#adapter_nsrst_assert_width 100 + +#bindto 0.0.0.0 +