Skip to content

Commit 1816faa

Browse files
committed
Fix the linker scripts for number8
1 parent eaff189 commit 1816faa

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Bootloader/firmware/Bootloader.X/nbproject/configurations.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<makeCustomizationPostStep></makeCustomizationPostStep>
226226
<makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
227227
<makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
228-
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
228+
<makeCustomizationNormalizeHexFile>true</makeCustomizationNormalizeHexFile>
229229
</makeCustomizationType>
230230
<item path="../../../linker/bootloader_mx675F512H.ld"
231231
ex="true"
@@ -636,7 +636,7 @@
636636
<makeCustomizationPostStep></makeCustomizationPostStep>
637637
<makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
638638
<makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
639-
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
639+
<makeCustomizationNormalizeHexFile>true</makeCustomizationNormalizeHexFile>
640640
</makeCustomizationType>
641641
<item path="../../../linker/bootloader_mx795F512L.ld"
642642
ex="true"

firmware/ja-rule.X/nbproject/configurations.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,9 @@
289289
<makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
290290
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
291291
</makeCustomizationType>
292-
<item path="../../linker/app_mx795F512L.ld" ex="true" overriding="false">
292+
<item path="../../linker/app_mx675F512H.ld" ex="true" overriding="false">
293+
</item>
294+
<item path="../../linker/app_mx795F512L.ld" ex="false" overriding="false">
293295
<C32>
294296
</C32>
295297
<C32-AR>
@@ -666,7 +668,7 @@
666668
<makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
667669
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
668670
</makeCustomizationType>
669-
<item path="../../linker/app_mx675F512H.ld" ex="true" overriding="false">
671+
<item path="../../linker/app_mx675F512H.ld" ex="false" overriding="false">
670672
<C32>
671673
</C32>
672674
<C32-AR>
@@ -680,6 +682,8 @@
680682
<C32Global>
681683
</C32Global>
682684
</item>
685+
<item path="../../linker/app_mx795F512L.ld" ex="true" overriding="false">
686+
</item>
683687
<item path="../src/system_config/ethernet_sk2/board_init.c"
684688
ex="true"
685689
overriding="false">
@@ -1137,6 +1141,7 @@
11371141
<property key="UART4" value="true"/>
11381142
<property key="UART5" value="true"/>
11391143
<property key="UART6" value="true"/>
1144+
<property key="firmware.download.all" value="false"/>
11401145
<property key="hwtoolclock.frcindebug" value="false"/>
11411146
<property key="memories.aux" value="false"/>
11421147
<property key="memories.bootflash" value="true"/>

linker/app_mx675F512H.ld

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ _RESET_ADDR = 0x9D008000;
1111
_BEV_EXCPT_ADDR = 0x9D008380;
1212
_DBG_EXCPT_ADDR = 0x9D008480;
1313

14-
1514
/*************************************************************************
1615
* Memory Regions
1716
*************************************************************************/
@@ -23,4 +22,4 @@ MEMORY
2322
kseg1_boot_mem : ORIGIN = 0x9D008000, LENGTH = 0x490
2423
}
2524

26-
INCLUDE common_mx695F512L.ld
25+
INCLUDE common_mx675F512H.ld

0 commit comments

Comments
 (0)