diff --git a/.vscode/launch.json b/.vscode/launch.json index 376becfbf..bee775c30 100755 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,14 +6,14 @@ "type": "cortex-debug", "request": "launch", "interface": "swd", - "executable": "${workspaceFolder}/build/mkrtos/mkrtos_bootstrap/bootstrap.elf", + "executable": "${workspaceFolder}/build/output/bootstrap.elf", "servertype": "openocd", "cwd": "${fileDirname}", - // "miDebuggerPath": "/home/zhangzheng/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-gdb", - "device": "STM32F103RE", + "gdbPath": "/Users/zhangzheng/gcc-arm-none-eabi-10.3-2021.10/bin/arm-none-eabi-gdb", + "device": "STM32F103ZE", "configFiles": [ - "interface/jlink.cfg", - "${workspaceFolder}/mkrtos_cfg/stm32f103ret6.cfg", + "interface/cmsis-dap.cfg", + "target/stm32f1x.cfg", ] }, { @@ -38,8 +38,8 @@ "name": "(gdb) 启动", "type": "cppdbg", "request": "launch", - // "program": "${workspaceFolder}/build/output/bootstrap.elf", - "program": "${workspaceFolder}/build/output/mkrtos.elf", + "program": "${workspaceFolder}/build/output/bootstrap.elf", + // "program": "${workspaceFolder}/build/output/mkrtos.elf", "args": [], "stopAtEntry": true, "cwd": "${fileDirname}", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0d815b455..d6c5f065a 100755 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,9 +6,9 @@ "command": "openocd", "args": [ "-f", - "interface/jlink.cfg", + "interface/cmsis-dap.cfg", "-f", - "${workspaceFolder}/mkrtos_cfg/stm32f103ret6.cfg", + "target/stm32f1x.cfg", "-c","init", "-c","targets;reset halt;wait_halt;poll", "-c","flash write_image erase unlock build/output/kernel.img 0x08000000", diff --git a/configs/STM32F103ZET6_defconfig b/configs/STM32F103ZET6_defconfig index 2a7e3d5cc..061f5baba 100644 --- a/configs/STM32F103ZET6_defconfig +++ b/configs/STM32F103ZET6_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=0x10000 CONFIG_KNL_OFFSET=0x2000 CONFIG_INIT_TASK_OFFSET=0x10000 CONFIG_BOOTFS_OFFSET=0x22000 diff --git a/mkrtos_bootstrap/bsp/STM32F1/stm32_start.c b/mkrtos_bootstrap/bsp/STM32F1/stm32_start.c index 912d47ed7..158377c83 100644 --- a/mkrtos_bootstrap/bsp/STM32F1/stm32_start.c +++ b/mkrtos_bootstrap/bsp/STM32F1/stm32_start.c @@ -39,13 +39,14 @@ void jump2kernel(void) __set_FAULTMASK(0); /* initialize main stack pointer */ - __set_MSP(*(__IO uint32_t *)KERNEL_IMG_START_ADDR); + __set_CONTROL(0); __ISB(); __disable_irq(); + // __set_MSP(*(__IO uint32_t *)KERNEL_IMG_START_ADDR); /* Set new vector table pointer */ jump_addr = *(__IO uint32_t *)(KERNEL_IMG_START_ADDR + 4); _main = (void *)jump_addr; diff --git a/mkrtos_knl/stm32_link.lds b/mkrtos_knl/stm32_link.lds index 3d9178ac2..e28c9d985 100644 --- a/mkrtos_knl/stm32_link.lds +++ b/mkrtos_knl/stm32_link.lds @@ -1,7 +1,7 @@ ENTRY(Reset_Handler) MEMORY { - RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 0x2000000 + RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 0x10000 FLASH (rx) : ORIGIN = 0x8000000 + 0x2000, LENGTH = 64K - 0x2000 } SECTIONS diff --git a/mkrtos_user/server/init/src/init.cfg b/mkrtos_user/server/init/src/init.cfg index 7b761f893..a5c1f6bff 100644 --- a/mkrtos_user/server/init/src/init.cfg +++ b/mkrtos_user/server/init/src/init.cfg @@ -3,3 +3,4 @@ # fatfs cpiofs sh +