aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorisiora <none@example.com>2018-02-27 00:07:18 +0000
committerisiora <none@example.com>2018-02-27 00:07:18 +0000
commit83431f3c820dc7a7c7fc15f7ef33b83e9597a8a9 (patch)
treecdd031d1bd1c00775507a15ec54e695d00035980 /demos
parent4777b6e7c813b7c4ea1b4c3a4f07daa1c066c079 (diff)
downloadChibiOS-83431f3c820dc7a7c7fc15f7ef33b83e9597a8a9.tar.gz
ChibiOS-83431f3c820dc7a7c7fc15f7ef33b83e9597a8a9.tar.bz2
ChibiOS-83431f3c820dc7a7c7fc15f7ef33b83e9597a8a9.zip
Small changes.
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11569 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'demos')
-rwxr-xr-xdemos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/Makefile2
-rwxr-xr-xdemos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/chconf.h7
-rw-r--r--demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.c2
-rw-r--r--demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.h6
4 files changed, 5 insertions, 12 deletions
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/Makefile b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/Makefile
index d3c0ddb5c..12d698ec2 100755
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/Makefile
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/Makefile
@@ -5,7 +5,7 @@
# Compiler options here.
ifeq ($(USE_OPT),)
- USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
+ USE_OPT = -Og -ggdb -fomit-frame-pointer -falign-functions=16
endif
# C specific options here (added to USE_OPT).
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/chconf.h b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/chconf.h
index e7938699a..2e08d695b 100755
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/chconf.h
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/chconf.h
@@ -603,13 +603,6 @@
/* 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 FALSE
-
#endif /* CHCONF_H */
/** @} */
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.c b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.c
index 6a56bff14..ef85a452b 100644
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.c
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.c
@@ -56,7 +56,7 @@ msg_t smcInvoke(smc_service_t handle, smc_params_area_t data,
msg_t smcInvokeService(smc_service_t handle, smc_params_area_t data,
size_t size)
{
- msg_t result = MSG_OK;
+ msg_t result;
result = smcInvoke(handle, data, size);
while (result == SMC_SVC_INTR)
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.h b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.h
index ceb2941b7..06a5e3631 100644
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.h
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED-NSEC/smcclient.h
@@ -44,9 +44,9 @@
/*
* Special service handles
*/
-#define SMC_HND_TRAMP ((smc_service_t *)0) /* Trampoline service handle */
-#define SMC_HND_DISCOVERY ((smc_service_t *)1) /* Discovery service handle */
-#define SMC_HND_REENTER ((smc_service_t *)2) /* Reentering a service service handle */
+#define SMC_HND_TRAMP ((smc_service_t *)0) /* Trampoline */
+#define SMC_HND_DISCOVERY ((smc_service_t *)1) /* Discovery */
+#define SMC_HND_REENTER ((smc_service_t *)2) /* Reentering a service */
/*===========================================================================*/
/* Module pre-compile time settings. */