Unverified Commit 6ae6b668 authored by Vladimir Umek's avatar Vladimir Umek Committed by GitHub
Browse files

Merge pull request #542 from TTornblom/develop

RTOS2: Rebuilt IAR libraries with EVR_RTX_DISABLE and DOMAIN_NS=1 for…
parents 28687a89 b829f10b
......@@ -2927,7 +2927,7 @@ and 8-bit Java bytecodes in Jazelle state.
<file category="linkerScript" name="Device/ARM/ARMv81MML/Source/ARM/ARMv81MML.sct" version="1.0.0" attr="config" condition="ARMCC"/>
<file category="sourceAsm" name="Device/ARM/ARMv81MML/Source/GCC/startup_ARMv81MML.S" version="1.0.0" attr="config" condition="GCC"/>
<file category="linkerScript" name="Device/ARM/ARMv81MML/Source/GCC/gcc_arm.ld" version="1.0.0" attr="config" condition="GCC"/>
<file category="sourceAsm" name="Device/ARM/ARMv81MML/Source/IAR/startup_ARMv81MML.S" version="1.0.0" attr="config" condition="IAR"/>
<file category="sourceAsm" name="Device/ARM/ARMv81MML/Source/IAR/startup_ARMv81MML.s" version="1.0.0" attr="config" condition="IAR"/>
<file category="sourceC" name="Device/ARM/ARMv81MML/Source/system_ARMv81MML.c" version="1.0.0" attr="config"/>
<!-- SAU configuration -->
<file category="header" name="Device/ARM/ARMv81MML/Include/Template/partition_ARMv81MML.h" version="1.0.0" attr="config" condition="ARMv8-M TZ Device"/>
......
......@@ -32,11 +32,11 @@
</option>
<option>
<name>Input description</name>
<state>Automatic choice of formatter.</state>
<state>Automatic choice of formatter, without multibyte support.</state>
</option>
<option>
<name>Output description</name>
<state>Automatic choice of formatter.</state>
<state>Automatic choice of formatter, without multibyte support.</state>
</option>
<option>
<name>GOutputBinary</name>
......@@ -222,6 +222,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMCM0.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -1263,6 +1264,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMCM3.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -2304,6 +2306,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMCM4_FP.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -3345,6 +3348,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MBL.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -4386,6 +4390,8 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MBL.h"</state>
<state>EVR_RTX_DISABLE</state>
<state>DOMAIN_NS=1</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -5427,6 +5433,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MML.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -6468,6 +6475,8 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MML.h"</state>
<state>EVR_RTX_DISABLE</state>
<state>DOMAIN_NS=1</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -7509,6 +7518,7 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MML_SP.h"</state>
<state>EVR_RTX_DISABLE</state>
</option>
<option>
<name>CCPreprocFile</name>
......@@ -8550,6 +8560,8 @@
<name>CCDefines</name>
<state>NDEBUG</state>
<state>CMSIS_device_header="ARMv8MML_SP.h"</state>
<state>EVR_RTX_DISABLE</state>
<state>DOMAIN_NS=1</state>
</option>
<option>
<name>CCPreprocFile</name>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment