andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13535 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
Giovanni Di Sirio 2020-04-15 08:03:12 +00:00
parent cef5e58f61
commit 84370eb21a
4 changed files with 113 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
demos/STM32/RT-STM32L552ZE-NUCLEO144-TZ_HOST/debug/RT-STM32L552ZE-NUCLEO144-TZ_HOST (OpenOCD, Flash and Run).launch Normal file
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
<stringAttribute key="bad_container_name" value="\RT-STM32L552ZE-NUCLEO144-TZ_HOST\debug"/>
<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="1"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20&#13;&#10;monitor reset init&#13;&#10;monitor sleep 50&#13;&#10;"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="Generic TCP/IP"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="arm-none-eabi-gdb"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList/&gt;"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList&gt;&#10;&lt;memoryBlockExpressionItem&gt;&#10;&lt;expression text=&quot;0x0&quot;/&gt;&#10;&lt;/memoryBlockExpressionItem&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RT-STM32L552ZE-NUCLEO144-TZ_HOST"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.603687198"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/RT-STM32L552ZE-NUCLEO144-TZ_HOST"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
</launchConfiguration>

55
demos/STM32/RT-STM32L552ZE-NUCLEO144-TZ_HOST/debug/RT-STM32L552ZE-NUCLEO144-TZ_HOST (ST-Link GDB Server, Flash and Run).launch Normal file
View File

File diff suppressed because one or more lines are too long

28
os/common/ports/ARMv8-M-ML/compilers/GCC/chcoreasm.S
View File

@ -226,8 +226,6 @@ _zombies: b _zombies
.thumb_func
.globl __port_ns_boot
__port_ns_boot:
movs r1, #0
movs r2, #0
movs r3, #0
movs r4, #0
movs r5, #0
@ -257,32 +255,18 @@ __port_ns_boot:
vldr.64 d14, =0
vldr.64 d15, =0
#endif
#if 0
msr BASEPRI, r3 /* Allowing NS-PendSV in NS state.*/
msr PSPLIM_NS, r3
msr MSPLIM_NS, r3
msr BASEPRI, r3
ldr r1, =SCB_VTOR_NS
ldr r1, = SCB_VTOR_NS
str r0, [r1, #0]
ldr r1, [r0, #0] /* MSP from vectors table.*/
ldr r1, [r0, #0]
msr MSP_NS, r1
ldr r2, [r0, #4] /* PC from vectors table.*/
ldr r3, =0x30000000
str r0, [r3, #0]
str r1, [r3, #4]
str r2, [r3, #8]
bxns r2
#else
msr BASEPRI, r1 /* Allowing NS-PendSV.*/
msr PSPLIM_NS, r1
msr MSPLIM_NS, r1
ldr r1, =0x20009000
msr MSP_NS, r1
ldr r1, =0x20009400
msr PSP_NS, r1
blxns r0
ldr r2, [r0, #4]
bic r2, #1
blxns r2
b chThdExit
#endif
#endif
#endif /* !defined(__DOXYGEN__) */

16
os/hal/ports/STM32/STM32L5xx/stm32_secure.inc
View File

@ -49,18 +49,6 @@
#include "secconf.h"
/* Checks on configurations.*/
#if !defined(STM32_FLASH_OVERRIDE_SETTINGS)
#error "STM32_FLASH_OVERRIDE_SETTINGS not defined in secconf.h"
#endif
#if !defined(STM32_FLASH_SECWM1R1)
#error "STM32_FLASH_SECWM1R1 not defined in secconf.h"
#endif
#if !defined(STM32_FLASH_SECWM2R1)
#error "STM32_FLASH_SECWM2R1 not defined in secconf.h"
#endif
#if !defined(STM32_FLASH_SECBB1R1)
#error "STM32_FLASH_SECBB1R1 not defined in secconf.h"
#endif
@ -256,9 +244,6 @@
static inline void secure_init(void) {
#if STM32_SECURE_MODE
#if STM32_FLASH_OVERRIDE_SETTINGS
// FLASH->SECWM1R1 = STM32_FLASH_SECWM1R1;
// FLASH->SECWM2R1 = STM32_FLASH_SECWM2R1;
FLASH->SECBB1R1 = STM32_FLASH_SECBB1R1;
FLASH->SECBB1R2 = STM32_FLASH_SECBB1R2;
FLASH->SECBB1R3 = STM32_FLASH_SECBB1R3;
@ -267,7 +252,6 @@ static inline void secure_init(void) {
FLASH->SECBB2R2 = STM32_FLASH_SECBB2R2;
FLASH->SECBB2R3 = STM32_FLASH_SECBB2R3;
FLASH->SECBB2R4 = STM32_FLASH_SECBB2R4;
#endif
GTZC_MPCBB1->VCTR[0] = STM32_MPCBB1_VCTR0;
GTZC_MPCBB1->VCTR[1] = STM32_MPCBB1_VCTR1;