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

Small changes. 

git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11570 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
isiora 2018-02-27 00:11:17 +00:00
parent 83431f3c82
commit 742b166c69
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-SEC/Makefile
View File

@ -5,7 +5,7 @@
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 USE_OPT = -Og -ggdb -fomit-frame-pointer -falign-functions=16
endif endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).

7
demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-SEC/chconf.h
View File

@ -603,13 +603,6 @@
/* Port-specific settings (override port settings defaulted in chcore.h). */ /* Port-specific settings (override port settings defaulted in chcore.h). */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief Trust zone configuration.
* @details If enabled the kernel is configured for the secure world
* and can access specific devices.
*/
#define CH_CFG_SEC_WORLD TRUE
#endif /* CHCONF_H */ #endif /* CHCONF_H */
/** @} */ /** @} */

20
demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-SEC/main.c
View File

@ -52,7 +52,7 @@ static const SerialConfig sdcfg = {
UART_MR_PAR_NO UART_MR_PAR_NO
}; };
/* /**
* Dummy trust service thread. * Dummy trust service thread.
*/ */
static THD_WORKING_AREA(waDummyTrustedService, 512); static THD_WORKING_AREA(waDummyTrustedService, 512);
@ -63,20 +63,16 @@ static THD_FUNCTION(DummyTrustedService, arg) {
smc_service_t *svcp; smc_service_t *svcp;
chRegSetThreadName("DTS"); chRegSetThreadName("DTS");
/* /* Register the trust service.*/
* Register the trust service
*/
svcp = smcRegisterMeAsService("DummyTrustedService"); svcp = smcRegisterMeAsService("DummyTrustedService");
if (svcp == NULL) { if (svcp == NULL) {
/*
* Error: the service is already registered /* Error: the service is already registered
* or memory is exhausted. * or memory is exhausted.*/
*/
return; return;
} }
/*
* Wait and process requests /* Wait and process requests.*/
*/
while (true) { while (true) {
msg = smcServiceWaitRequest(svcp, MSG_OK); msg = smcServiceWaitRequest(svcp, MSG_OK);
if (msg == MSG_OK && svcp->svc_datalen > 0) { if (msg == MSG_OK && svcp->svc_datalen > 0) {
@ -186,7 +182,7 @@ int main(void) {
* the secure world. * the secure world.
*/ */
chprintf((BaseSequentialStream*)&SD1, "Jumping in the non secure world\n\r"); chprintf((BaseSequentialStream*)&SD1, "Jumping in the non secure world\n\r");
_ns_trampoline(NSEC_MEMORY_START); _ns_trampoline(NSEC_IMAGE_START_ADDR);
/* /*
* It never goes here * It never goes here
*/ */