diff --git a/Readme_cn.md b/Readme_cn.md index 1dae189ca..57393b9a6 100755 --- a/Readme_cn.md +++ b/Readme_cn.md @@ -76,6 +76,7 @@ sudo apt update sudo apt install ninja-build sudo apt install cpio srecord sudo apt install python3 +sudo apt install srecord ``` 3. 下载gcc - 直接使用ubuntu命令安装的gcc arm会没有gdb,可以直接到我给定的仓库下载 diff --git a/mkrtos_cfg/stm32f103ret6.cfg b/mkrtos_cfg/stm32f103ret6.cfg deleted file mode 100644 index b6c0986a0..000000000 --- a/mkrtos_cfg/stm32f103ret6.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -set FLASH_SIZE 0x80000 -adapter driver jlink -transport select swd -adapter speed 2000 -source [find target/stm32f1x.cfg] \ No newline at end of file diff --git a/cmake/backports/FindPythonInterp.cmake b/mkrtos_cmake/backports/FindPythonInterp.cmake similarity index 100% rename from cmake/backports/FindPythonInterp.cmake rename to mkrtos_cmake/backports/FindPythonInterp.cmake diff --git a/cmake/extensions.cmake b/mkrtos_cmake/extensions.cmake similarity index 100% rename from cmake/extensions.cmake rename to mkrtos_cmake/extensions.cmake diff --git a/cmake/kconfig.cmake b/mkrtos_cmake/kconfig.cmake similarity index 100% rename from cmake/kconfig.cmake rename to mkrtos_cmake/kconfig.cmake diff --git a/cmake/python.cmake b/mkrtos_cmake/python.cmake similarity index 94% rename from cmake/python.cmake rename to mkrtos_cmake/python.cmake index 41c971e2b..e64f4986e 100644 --- a/cmake/python.cmake +++ b/mkrtos_cmake/python.cmake @@ -19,4 +19,4 @@ set(PythonInterp_FIND_VERSION_MAJOR 3) set(PythonInterp_FIND_VERSION_MINOR 6) set(PythonInterp_FIND_VERSION_EXACT 0) set(PythonInterp_FIND_REQUIRED 1) -include(cmake/backports/FindPythonInterp.cmake) +include(mkrtos_cmake/backports/FindPythonInterp.cmake) diff --git a/cmake/top.cmake b/mkrtos_cmake/top.cmake similarity index 64% rename from cmake/top.cmake rename to mkrtos_cmake/top.cmake index c2e87b5b4..7140d48c0 100644 --- a/cmake/top.cmake +++ b/mkrtos_cmake/top.cmake @@ -1,12 +1,12 @@ set(PROJECT_ROOT ${CMAKE_SOURCE_DIR}) set(KCONFIG_ROOT ${CMAKE_SOURCE_DIR}/Kconfig) -set(BOARD_DIR ${CMAKE_SOURCE_DIR}/configs) +set(BOARD_DIR ${CMAKE_SOURCE_DIR}/mkrtos_configs) set(AUTOCONF_H ${CMAKE_CURRENT_BINARY_DIR}/autoconf.h) # Re-configure (Re-execute all CMakeLists.txt code) when autoconf.h changes set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${AUTOCONF_H}) -include(cmake/extensions.cmake) -include(cmake/python.cmake) -include(cmake/kconfig.cmake) +include(mkrtos_cmake/extensions.cmake) +include(mkrtos_cmake/python.cmake) +include(mkrtos_cmake/kconfig.cmake) diff --git a/configs/STM32F103ZET6_defconfig b/mkrtos_configs/STM32F103ZET6_defconfig similarity index 100% rename from configs/STM32F103ZET6_defconfig rename to mkrtos_configs/STM32F103ZET6_defconfig diff --git a/configs/STM32F205_defconfig b/mkrtos_configs/STM32F205_defconfig similarity index 98% rename from configs/STM32F205_defconfig rename to mkrtos_configs/STM32F205_defconfig index d56d74052..73aa4bc06 100644 --- a/configs/STM32F205_defconfig +++ b/mkrtos_configs/STM32F205_defconfig @@ -6,7 +6,7 @@ CONFIG_KNL_INFO=y CONFIG_KNL_TEXT_ADDR=0x8000000 CONFIG_KNL_TEXT_SIZE=0x100000 CONFIG_KNL_DATA_ADDR=0x20000000 -CONFIG_KNL_DATA_SIZE=0x2000000 +CONFIG_KNL_DATA_SIZE=0x100000 CONFIG_KNL_OFFSET=0x2000 CONFIG_INIT_TASK_OFFSET=0x10000 CONFIG_BOOTFS_OFFSET=0x22000 diff --git a/configs/STM32F407VET6_defconfig b/mkrtos_configs/STM32F407VET6_defconfig similarity index 100% rename from configs/STM32F407VET6_defconfig rename to mkrtos_configs/STM32F407VET6_defconfig diff --git a/configs/SWM34_defconfig b/mkrtos_configs/SWM34_defconfig similarity index 100% rename from configs/SWM34_defconfig rename to mkrtos_configs/SWM34_defconfig diff --git a/mkrtos_knl/arch/armv7m/stm32f2/mpu.c b/mkrtos_knl/arch/armv7m/stm32f2/mpu.c index 8600c9216..a4bb48417 100755 --- a/mkrtos_knl/arch/armv7m/stm32f2/mpu.c +++ b/mkrtos_knl/arch/armv7m/stm32f2/mpu.c @@ -4,14 +4,13 @@ * Created on: ATShining * Author: Administrator */ - #include "types.h" -#include "assert.h" #include "mpu.h" #include #include #include "thread.h" #include "task.h" +#if CONFIG_MK_MPU_CFG static volatile umword_t *MPUCR = (umword_t *)0xE000ED94; void mpu_init(void) @@ -65,3 +64,11 @@ void mpu_switch_to(void) mpu_switch_to_task(tk); } +#else +void mpu_switch_to(void) +{ +} +void mpu_switch_to_task(struct task *tk) +{ +} +#endif diff --git a/mkrtos_knl/link.lds b/mkrtos_knl/link.lds index 29850a302..2ce14dc6a 100644 --- a/mkrtos_knl/link.lds +++ b/mkrtos_knl/link.lds @@ -1,7 +1,7 @@ ENTRY(Reset_Handler) MEMORY { - RAM (arw) : ORIGIN = 0x20000000, LENGTH = 0x2000000 + RAM (arw) : ORIGIN = 0x20000000, LENGTH = 0x100000 FLASH (arx) : ORIGIN = 0x8000000 + 0x2000, LENGTH = 0x10000 - 0x2000 } SECTIONS diff --git a/mkrtos_script/build_f2.sh b/mkrtos_script/build_f2.sh index bd78034a0..a5e54fb50 100755 --- a/mkrtos_script/build_f2.sh +++ b/mkrtos_script/build_f2.sh @@ -1,7 +1,7 @@ #!/bin/bash -export TOOLCHAIN=/home/zhangzheng/gcc-arm-none-eabi-5_4-2016q3/bin/ -export TOOLCHAIN_LIB=/home/zhangzheng/gcc-arm-none-eabi-5_4-2016q3/lib/gcc/arm-none-eabi/5.4.1/armv7-m +export TOOLCHAIN=/home/zhangzheng/mkrtos-tools/gcc/gcc-arm-none-eabi-5_4-2016q3/bin/ +export TOOLCHAIN_LIB=/home/zhangzheng/mkrtos-tools/gcc/gcc-arm-none-eabi-5_4-2016q3/lib/gcc/arm-none-eabi/5.4.1/armv7-m/ # export TOOLCHAIN=/Users/zhangzheng/gcc-arm-none-eabi-10.3-2021.10/bin/ # export TOOLCHAIN_LIB=/Users/zhangzheng/gcc-arm-none-eabi-10.3-2021.10/lib/gcc/arm-none-eabi/10.3.1/thumb/v7-m/nofp export BOARD=STM32F205 diff --git a/mkrtos_tool/kconfig/__pycache__/kconfigfunctions.cpython-310.pyc b/mkrtos_tool/kconfig/__pycache__/kconfigfunctions.cpython-310.pyc new file mode 100644 index 000000000..9ddea829a Binary files /dev/null and b/mkrtos_tool/kconfig/__pycache__/kconfigfunctions.cpython-310.pyc differ diff --git a/mkrtos_tool/kconfig/__pycache__/kconfiglib.cpython-310.pyc b/mkrtos_tool/kconfig/__pycache__/kconfiglib.cpython-310.pyc new file mode 100644 index 000000000..fb42286a9 Binary files /dev/null and b/mkrtos_tool/kconfig/__pycache__/kconfiglib.cpython-310.pyc differ diff --git a/setting.cmake b/setting.cmake index 3709db034..feacd5c06 100755 --- a/setting.cmake +++ b/setting.cmake @@ -20,7 +20,7 @@ set(CMAKE_SIZE "${CROSS_COMPILE}size" CACHE PATH "" FORCE) set(PROJECT_BINARY_DIR ${CMAKE_SOURCE_DIR}/build) set(BOARD $ENV{BOARD}) -include(cmake/top.cmake) +include(mkrtos_cmake/top.cmake) set(ARCH ${CONFIG_ARCH} CACHE STRING "" FORCE) message(=======${ARCH}) message(=======${CONFIG_CPU_TYPE})