diff --git a/bsp/lpc55sxx/Libraries/LPC55S6X/LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S b/bsp/lpc55sxx/Libraries/LPC55S6X/LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S index 641ff121b179f567bad7b218ad90b29da13e488a..5c547b8e3298825f212979503c6c9f12be0cf9eb 100644 --- a/bsp/lpc55sxx/Libraries/LPC55S6X/LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S +++ b/bsp/lpc55sxx/Libraries/LPC55S6X/LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S @@ -199,7 +199,7 @@ Reset_Handler: #else ldr r0,=__libc_init_array blx r0 - ldr r0,=main + ldr r0,=entry bx r0 #endif .pool diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/.vscode/launch.json b/bsp/lpc55sxx/lpc55s69_nxp_evk/.vscode/launch.json new file mode 100644 index 0000000000000000000000000000000000000000..4806836f25e8bf6e4c46d8a106045324a4130869 --- /dev/null +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "cwd": "${workspaceRoot}", + "executable": "rtthread.elf", + "name": "Debug", + "request": "launch", + "type": "cortex-debug", + "servertype": "jlink", + "interface": "swd", + "device": "LPC55S69_M33_0", + "runToMain": true + }, + ] +} \ No newline at end of file diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h index 23eda2b85bead5c3bed22da6f67fcda3c452bc72..7500557fcba335e75df595360255523fdf331718 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/board.h @@ -33,6 +33,7 @@ extern int Image$$ARM_LIB_HEAP$$ZI$$Base; extern int Image$$ARM_LIB_STACK$$ZI$$Base; #define HEAP_BEGIN ((void *)&Image$$ARM_LIB_HEAP$$ZI$$Base) +#define HEAP_END ((void*)&Image$$ARM_LIB_STACK$$ZI$$Base) #elif defined(__ICCARM__) #pragma section="HEAP" #define HEAP_BEGIN (__segment_end("HEAP")) @@ -40,8 +41,8 @@ extern int Image$$ARM_LIB_STACK$$ZI$$Base; extern int __HeapBase; extern int __HeapLimit; #define HEAP_BEGIN ((void *)&__HeapBase) +#define HEAP_END ((void *)&__HeapLimit) #endif -#define HEAP_END ((void*)&Image$$ARM_LIB_STACK$$ZI$$Base) void rt_hw_board_init(void);