Skip to content

Commit 98f6f7b

Browse files
royabeanroyabean
committed
Pull request #33: Develop
Merge in MCU16CE/pic24-dspic-can-canfd-bootloader from develop to master * commit '05cd0ac7a974820088eee5f23bd401723d0bd73d': update app bootloader version to get script updates and clean delimiter issues for linux fix sh and bat delimiter issues. Uprev application. chmod + () instead of {} fixing curly brace trying.${_/_} post build chmod post build "./" making bat/sh extension independent in post build script update dfp for build server documentation version updates update documentation to reflect CAL 3.3.2 or later. Update to 3.3.x CAL support.
2 parents 81aacec + 05cd0ac commit 98f6f7b

File tree

80 files changed

+1414
-612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1414
-612
lines changed

‎.main-meta/main.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"content":{
55
"metaDataVersion":"1.0.0",
66
"name":"com.microchip.mplabx.project.pic24-dspic-can-canfd-bootloader",
7-
"version":"1.1.0",
7+
"version":"1.2.0",
88
"displayName":"PIC24/dsPIC CAN/CAN-FD Bootloader",
99
"projectName":"pic24-dspic-can-canfd-bootloader",
1010
"shortDescription":"CAN and CAN-FD bootloader example using the ISO-15765-2 CAN transport layer for the PIC24 and dsPIC product lines.",

‎changelog.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# PIC24/dsPIC CAN / CAN-FD Bootloader Firmware v1.2.0
2+
### Release Highlights
3+
4+
- Update TA100 Trust Anchor external HSM to Crypto Authentication Library to 3.3.2
5+
6+
### Features Added\Updated
7+
8+
- Support for TA100 ECDSA verify on Crypto Authentication Library 3.3.2 required rewritten HAL
9+
110
# PIC24/dsPIC CAN / CAN-FD Bootloader Firmware v1.1.0
211
### Release Highlights
312

‎dspic33ck-can/app.X/MyConfig.mc3‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
<string>DMT</string>
2121
<string>class com.microchip.mcc.mcu16.systemManager.dmt.DMT</string>
2222
</entry>
23-
<entry>
24-
<string>RESET</string>
25-
<string>class com.microchip.mcc.mcu16.systemManager.reset.RESET</string>
26-
</entry>
2723
<entry>
2824
<string>ICD</string>
2925
<string>class com.microchip.mcc.mcu16.systemManager.icd.Icd</string>
3026
</entry>
27+
<entry>
28+
<string>RESET</string>
29+
<string>class com.microchip.mcc.mcu16.systemManager.reset.RESET</string>
30+
</entry>
3131
<entry>
3232
<string>Interrupt Module</string>
3333
<string>class com.microchip.mcc.mcu16.interruptManager_dsPIC.InterruptManager_dsPIC</string>
@@ -54,8 +54,8 @@
5454
</entry>
5555
</usedClasses>
5656
<usedLibraries class="java.util.ArrayList">
57+
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.19.0"/>
5758
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.mcu16.Mcu16PeripheralLibrary" version="1.169.2"/>
58-
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.18.4"/>
5959
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.boardsupportlibrary.BoardSuppportLibrary" version="1.12.0"/>
6060
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.foundationservices.library.FoundationServicesLibrary" version="0.2.2"/>
6161
</usedLibraries>
@@ -16082,17 +16082,13 @@
1608216082
<file>mcc_generated_files\interrupt_manager.h</file>
1608316083
<hash>ad67ad2850096b60434747474931eef604620c259748e6ffe2f5da9a80cb7532</hash>
1608416084
</entry>
16085-
<entry>
16086-
<file>mcc_generated_files\boot\remapped_reset.S</file>
16087-
<hash>05078d30a781e24fb5000164bd918b9849a6d4a4a5ad90202f1933c54301a0b0</hash>
16088-
</entry>
1608916085
<entry>
1609016086
<file>mcc_generated_files\boot\hardware_interrupt_table.S</file>
16091-
<hash>9e9153e7b090fa37b0f2bfe9e90bbbfdeb375ac7878d3cf46ba706494ed63aa4</hash>
16087+
<hash>b4eefe0edfc08ea9840a55540214b966fa3440def254b988d5836cf2efced5bf</hash>
1609216088
</entry>
1609316089
<entry>
1609416090
<file>mcc_generated_files\boot\postBuild.bat</file>
16095-
<hash>83fd5fbea992b99132b17517b3dfdbf9148cbd27a5ebe561af0ef6725164be73</hash>
16091+
<hash>9f91b79b2eed3f1286c765f1716d0b3a90a2b0ccbf8670eb70c65a6797e408e1</hash>
1609616092
</entry>
1609716093
<entry>
1609816094
<file>mcc_generated_files\system_types.h</file>
@@ -16112,43 +16108,43 @@
1611216108
</entry>
1611316109
<entry>
1611416110
<file>mcc_generated_files\system.c</file>
16115-
<hash>411a8e963c36e74a376c557eefdbf12772753b5b2fa592e5ef75733e6c090a1f</hash>
16111+
<hash>99e346f851609570997e3b845a9d531959dc50351d9a879ad6fc21bd900e6bf8</hash>
1611616112
</entry>
1611716113
<entry>
1611816114
<file>mcc_generated_files\clock.h</file>
1611916115
<hash>0b6275aa971cc3c1b29838d943ce7208a8e85d7fef146dcf45d1942c668079d1</hash>
1612016116
</entry>
1612116117
<entry>
1612216118
<file>mcc_generated_files\boot\user_interrupt_table.S</file>
16123-
<hash>61322b7c38116ff8980bfed24372484e416c112a0678302a412df802d3c863d0</hash>
16119+
<hash>2125578a9499a5418a83a12063093662d5e2a4001a8cd588e8178541c26411a4</hash>
1612416120
</entry>
1612516121
<entry>
1612616122
<file>mcc_generated_files\docs\delay.dox</file>
1612716123
<hash>13d4874d789b563dd4499efacd71882cbc38f8459da91ac17f13fa76079be93b</hash>
1612816124
</entry>
1612916125
<entry>
1613016126
<file>mcc_generated_files\boot\interrupts.S</file>
16131-
<hash>0f82052f71c3c5761ab996c603c345505ea29f8e3b6ef8ef5f199d99f7cb7524</hash>
16127+
<hash>506f92989683bbfab5fbc57c10230f8065c18cc707ed0c60a369391a2d53fc9f</hash>
1613216128
</entry>
1613316129
<entry>
1613416130
<file>mcc_generated_files\mcc.c</file>
1613516131
<hash>5063e41499c0f63905ad7982135b6028c9d95b5248884e01961ca9382753d7db</hash>
1613616132
</entry>
1613716133
<entry>
1613816134
<file>mcc_generated_files\boot\application_header_checksum16.S</file>
16139-
<hash>70aabbd5889fb4e73060ff3e79bd58304204b07336c246f5394ee4840500f4c1</hash>
16135+
<hash>193f5184de47a72e08537588325d3af9266126b3644e285591437c06772d12a3</hash>
1614016136
</entry>
1614116137
<entry>
1614216138
<file>mcc_generated_files\reset.h</file>
1614316139
<hash>5149540a892aca5df6c9bb53d04603f9b18e94a5c1653f9c699920d46889ca79</hash>
1614416140
</entry>
1614516141
<entry>
1614616142
<file>mcc_generated_files\mcc.h</file>
16147-
<hash>68e41ad2e3739b91356745d5d8f9ab743894bf6212d828dda41e01bff3d3b325</hash>
16143+
<hash>bd7cdb846028fd8e1f548708769a2926044e2850e77ea1122bf337424825c24f</hash>
1614816144
</entry>
1614916145
<entry>
1615016146
<file>mcc_generated_files\boot\postBuild.sh</file>
16151-
<hash>098e034ead0463cd9848de5afb459ba0f9f12dbe58809c81435246521c5e68f1</hash>
16147+
<hash>49a6094faa426e748c3908773e403f99ffa49fbd879e220fe53cc03303c934de</hash>
1615216148
</entry>
1615316149
<entry>
1615416150
<file>mcc_generated_files\reset.c</file>
@@ -16162,21 +16158,21 @@
1616216158
<file>main.c</file>
1616316159
<hash>e0fda6a558a2f90af7640d6f94174dd624e9f8c3f3ae9c2259ef8bd5200b49d4</hash>
1616416160
</entry>
16165-
<entry>
16166-
<file>mcc_generated_files\pin_manager.h</file>
16167-
<hash>0e68bbc6ba1cad4260b0a5337e739fcfb2ed5c02b7dae12da512f272dff67997</hash>
16168-
</entry>
1616916161
<entry>
1617016162
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.sh</file>
1617116163
<hash>5894ccf0fe60f99268ed53fb87ffcbc4cda41f28c72891c934a25ec4ec51359d</hash>
1617216164
</entry>
16165+
<entry>
16166+
<file>mcc_generated_files\pin_manager.h</file>
16167+
<hash>0e68bbc6ba1cad4260b0a5337e739fcfb2ed5c02b7dae12da512f272dff67997</hash>
16168+
</entry>
1617316169
<entry>
1617416170
<file>mcc_generated_files\pin_manager.c</file>
1617516171
<hash>6757b4a1411952a65d51fc5bdee0acb7da0d05d1a04275926eb2ea4d1dd4765f</hash>
1617616172
</entry>
1617716173
<entry>
1617816174
<file>mcc_generated_files\boot\boot_config.h</file>
16179-
<hash>0f12877a6bf225005d7d395243adc72da5dea65c1f640a337990a1eab7bf26eb</hash>
16175+
<hash>5c24da8414bf1d01d240e5907c98dd3acd777a89b598fa4b5287303ff33223a4</hash>
1618016176
</entry>
1618116177
<entry>
1618216178
<file>mcc_generated_files\traps.c</file>
@@ -16188,7 +16184,7 @@
1618816184
</entry>
1618916185
<entry>
1619016186
<file>mcc_generated_files\boot\memory_partition.S</file>
16191-
<hash>199b43cd9e4d24ac0ba8f9f377d499c8a1a6194f77e71c115b3036a146402195</hash>
16187+
<hash>b4b4a8238c551740b23810cb9b3355f86de39d9ccfb61c452037ea6849fd3781</hash>
1619216188
</entry>
1619316189
<entry>
1619416190
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.bat</file>

‎dspic33ck-can/app.X/mcc_generated_files/boot/application_header_checksum16.S‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -66,8 +66,8 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
6666
* 2. Select the 'Building' left navigation node.
6767
* 3. Check the box next to 'Execute this line after the build'.
6868
* 4. In the text field below,
69-
* add "cd mcc_generated_files/boot && postBuild.bat $(MP_CC_DIR)" (without quotes) if you are on a Windows machine,
70-
* or "cd mcc_generated_files/boot && ./postBuild.sh $(MP_CC_DIR)" (without quotes) if you are on a Linux/Unix/Mac machine.
69+
* add "cd mcc_generated_files/boot && postBuild.bat $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}" (without quotes) if you are on a Windows machine,
70+
* or "cd mcc_generated_files/boot && ./postBuild.sh $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}" (without quotes) if you are on a Linux/Unix/Mac machine.
7171
* 5. Delete or comment out the #error message above
7272
*/
7373

@@ -83,4 +83,24 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
8383

8484
/* Address where to end the checksum */
8585
.long(0x2B7FE)
86+
87+
/* Firmware Image Reset Remap */
88+
goto __resetPRI
89+
90+
/* Start of Extended Application Header */
91+
.word 0
92+
93+
/* Length of Extended Application Header */
94+
.long (2)
95+
96+
/* Count of Items in Application Header */
97+
.word (2)
98+
99+
/* Version Number ID */
100+
.word (2)
86101

102+
/* Version Number Length */
103+
.long (4)
104+
105+
/* Version Number Data */
106+
.long(0x0)

‎dspic33ck-can/app.X/mcc_generated_files/boot/boot_config.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -58,6 +58,9 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5858
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW 0x3000
5959
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_HIGH 0x2B7FE
6060

61+
#define BOOT_CONFIG_DOWNLOAD_LOW 0x3000
62+
#define BOOT_CONFIG_DOWNLOAD_HIGH 0x2B7FE
63+
6164
#define BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE 10
6265

6366
#define BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)

‎dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
hexmate r0-5FFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex -O..\..\dist\default\production\combined.production.hex
1+
hexmate r0-5FFF,../../../boot.X/dist/default/production/boot.X.production.hex r6000-56FFF,../../dist/default/production/app.X.production.hex r57000-FFFFFFFF,../../../boot.X/dist/default/production/boot.X.production.hex -O../../dist/default/production/combined.production.hex

‎dspic33ck-can/app.X/mcc_generated_files/boot/hardware_interrupt_table.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626

‎dspic33ck-can/app.X/mcc_generated_files/boot/interrupts.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626

‎dspic33ck-can/app.X/mcc_generated_files/boot/memory_partition.S‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -52,27 +52,36 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5252
third party licenses prohibit any of the restrictions described here,
5353
such restrictions will not apply to such third party software.
5454
*/
55-
/* This code will block out the space reserved by the boot loader so that the
56-
* application code can't link into that area.
57-
*
58-
* The value in the address() field defines the start address of the
59-
* boot code.
60-
*
61-
* The number on the .space defines the size of this block in PC units (2 per
62-
* instruction).
63-
*/
55+
6456
#include "boot_config.h"
6557
.equ ERASE_PAGE_MASK,(~((2048) - 1))
6658
.equ LAST_PAGE_START_ADDRESS, (0x2BEFE & ERASE_PAGE_MASK)
67-
68-
59+
.equ RESERVED_MEMORY_START, (0x2B7FE+2)
6960
.equ PROGRAM_MEMORY_ORIGIN, (0x000200)
61+
.equ LAST_ADDRESS_OF_MEMORY, (0x2BEFE)
7062

63+
/* The exectuable application image lives between:
64+
* Start Address = 0x3000
65+
* End Address = 0x2B7FE
66+
*
67+
* All other memory on the device must be reserved so that executable
68+
* application code can't link to those addresses. This includes the space
69+
* required by the bootloader.
70+
*
71+
* The value in the address() field defines the start address.
72+
* The number on the .space defines the size of this block in PC units (2 per
73+
* instruction).
74+
*/
75+
76+
/* Reserve the memory used by the bootloader */
7177
.section *, code, address(PROGRAM_MEMORY_ORIGIN), noload, keep
7278
boot_loader_memory:
7379
.space (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW - PROGRAM_MEMORY_ORIGIN), 0x00
7480

75-
.section *, code, address(LAST_PAGE_START_ADDRESS), noload, keep
81+
/* Reserve all of the memory after the last instruction of the executable
82+
* image, through the end of device memory.
83+
*/
84+
.section *, code, address(RESERVED_MEMORY_START), noload, keep
7685
config_page_memory:
77-
.space (0x2BEFE-LAST_PAGE_START_ADDRESS), 0x00
86+
.space (LAST_ADDRESS_OF_MEMORY-RESERVED_MEMORY_START), 0x00
7887

‎dspic33ck-can/app.X/mcc_generated_files/boot/postBuild.bat‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
hexmate r0-5FFF,..\..\dist\default\production\app.X.production.hex r6004-FFFFFFFF,..\..\dist\default\production\app.X.production.hex -O..\..\dist\default\production\temp_original_copy.X.production.hex -FILL=w1:0x00,0x00,0x00,0x00@0x6000:0x6003
2-
hexmate r6000-FFFFFFFF,..\..\dist\default\production\temp_original_copy.X.production.hex -O..\..\dist\default\production\temp_checksum.X.production.hex -FILL=w1:0xFF,0xFF,0xFF,0x00@0x6000:0x56FFF +-CK=6000-56FFF@6000w-2g2
3-
hexmate r6000-6003,..\..\dist\default\production\temp_checksum.X.production.hex r6004-FFFFFFFF,..\..\dist\default\production\temp_original_copy.X.production.hex r0-5FFF,..\..\dist\default\production\temp_original_copy.X.production.hex -O..\..\dist\default\production\app.X.production.hex
4-
del ..\..\dist\default\production\temp_checksum.X.production.hex
5-
del ..\..\dist\default\production\temp_original_copy.X.production.hex
1+
if %5=="true" (
2+
exit 0
3+
)
4+
hexmate r0-5FFF,"%~2\%~3\%~4" r6004-FFFFFFFF,"%~2\%~3\%~4" -O"%~2\%~3\temp_original_copy.X.production.hex" -FILL=w1:0x00,0x00,0x00,0x00@0x6000:0x6003
5+
hexmate r6000-FFFFFFFF,"%~2\%~3\temp_original_copy.X.production.hex" -O"%~2\%~3\temp_checksum.X.production.hex" -FILL=w1:0xFF,0xFF,0xFF,0x00@0x6000:0x56FFF +-CK=6000-56FFF@6000w-2g2
6+
hexmate r6000-6003,"%~2\%~3\temp_checksum.X.production.hex" r6004-FFFFFFFF,"%~2\%~3\temp_original_copy.X.production.hex" r0-5FFF,"%~2\%~3\temp_original_copy.X.production.hex" -O"%~2\%~3\%~4"
7+
del "%~2\%~3\temp_checksum.X.production.hex"
8+
del "%~2\%~3\temp_original_copy.X.production.hex"

0 commit comments

Comments
 (0)