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.
pull/3660/head
Alessandro Angelino 2016-12-08 13:15:52 +00:00 committed by Anna Bridge
parent 61f569b216
commit 0b8b68c816
14 changed files with 9 additions and 8 deletions

View File

@ -1,13 +1,13 @@
584 Milosch Meriac 588 Milosch Meriac
501 Alessandro Angelino 506 Alessandro Angelino
95 Jaeden Amero 95 Jaeden Amero
61 Niklas Hauser 61 Niklas Hauser
4 Irit Arkin 4 Irit Arkin
3 Hugo Vincent
3 JaredCJR 3 JaredCJR
3 Jim Huang 3 Jim Huang
3 Hugo Vincent
2 tonyyanxuan
2 Vincenzo Frascino 2 Vincenzo Frascino
2 tonyyanxuan
1 Aksel Skauge Mellbye 1 Aksel Skauge Mellbye
1 ccli8
1 Nathan Chong 1 Nathan Chong
1 ccli8

View File

@ -1 +1 @@
v0.26.1 v0.26.2

View File

@ -84,12 +84,12 @@ void page_allocator_init(void * const heap_start, void * const heap_end, const u
"Page size pointer (0x%08x) is not in flash memory.\n", "Page size pointer (0x%08x) is not in flash memory.\n",
(unsigned int) page_size); (unsigned int) page_size);
} }
if (!heap_start || !vmpu_sram_addr((uint32_t) heap_start)) { if (!heap_start || !vmpu_public_sram_addr((uint32_t) heap_start)) {
HALT_ERROR(SANITY_CHECK_FAILED, HALT_ERROR(SANITY_CHECK_FAILED,
"Page heap start pointer (0x%08x) is not in sram memory.\n", "Page heap start pointer (0x%08x) is not in sram memory.\n",
(unsigned int) heap_start); (unsigned int) heap_start);
} }
if (!heap_end || !vmpu_sram_addr((uint32_t) heap_end)) { if (!heap_end || !vmpu_public_sram_addr((uint32_t) heap_end)) {
HALT_ERROR(SANITY_CHECK_FAILED, HALT_ERROR(SANITY_CHECK_FAILED,
"Page heap end pointer (0x%08x) is not in sram memory.\n", "Page heap end pointer (0x%08x) is not in sram memory.\n",
(unsigned int) heap_end); (unsigned int) heap_end);

View File

@ -30,6 +30,7 @@
#define vmpu_is_box_id_valid(...) 0 #define vmpu_is_box_id_valid(...) 0
#define vmpu_public_flash_addr(...) 1 #define vmpu_public_flash_addr(...) 1
#define vmpu_sram_addr(...) 1 #define vmpu_sram_addr(...) 1
#define vmpu_public_sram_addr(...) 1
#define HALT_ERROR(id, ...) {} #define HALT_ERROR(id, ...) {}
#define UVISOR_PAGE_ALLOCATOR_MUTEX_AQUIRE page_allocator_mutex_aquire() #define UVISOR_PAGE_ALLOCATOR_MUTEX_AQUIRE page_allocator_mutex_aquire()
#define UVISOR_PAGE_ALLOCATOR_MUTEX_RELEASE osMutexRelease(g_page_allocator_mutex_id) #define UVISOR_PAGE_ALLOCATOR_MUTEX_RELEASE osMutexRelease(g_page_allocator_mutex_id)