diff options
| author | isiora <none@example.com> | 2018-03-21 14:30:14 +0000 |
|---|---|---|
| committer | isiora <none@example.com> | 2018-03-21 14:30:14 +0000 |
| commit | bbc08d06d1c167232c2c66dc386c1fd353e6a728 (patch) | |
| tree | c869af9c2c2c8bba855fde17eafabcabfc66f425 /os/common | |
| parent | 1db7f68d4ad84c7e8c9b5e1240e9bb2c684ce670 (diff) | |
| download | ChibiOS-bbc08d06d1c167232c2c66dc386c1fd353e6a728.tar.gz ChibiOS-bbc08d06d1c167232c2c66dc386c1fd353e6a728.tar.bz2 ChibiOS-bbc08d06d1c167232c2c66dc386c1fd353e6a728.zip | |
Minor changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11830 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/common')
| -rw-r--r-- | os/common/ports/ARMCAx-TZ/chtssi.c | 3 | ||||
| -rw-r--r-- | os/common/ports/ARMCAx-TZ/chtssi.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/os/common/ports/ARMCAx-TZ/chtssi.c b/os/common/ports/ARMCAx-TZ/chtssi.c index 580a4ebd5..a9332f226 100644 --- a/os/common/ports/ARMCAx-TZ/chtssi.c +++ b/os/common/ports/ARMCAx-TZ/chtssi.c @@ -24,6 +24,7 @@ #include "ch.h"
#include "hal.h"
+#include "tsconf.h"
#include "chtssi.h"
#include <string.h>
@@ -345,7 +346,7 @@ CC_NO_RETURN void tssiInit(void) /* Jump in the NON SECURE world.
* This thread becomes the non secure environment as view by
* the secure world.*/
- _ns_trampoline(NSEC_MEMORY_START_ADDR);
+ _ns_trampoline(NSEC_MEMORY_START_ADDR + NSEC_MEMORY_EXE_OFFSET);
/* It never goes here.*/
}
diff --git a/os/common/ports/ARMCAx-TZ/chtssi.h b/os/common/ports/ARMCAx-TZ/chtssi.h index d0be2460a..ae9cec7af 100644 --- a/os/common/ports/ARMCAx-TZ/chtssi.h +++ b/os/common/ports/ARMCAx-TZ/chtssi.h @@ -82,10 +82,21 @@ /**
* @brief Secure and non secure memory address spaces.
*/
+#if !defined(NSEC_MEMORY_START_ADDR)
#define NSEC_MEMORY_START_ADDR ((uint8_t *)0x20000000)
+#endif
+#if !defined(NSEC_MEMORY_EXE_OFFSET)
+#define NSEC_MEMORY_EXE_OFFSET ((uint32_t) 0x00000000)
+#endif
+#if !defined(NSEC_MEMORY_END_ADDR)
#define NSEC_MEMORY_END_ADDR ((uint8_t *)0x27000000)
+#endif
+#if !defined(SEC_MEMORY_START_ADDR)
#define SEC_MEMORY_START_ADDR ((uint8_t *)0x27000000)
+#endif
+#if !defined(SEC_MEMORY_SIZE)
#define SEC_MEMORY_SIZE ((size_t)0x1000000)
+#endif
/** @} */
|