Skip to content

Commit 1bc1e12

Browse files
aethanielaethaniel
committed
Bootloader project update to last IAR release
1 parent f478416 commit 1bc1e12

File tree

8 files changed

+67
-52
lines changed

8 files changed

+67
-52
lines changed

‎bootloaders/zero/Debug/Exe/samd21_sam_ba.bin

-7.2 KB
Binary file not shown.

‎bootloaders/zero/Debug/Exe/samd21_sam_ba.out

-144 Bytes
Binary file not shown.

‎bootloaders/zero/Debug/List/samd21_sam_ba.map

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###############################################################################
22
#
3-
# IAR ELF Linker V7.10.1.6676/W32 for ARM 15/Jul/2014 16:53:12
3+
# IAR ELF Linker V7.10.3.6832/W32 for ARM 05/Aug/2014 11:15:31
44
# Copyright 2007-2014 IAR Systems AB.
55
#
66
# Output file =
@@ -31,7 +31,7 @@
3131
# 2014\ArduinoZero\hardware\arduino\samd\bootloaders\zero\Debug\List\samd21_sam_ba.map"
3232
# --config "E:\Arduino
3333
# 2014\ArduinoZero\hardware\arduino\samd\bootloaders\zero\samd21_sam_ba.icf"
34-
# --semihosting --entry __iar_program_start --vfe
34+
# --entry __iar_program_start --vfe
3535
#
3636
###############################################################################
3737

@@ -58,7 +58,7 @@ __SystemLibrary = DLib
5858
.intvec const 0x00000000 0xb0 startup_samd21.o [1]
5959
- 0x000000b0 0xb0
6060

61-
"P1": 0x1c20
61+
"P1": 0x1c18
6262
.text ro code 0x000000b0 0xa84 cdc_enumerate.o [1]
6363
.text ro code 0x00000b34 0x14 memset.o [3]
6464
.text ro code 0x00000b48 0xc memcpy.o [3]
@@ -77,25 +77,25 @@ __SystemLibrary = DLib
7777
.text ro code 0x00001b80 0x1a cmain.o [4]
7878
.text ro code 0x00001b9a 0x8 exit.o [3]
7979
.text ro code 0x00001ba4 0xa cexit.o [4]
80-
.text ro code 0x00001bb0 0x14 exit.o [5]
81-
.iar.init_table const 0x00001bc4 0x24 - Linker created -
82-
.rodata const 0x00001be8 0x1c sam_ba_monitor.o [1]
83-
.rodata const 0x00001c04 0x1c sam_ba_monitor.o [1]
84-
.rodata const 0x00001c20 0x18 uart_driver.o [1]
85-
.rodata const 0x00001c38 0x14 cdc_enumerate.o [1]
86-
.rodata const 0x00001c4c 0xc sam_ba_monitor.o [1]
87-
.rodata const 0x00001c58 0xc sam_ba_monitor.o [1]
88-
.rodata const 0x00001c64 0x4 cdc_enumerate.o [1]
80+
.text ro code 0x00001bb0 0xc XXexit.o [4]
81+
.iar.init_table const 0x00001bbc 0x24 - Linker created -
82+
.rodata const 0x00001be0 0x1c sam_ba_monitor.o [1]
83+
.rodata const 0x00001bfc 0x1c sam_ba_monitor.o [1]
84+
.rodata const 0x00001c18 0x18 uart_driver.o [1]
85+
.rodata const 0x00001c30 0x14 cdc_enumerate.o [1]
86+
.rodata const 0x00001c44 0xc sam_ba_monitor.o [1]
87+
.rodata const 0x00001c50 0xc sam_ba_monitor.o [1]
88+
.rodata const 0x00001c5c 0x4 cdc_enumerate.o [1]
89+
.rodata const 0x00001c60 0x4 main.o [1]
90+
.rodata const 0x00001c64 0x4 main.o [1]
8991
.rodata const 0x00001c68 0x4 main.o [1]
9092
.rodata const 0x00001c6c 0x4 main.o [1]
91-
.rodata const 0x00001c70 0x4 main.o [1]
92-
.rodata const 0x00001c74 0x4 main.o [1]
93-
.rodata const 0x00001c78 0x4 sam_ba_monitor.o [1]
94-
.rodata const 0x00001c7c 0x4 usart_sam_ba.o [1]
95-
.rodata const 0x00001c80 0x0 zero_init3.o [4]
96-
.rodata const 0x00001c80 0x0 copy_init3.o [4]
97-
Initializer bytes ro data 0x00001c80 0x50 <for P2 s0>
98-
- 0x00001cd0 0x1c20
93+
.rodata const 0x00001c70 0x4 sam_ba_monitor.o [1]
94+
.rodata const 0x00001c74 0x4 usart_sam_ba.o [1]
95+
.rodata const 0x00001c78 0x0 zero_init3.o [4]
96+
.rodata const 0x00001c78 0x0 copy_init3.o [4]
97+
Initializer bytes ro data 0x00001c78 0x50 <for P2 s0>
98+
- 0x00001cc8 0x1c18
9999

100100
"P2", part 1 of 3: 0x50
101101
P2 s0 0x20000000 0x50 <Init block>
@@ -160,7 +160,7 @@ Zero (__iar_zero_init3)
160160

161161
Copy (__iar_copy_init3)
162162
1 source range, total size 0x50 (103% of destination):
163-
0x00001c80 0x50
163+
0x00001c78 0x50
164164
1 destination range, total size 0x4d:
165165
0x20000000 0x4d
166166

@@ -197,6 +197,7 @@ dl6M_tln.a: [3]
197197
rt6M_tl.a: [4]
198198
ABImemcpy.o 92
199199
ABImemset.o 84
200+
XXexit.o 12
200201
cexit.o 10
201202
cmain.o 26
202203
copy_init3.o 48
@@ -205,17 +206,12 @@ rt6M_tl.a: [4]
205206
strlen.o 16
206207
zero_init3.o 42
207208
-----------------------------------------------
208-
Total: 370
209-
210-
shb_l.a: [5]
211-
exit.o 20
212-
-----------------------------------------------
213-
Total: 20
209+
Total: 382
214210

215211
Gaps 6
216212
Linker created 39 512
217213
---------------------------------------------------
218-
Grand Total: 6 932 444 1 116
214+
Grand Total: 6 924 444 1 116
219215

220216

221217
*******************************************************************************
@@ -250,10 +246,10 @@ PM_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
250246
PTC_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
251247
PendSV_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
252248
RTC_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
253-
Region$$Table$$Base 0x00001bc4 -- Gb - Linker created -
254-
Region$$Table$$Limit 0x00001be8 -- Gb - Linker created -
249+
Region$$Table$$Base 0x00001bbc -- Gb - Linker created -
250+
Region$$Table$$Limit 0x00001be0 -- Gb - Linker created -
255251
Reset_Handler 0x00001b6d 0x8 Code Gb startup_samd21.o [1]
256-
RomBOOT_Version 0x00001c78 0x4 Data Gb sam_ba_monitor.o [1]
252+
RomBOOT_Version 0x00001c70 0x4 Data Gb sam_ba_monitor.o [1]
257253
SERCOM0_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
258254
SERCOM1_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
259255
SERCOM2_Handler 0x00001b51 0x4 Code Wk startup_samd21.o [1]
@@ -282,7 +278,7 @@ __aeabi_memcpy4 0x00000bd1 Code Gb ABImemcpy.o [4]
282278
__aeabi_memcpy8 0x00000bd1 Code Gb ABImemcpy.o [4]
283279
__aeabi_memset 0x00000b55 Code Gb ABImemset.o [4]
284280
__cmain 0x00001b81 Code Gb cmain.o [4]
285-
__exit 0x00001bb1 0x14 Code Gb exit.o [5]
281+
__exit 0x00001bb1 Code Gb XXexit.o [4]
286282
__iar_Memset4_word 0x00000b75 Code Gb ABImemset.o [4]
287283
__iar_Memset_word 0x00000b61 Code Gb ABImemset.o [4]
288284
__iar_copy_init3 0x00001acd 0x30 Code Gb copy_init3.o [4]
@@ -312,7 +308,7 @@ check_start_application
312308
command 0x20000255 0x1 Data Gb sam_ba_monitor.o [1]
313309
current_number 0x2000022c 0x4 Data Gb sam_ba_monitor.o [1]
314310
data 0x200001d0 0x40 Data Gb sam_ba_monitor.o [1]
315-
devDescriptor 0x00001c38 0x14 Data Gb cdc_enumerate.o [1]
311+
devDescriptor 0x00001c30 0x14 Data Gb cdc_enumerate.o [1]
316312
error_timeout 0x2000025d 0x1 Data Gb usart_sam_ba.o [1]
317313
exit 0x00001b9b 0x8 Code Gb exit.o [3]
318314
g_interrupt_enabled 0x2000004c 0x1 Data Gb interrupt_sam_nvic.o [1]
@@ -348,7 +344,7 @@ u32tmp 0x20000240 0x4 Data Gb sam_ba_monitor.o [1]
348344
uart_basic_init 0x00001217 0x6c Code Gb uart_driver.o [1]
349345
uart_drv_error_flag 0x20000257 0x1 Data Gb uart_driver.o [1]
350346
uart_get_sercom_index 0x000011e9 0x2e Code Gb uart_driver.o [1]
351-
uart_if 0x00001be8 0x1c Data Gb sam_ba_monitor.o [1]
347+
uart_if 0x00001be0 0x1c Data Gb sam_ba_monitor.o [1]
352348
uart_read_byte 0x00001297 0x3e Code Gb uart_driver.o [1]
353349
uart_write_byte 0x00001283 0x14 Code Gb uart_driver.o [1]
354350
udd_ep_in_cache_buffer 0x20000150 0x80 Data Gb cdc_enumerate.o [1]
@@ -365,16 +361,15 @@ usart_putdata_xmd 0x00001031 0xd8 Code Gb usart_sam_ba.o [1]
365361
usart_sharp_received 0x00000e2d 0x1a Code Gb usart_sam_ba.o [1]
366362
usb_endpoint_table 0x20000050 0x80 Data Gb cdc_enumerate.o [1]
367363
usb_init 0x00000a5d 0x1a Code Gb cdc_enumerate.o [1]
368-
usbcdc_if 0x00001c04 0x1c Data Gb sam_ba_monitor.o [1]
364+
usbcdc_if 0x00001bfc 0x1c Data Gb sam_ba_monitor.o [1]
369365

370366

371367
[1] = E:\Arduino 2014\ArduinoZero\hardware\arduino\samd\bootloaders\zero\Debug\Obj
372368
[2] = command line
373369
[3] = dl6M_tln.a
374370
[4] = rt6M_tl.a
375-
[5] = shb_l.a
376371

377-
6 932 bytes of readonly code memory
372+
6 924 bytes of readonly code memory
378373
444 bytes of readonly data memory
379374
1 116 bytes of readwrite data memory
380375

‎bootloaders/zero/Release/Exe/samd21_sam_ba.bin

-5.22 KB
Binary file not shown.

‎bootloaders/zero/Release/Exe/samd21_sam_ba.out

0 Bytes
Binary file not shown.

‎bootloaders/zero/Release/List/samd21_sam_ba.map

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###############################################################################
22
#
3-
# IAR ELF Linker V7.10.1.6676/W32 for ARM 15/Jul/2014 15:52:18
3+
# IAR ELF Linker V7.10.3.6832/W32 for ARM 05/Aug/2014 11:16:16
44
# Copyright 2007-2014 IAR Systems AB.
55
#
66
# Output file =
@@ -179,7 +179,7 @@ Entry Address Size Type Object
179179
?main 0x00001445 Code Gb cmain.o [4]
180180
AC_Handler 0x00001419 0x2 Code Wk startup_samd21.o [1]
181181
ADC_Handler 0x00001419 0x2 Code Wk startup_samd21.o [1]
182-
AT91F_CDC_Enumerate 0x0000039d 0x2e4 Code Lc cdc_enumerate.o [1]
182+
AT91F_CDC_Enumerate 0x0000039d 0x2e2 Code Lc cdc_enumerate.o [1]
183183
AT91F_CDC_Open 0x000001a1 0x20 Code Gb cdc_enumerate.o [1]
184184
AT91F_InitUSB 0x000000b1 0xea Code Gb cdc_enumerate.o [1]
185185
AT91F_USB_SendZlp 0x00000327 0x28 Code Gb cdc_enumerate.o [1]

‎bootloaders/zero/samd21_sam_ba.ewp

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</option>
8888
<option>
8989
<name>OGLastSavedByProductVersion</name>
90-
<state>7.10.1.6733</state>
90+
<state>7.10.3.6927</state>
9191
</option>
9292
<option>
9393
<name>GeneralEnableMisra</name>
@@ -99,11 +99,11 @@
9999
</option>
100100
<option>
101101
<name>OGChipSelectEditMenu</name>
102-
<state>ATSAMD20G18 Atmel ATSAMD20G18</state>
102+
<state>ATSAMD21G18A Atmel ATSAMD21G18A</state>
103103
</option>
104104
<option>
105105
<name>GenLowLevelInterface</name>
106-
<state>1</state>
106+
<state>0</state>
107107
</option>
108108
<option>
109109
<name>GEndianModeBE</name>
@@ -163,7 +163,7 @@
163163
<name>ICCARM</name>
164164
<archiveVersion>2</archiveVersion>
165165
<data>
166-
<version>30</version>
166+
<version>31</version>
167167
<wantNonLocal>1</wantNonLocal>
168168
<debug>1</debug>
169169
<option>
@@ -411,6 +411,10 @@
411411
<version>0</version>
412412
<state>0</state>
413413
</option>
414+
<option>
415+
<name>CCGuardCalls</name>
416+
<state>1</state>
417+
</option>
414418
</data>
415419
</settings>
416420
<settings>
@@ -596,23 +600,23 @@
596600
<option>
597601
<name>OOCOutputFormat</name>
598602
<version>2</version>
599-
<state>2</state>
603+
<state>1</state>
600604
</option>
601605
<option>
602606
<name>OCOutputOverride</name>
603607
<state>0</state>
604608
</option>
605609
<option>
606610
<name>OOCOutputFile</name>
607-
<state>samd21_sam_ba.bin</state>
611+
<state>samd21_sam_ba.hex</state>
608612
</option>
609613
<option>
610614
<name>OOCCommandLineProducer</name>
611615
<state>1</state>
612616
</option>
613617
<option>
614618
<name>OOCObjCopyEnable</name>
615-
<state>1</state>
619+
<state>0</state>
616620
</option>
617621
</data>
618622
</settings>
@@ -1039,7 +1043,7 @@
10391043
</option>
10401044
<option>
10411045
<name>OGLastSavedByProductVersion</name>
1042-
<state>7.10.1.6733</state>
1046+
<state>7.10.3.6927</state>
10431047
</option>
10441048
<option>
10451049
<name>GeneralEnableMisra</name>
@@ -1115,7 +1119,7 @@
11151119
<name>ICCARM</name>
11161120
<archiveVersion>2</archiveVersion>
11171121
<data>
1118-
<version>30</version>
1122+
<version>31</version>
11191123
<wantNonLocal>1</wantNonLocal>
11201124
<debug>0</debug>
11211125
<option>
@@ -1364,6 +1368,10 @@
13641368
<version>0</version>
13651369
<state>0</state>
13661370
</option>
1371+
<option>
1372+
<name>CCGuardCalls</name>
1373+
<state>1</state>
1374+
</option>
13671375
</data>
13681376
</settings>
13691377
<settings>
@@ -1542,23 +1550,23 @@
15421550
<option>
15431551
<name>OOCOutputFormat</name>
15441552
<version>2</version>
1545-
<state>2</state>
1553+
<state>1</state>
15461554
</option>
15471555
<option>
15481556
<name>OCOutputOverride</name>
15491557
<state>1</state>
15501558
</option>
15511559
<option>
15521560
<name>OOCOutputFile</name>
1553-
<state>samd21_sam_ba.bin</state>
1561+
<state>samd21_sam_ba.hex</state>
15541562
</option>
15551563
<option>
15561564
<name>OOCCommandLineProducer</name>
15571565
<state>1</state>
15581566
</option>
15591567
<option>
15601568
<name>OOCObjCopyEnable</name>
1561-
<state>1</state>
1569+
<state>0</state>
15621570
</option>
15631571
</data>
15641572
</settings>

‎bootloaders/zero/samd21_sam_ba.eww

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,19 @@
44
<project>
55
<path>$WS_DIR$\samd21_sam_ba.ewp</path>
66
</project>
7-
<batchBuild/>
7+
<batchBuild>
8+
<batchDefinition>
9+
<name>all</name>
10+
<member>
11+
<project>samd21_sam_ba</project>
12+
<configuration>Debug</configuration>
13+
</member>
14+
<member>
15+
<project>samd21_sam_ba</project>
16+
<configuration>Release</configuration>
17+
</member>
18+
</batchDefinition>
19+
</batchBuild>
820
</workspace>
921

1022

0 commit comments

Comments
 (0)