Merge commit 'ce830296d0297a8da543c24134bf859710fd7698' into epr_integration

Merge the EPR tag and the nordic branch together.

Author: pan-

.travis.yml

@@ -1,7 +1,9 @@
 python:
   - "2.7"
 
-script: "python tools/build_travis.py"
+script:
+  - PYTHONPATH=. python tools/test/config_test/config_test.py
+  - python tools/build_travis.py
 before_install:
   - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
   - sudo apt-get update -qq

README.md

@@ -67,7 +67,7 @@ STMicroelectronics:
 * [Nucleo-F302R8](https://developer.mbed.org/platforms/ST-Nucleo-F302R8/) (Cortex-M4F)
 * [Nucleo-F334R8](https://developer.mbed.org/platforms/ST-Nucleo-F334R8/) (Cortex-M4F)
 * [Nucleo-F401RE](https://developer.mbed.org/platforms/ST-Nucleo-F401RE/) (Cortex-M4F)
-* Nucleo-F410RB (Cortex-M4F)
+* [Nucleo-F410RB](https://developper.mbed.org/platforms/ST-Nucleo-F410RB/) (Cortex-M4F)
 * [Nucleo-F411RE](https://developer.mbed.org/platforms/ST-Nucleo-F411RE/) (Cortex-M4F)
 * [Nucleo-L476RG](https://developer.mbed.org/platforms/ST-Nucleo-L476RG/) (Cortex-M4F)
 * STM32F4XX (Cortex-M4F)

docs/config_system.md

@@ -0,0 +1,90 @@
+# memap - Static Memory Map Analysis
+
+## Introduction
+
+*memap* is a simple utility that displays static memory information required by [mbed](https://github.com/mbedmicro/mbed) applications. This information is produced by analysing the memory map file previously generated by your toolchain.
+
+**Note**: this tool shows static RAM usage and the total size of allocated heap and stack space defined at compile time, not the actual heap and stack usage (which may be different depending on your application).
+
+## Table of contents
+
+1. [Using memap](#using-memap)
+1. [Information on memory sections](#info-mem-sections)
+1. [Current support](#current-support)
+1. [Known problems](#known-problems)
+
+## Using memap
+
+*memap* is automatically invoked after an mbed build finishes successfully. It's also possible to manually run the program with different command line options, for example:
+
+```
+$> python memap.py
+usage: memap.py [-h] -t TOOLCHAIN [-o OUTPUT] [-e EXPORT] [-v] file
+
+Memory Map File Analyser for ARM mbed version 0.3.11
+
+positional arguments:
+  file                  memory map file
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -t TOOLCHAIN, --toolchain TOOLCHAIN
+                        select a toolchain used to build the memory map file
+                        (ARM, GCC_ARM, IAR)
+  -o OUTPUT, --output OUTPUT
+                        output file name
+  -e EXPORT, --export EXPORT
+                        export format (examples: 'json', 'csv-ci', 'table':
+                        default)
+  -v, --version         show program's version number and exit
+```
+
+Result example:
+
+```
+$> python memap.py GCC_ARM\myprog3.map -t GCC_ARM
+
++----------------------------+-------+-------+------+
+| Module                     | .text | .data | .bss |
++----------------------------+-------+-------+------+
+| Fill                       |   170 |     0 | 2294 |
+| Misc                       | 36282 |  2220 | 2152 |
+| core/hal                   | 15396 |    16 |  568 |
+| core/rtos                  |  6751 |    24 | 2662 |
+| features/FEATURE_IPV4      |    96 |     0 |   48 |
+| frameworks/greentea-client |   912 |    28 |   44 |
+| frameworks/utest           |  3079 |     0 |  732 |
+| Subtotals                  | 62686 |  2288 | 8500 |
++----------------------------+-------+-------+------+
+Allocated Heap: 65540 bytes
+Allocated Stack: 32768 bytes
+Total Static RAM memory (data + bss): 10788 bytes
+Total RAM memory (data + bss + heap + stack): 109096 bytes
+Total Flash memory (text + data + misc): 66014 bytes
+
+```
+
+## Information on memory sections
+
+The table above showed multiple memory sections.
+
+- ``.text``: is where the code application and constants are located in Flash.
+- ``.data``: non-zero initialized variables; allocated in both RAM and Flash memory (variables are copied from Flash to RAM at run time)
+- ``.bss``: uninitialized data allocated in RAM, or variables initialized to zero.
+- ``Heap``: dynamic allocations in the Heap area in RAM (for example, used by ``malloc``). The maximum size value may be defined at build time.
+- ``Stack``: dynamic allocations in the Stack area in RAM (for example, used to store local data, temporary data when branching to a subroutine or context switch information). The maximum size value may be defined at build time.
+
+There are other entries that require a bit of clarification:
+
+- Fill: represents the bytes in multiple sections (RAM and Flash) that the toolchain has filled with zeros because it requires subsequent data or code to be aligned appropriately in memory.
+- Misc: usually represents helper libraries introduced by the toolchain (like ``libc``), but can also represent modules that are not part of mbed.
+
+## Current support
+
+*memap* has been tested on Windows 7, Linux and Mac OS X and works with memory map files are generated by the GCC_ARM, ARM (ARM Compiler 5) and IAR toochains.
+
+## Known issues and new features
+
+This utility is considered 'alpha' quality at the moment. The information generated by this utility may not be fully accurate and may vary from one toolchain to another.
+
+If you are experiencing problems, or would like additional features, please raise a ticket on [GitHub](https://github.com/mbedmicro/mbed/issues) and use ```[memap] ``` in the title.

docs/memap.md

@@ -1,12 +1,12 @@
-   519	Milosch Meriac
-   420	Alessandro Angelino
-    16	Niklas Hauser
-    15	Jaeden Amero
+   512	Milosch Meriac
+   434	Alessandro Angelino
+    28	Niklas Hauser
+    22	Jaeden Amero
      3	Hugo Vincent
      3	JaredCJR
      3	Jim Huang
      2	tonyyanxuan
-     1	Aksel Skauge Mellbye
-     1	Irit Arkin
      1	Nathan Chong
+     1	Irit Arkin
      1	ccli8
+     1	Aksel Skauge Mellbye

features/FEATURE_UVISOR/AUTHORS.txt

@@ -1 +1 @@
-v0.9.14-alpha
+v0.9.21-alpha

features/FEATURE_UVISOR/VERSION.txt

@@ -33,7 +33,7 @@ TARGET_LIB_INC:=$(TARGET_PREFIX)includes/uvisor-lib
 
 # uVisor source directory - hidden from mbed via TARGET_IGNORE
 UVISOR_GIT_URL:=https://github.com/ARMmbed/uvisor
-UVISOR_GIT_BRANCH:=dev
+UVISOR_GIT_BRANCH:=unstable
 UVISOR_DIR:=TARGET_IGNORE/uvisor
 UVISOR_API:=$(UVISOR_DIR)/api
 UVISOR_GIT_CFG=$(UVISOR_DIR)/.git/config
@@ -72,6 +72,7 @@ rsync:
 	rm -rf $(TARGET_LIB_SRC)
 	mkdir -p $(TARGET_LIB_SRC)
 	cp $(UVISOR_DIR)/core/system/src/page_allocator.c $(TARGET_LIB_SRC)/page_allocator.c_inc
+	cp $(UVISOR_DIR)/core/system/inc/page_allocator_config.h $(TARGET_LIB_SRC)/page_allocator_config.h
 	rsync -a --delete $(UVISOR_API)/rtx/src/ $(TARGET_LIB_SRC)/rtx
 	#
 	# Copying licenses

features/FEATURE_UVISOR/importer/Makefile

@@ -45,6 +45,7 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
         sizeof(RtxBoxIndex), \
         0, \
         0, \
+        0, \
         NULL, \
         acl_list, \
         acl_list_count \
@@ -76,6 +77,7 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
         sizeof(RtxBoxIndex), \
         context_size, \
         __uvisor_box_heapsize, \
+        __uvisor_box_lib_config, \
         __uvisor_box_namespace, \
         acl_list, \
         acl_list_count \
@@ -116,6 +118,13 @@ UVISOR_EXTERN const uint32_t __uvisor_mode;
 #define UVISOR_BOX_NAMESPACE(box_namespace) \
     static const char *const __uvisor_box_namespace = box_namespace
 
+/* Use this macro before UVISOR_BOX_CONFIG to define the function the main
+ * thread of your box will use for its body. If you don't want a main thread,
+ * too bad: you have to have one. */
+#define UVISOR_BOX_MAIN(function, priority, stack_size) \
+    static osThreadDef(function, priority, stack_size); \
+    static const void * const __uvisor_box_lib_config = osThread(function);
+
 #define UVISOR_BOX_HEAPSIZE(heap_size) \
     static const uint32_t __uvisor_box_heapsize = heap_size;
 

features/FEATURE_UVISOR/includes/uvisor/api/inc/box_config.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __UVISOR_API_NVIC_VIRTUAL_H__
+#define __UVISOR_API_NVIC_VIRTUAL_H__
+
+#include "api/inc/interrupts.h"
+
+#define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+#define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+#define NVIC_EnableIRQ              vIRQ_EnableIRQ
+#define NVIC_DisableIRQ             vIRQ_DisableIRQ
+#define NVIC_GetPendingIRQ          vIRQ_GetPendingIRQ
+#define NVIC_SetPendingIRQ          vIRQ_SetPendingIRQ
+#define NVIC_ClearPendingIRQ        vIRQ_ClearPendingIRQ
+#define NVIC_GetActive              __NVIC_GetActive
+#define NVIC_SetPriority            vIRQ_SetPriority
+#define NVIC_GetPriority            vIRQ_GetPriority
+
+#endif /* __UVISOR_API_NVIC_VIRTUAL_H__ */

features/FEATURE_UVISOR/includes/uvisor/api/inc/cmsis_nvic_virtual.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2016, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __UVISOR_API_VECTAB_VIRTUAL_H__
+#define __UVISOR_API_VECTAB_VIRTUAL_H__
+
+#include "api/inc/interrupts.h"
+
+#define NVIC_SetVector              vIRQ_SetVector
+#define NVIC_GetVector              vIRQ_GetVector
+
+#endif /* __UVISOR_API_VECTAB_VIRTUAL_H__ */