Skip to content

Commit 5f1c047

Browse files
committed
uVisor: Update to v0.26.2
* Add support for uVisor own SRAM. * This enables targets where uVisor sits in a TCM. * Distinguish between uVisor and public SRAMs.
1 parent 89641bc commit 5f1c047

File tree

14 files changed

+9
-8
lines changed

14 files changed

+9
-8
lines changed

features/FEATURE_UVISOR/AUTHORS.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
584 Milosch Meriac
2-
501 Alessandro Angelino
1+
588 Milosch Meriac
2+
506 Alessandro Angelino
33
95 Jaeden Amero
44
61 Niklas Hauser
55
4 Irit Arkin
6+
3 Hugo Vincent
67
3 JaredCJR
78
3 Jim Huang
8-
3 Hugo Vincent
9-
2 tonyyanxuan
109
2 Vincenzo Frascino
10+
2 tonyyanxuan
1111
1 Aksel Skauge Mellbye
12-
1 ccli8
1312
1 Nathan Chong
13+
1 ccli8

features/FEATURE_UVISOR/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.26.1
1+
v0.26.2

features/FEATURE_UVISOR/source/page_allocator.c_inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ void page_allocator_init(void * const heap_start, void * const heap_end, const u
8484
"Page size pointer (0x%08x) is not in flash memory.\n",
8585
(unsigned int) page_size);
8686
}
87-
if (!heap_start || !vmpu_sram_addr((uint32_t) heap_start)) {
87+
if (!heap_start || !vmpu_public_sram_addr((uint32_t) heap_start)) {
8888
HALT_ERROR(SANITY_CHECK_FAILED,
8989
"Page heap start pointer (0x%08x) is not in sram memory.\n",
9090
(unsigned int) heap_start);
9191
}
92-
if (!heap_end || !vmpu_sram_addr((uint32_t) heap_end)) {
92+
if (!heap_end || !vmpu_public_sram_addr((uint32_t) heap_end)) {
9393
HALT_ERROR(SANITY_CHECK_FAILED,
9494
"Page heap end pointer (0x%08x) is not in sram memory.\n",
9595
(unsigned int) heap_end);

features/FEATURE_UVISOR/source/rtx/unsupported_page_allocator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#define vmpu_is_box_id_valid(...) 0
3131
#define vmpu_public_flash_addr(...) 1
3232
#define vmpu_sram_addr(...) 1
33+
#define vmpu_public_sram_addr(...) 1
3334
#define HALT_ERROR(id, ...) {}
3435
#define UVISOR_PAGE_ALLOCATOR_MUTEX_AQUIRE page_allocator_mutex_aquire()
3536
#define UVISOR_PAGE_ALLOCATOR_MUTEX_RELEASE osMutexRelease(g_page_allocator_mutex_id)

0 commit comments

Comments
 (0)