Skip to content

Commit

Permalink
Merge pull request alibaba#168 from JiapengLi/master
Browse files Browse the repository at this point in the history
[lorawan] IAR project linker file uses relative path
  • Loading branch information
junjiec authored Mar 23, 2018
2 parents 6652026 + 0855c06 commit 599ec0a
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions projects/IAR/lorawanapp/lorawanapp.ewp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>30</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
Expand Down Expand Up @@ -66,7 +66,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>8.20.1.14181</state>
<state>8.22.2.15993</state>
</option>
<option>
<name>GeneralEnableMisra</name>
Expand Down Expand Up @@ -200,6 +200,10 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
Expand Down Expand Up @@ -789,7 +793,7 @@
</option>
<option>
<name>IlinkIcfFile</name>
<state>C:\repo\aos\platform\mcu\stm32l0xx\stm32l071kb\stm32l071xB.icf</state>
<state>$PROJ_DIR$\..\..\..\platform\mcu\stm32l0xx\stm32l071kb\stm32l071xB.icf</state>
</option>
<option>
<name>IlinkIcfFileSlave</name>
Expand Down Expand Up @@ -1059,7 +1063,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>30</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
Expand Down Expand Up @@ -1248,6 +1252,10 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
</data>
</settings>
<settings>
Expand Down

0 comments on commit 599ec0a

Please sign in to comment.