Skip to content

Commit 455cd9b

Browse files
aethanielaethaniel
committed
[bl] Fixing bug in jump to application
1 parent c8095fd commit 455cd9b

File tree

4 files changed

+79
-68
lines changed

4 files changed

+79
-68
lines changed

‎bootloaders/zero/bootloader_samd21x18.ld‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
3+
Copyright (c) 2015 Atmel Corporation/Thibaut VIARD. All right reserved.
34
45
This library is free software; you can redistribute it and/or
56
modify it under the terms of the GNU Lesser General Public
@@ -58,7 +59,7 @@ MEMORY
5859
* __StackLimit
5960
* __StackTop
6061
* __stack
61-
* __sketch_stackptr
62+
* __sketch_vectors_ptr
6263
*/
6364
ENTRY(Reset_Handler)
6465

@@ -144,7 +145,7 @@ SECTIONS
144145
*/
145146

146147
__etext = .;
147-
PROVIDE(__sketch_stackptr = ORIGIN(FLASH) + LENGTH(FLASH));
148+
PROVIDE(__sketch_vectors_ptr = ORIGIN(FLASH) + LENGTH(FLASH));
148149

149150

150151
.data : AT (__etext)

‎bootloaders/zero/main.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2015 Arduino LLC. All right reserved.
3+
Copyright (c) 2015 Atmel Corporation/Thibaut VIARD. All right reserved.
34
45
This library is free software; you can redistribute it and/or
56
modify it under the terms of the GNU Lesser General Public
@@ -30,7 +31,7 @@
3031
*
3132
* USB : D-:PA24 D+:PA25
3233
*
33-
* Pins Usage
34+
* Pins Usage (*outdated as of 2015/10/10*)
3435
* --------------------
3536
* The following pins are used by the program :
3637
* PA25 : input/output
@@ -42,7 +43,7 @@
4243
* The application board shall avoid driving the PA25,PA24,PB23,PB22 and PA15 signals
4344
* while the boot program is running (after a POR for example)
4445
*
45-
* Clock system
46+
* Clock system (*outdated as of 2015/10/10*)
4647
* --------------------
4748
* CPU clock source (GCLK_GEN_0) - 8MHz internal oscillator (OSC8M)
4849
* SERCOM5 core GCLK source (GCLK_ID_SERCOM5_CORE) - GCLK_GEN_0 (i.e., OSC8M)
@@ -54,10 +55,10 @@
5455
* SAM-BA code will be located at 0x0 and executed before any applicative code.
5556
*
5657
* Applications compiled to be executed along with the bootloader will start at
57-
* 0x2000
58+
* 0x2000 (see linker script bootloader_samd21x18.ld)
5859
* Before jumping to the application, the bootloader changes the VTOR register
5960
* to use the interrupt vectors of the application @0x2000.<- not required as
60-
* application code is taking care of this
61+
* application code is taking care of this.
6162
*
6263
*/
6364

@@ -70,7 +71,7 @@
7071
#include "sam_ba_usb.h"
7172
#include "sam_ba_cdc.h"
7273

73-
extern uint32_t __sketch_stackptr; // Exported value from linker script
74+
extern uint32_t __sketch_vectors_ptr; // Exported value from linker script
7475
extern void board_init(void);
7576

7677
#if (defined DEBUG) && (DEBUG == 1)
@@ -85,8 +86,8 @@ static volatile bool main_b_cdc_enable = false;
8586
*/
8687
static void check_start_application(void)
8788
{
88-
LED_init();
89-
LED_off();
89+
// LED_init();
90+
// LED_off();
9091

9192
#if defined(BOOT_DOUBLE_TAP_ADDRESS)
9293
#define DOUBLE_TAP_MAGIC 0x07738135
@@ -124,30 +125,29 @@ uint32_t* pulSketch_Start_Address;
124125
#endif
125126

126127
/*
127-
* Test sketch stack pointer @ &__sketch_stackptr
128-
* Stay in SAM-BA if value @ (&__sketch_stackptr) == 0xFFFFFFFF (Erased flash cell value)
128+
* Test sketch stack pointer @ &__sketch_vectors_ptr
129+
* Stay in SAM-BA if value @ (&__sketch_vectors_ptr) == 0xFFFFFFFF (Erased flash cell value)
129130
*/
130-
if (__sketch_stackptr == 0xFFFFFFFF)
131+
if (__sketch_vectors_ptr == 0xFFFFFFFF)
131132
{
132133
/* Stay in bootloader */
133134
return;
134135
}
135-
136-
/*
136+
137+
/*
137138
* Load the sketch Reset Handler address
138-
* __sketch_stackptr is exported from linker script and point on first 32b word of sketch vector table
139+
* __sketch_vectors_ptr is exported from linker script and point on first 32b word of sketch vector table
139140
* First 32b word is sketch stack
140141
* Second 32b word is sketch entry point: Reset_Handler()
141142
*/
142-
pulSketch_Start_Address = &__sketch_stackptr ;
143+
pulSketch_Start_Address = &__sketch_vectors_ptr ;
143144
pulSketch_Start_Address++ ;
144145

145146
/*
146-
* Test reset vector of sketch @ &__sketch_stackptr+4
147+
* Test vector table address of sketch @ &__sketch_vectors_ptr
147148
* Stay in SAM-BA if this function is not aligned enough, ie not valid
148-
* The value 0x01 is the 'Thumb mode' bit added by linker.
149149
*/
150-
if ( (*pulSketch_Start_Address & ~SCB_VTOR_TBLOFF_Msk) != 0x01 )
150+
if ( ((uint32_t)(&__sketch_vectors_ptr) & ~SCB_VTOR_TBLOFF_Msk) != 0x00)
151151
{
152152
/* Stay in bootloader */
153153
return;
@@ -174,13 +174,13 @@ uint32_t* pulSketch_Start_Address;
174174
#endif
175175
*/
176176

177-
LED_on();
177+
// LED_on();
178178

179179
/* Rebase the Stack Pointer */
180-
__set_MSP( (uint32_t)(*(pulSketch_Start_Address-1)) );
180+
__set_MSP( (uint32_t)(__sketch_vectors_ptr) );
181181

182182
/* Rebase the vector table base address */
183-
SCB->VTOR = ((uint32_t)(pulSketch_Start_Address-1) & SCB_VTOR_TBLOFF_Msk);
183+
SCB->VTOR = ((uint32_t)(&__sketch_vectors_ptr) & SCB_VTOR_TBLOFF_Msk);
184184

185185
/* Jump to application Reset Handler in the application */
186186
asm("bx %0"::"r"(*pulSketch_Start_Address));

‎bootloaders/zero/samd21_sam_ba.bin‎

-32 Bytes
Binary file not shown.

‎bootloaders/zero/samd21_sam_ba.cproj‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ProjectVersion>7.0</ProjectVersion>
66
<ToolchainName>com.Atmel.ARMGCC.C</ToolchainName>
77
<ProjectGuid>dce6c7e3-ee26-4d79-826b-08594b9ad897</ProjectGuid>
8-
<avrdevice>ATSAMD21J18A</avrdevice>
8+
<avrdevice>ATSAMD21G18A</avrdevice>
99
<avrdeviceseries>none</avrdeviceseries>
1010
<OutputType>Executable</OutputType>
1111
<Language>C</Language>
@@ -55,60 +55,70 @@
5555
<ToolName>Atmel-ICE</ToolName>
5656
</com_atmel_avrdbg_tool_atmelice>
5757
<avrtoolinterfaceclock>2000000</avrtoolinterfaceclock>
58+
<com_atmel_avrdbg_tool_edbg>
59+
<ToolOptions>
60+
<InterfaceProperties>
61+
</InterfaceProperties>
62+
<InterfaceName>SWD</InterfaceName>
63+
</ToolOptions>
64+
<ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
65+
<ToolNumber>ATML2320040200000259</ToolNumber>
66+
<ToolName>EDBG</ToolName>
67+
</com_atmel_avrdbg_tool_edbg>
5868
</PropertyGroup>
5969
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
6070
<ToolchainSettings>
6171
<ArmGcc>
62-
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
63-
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
64-
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
65-
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
66-
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
67-
<armgcc.compiler.symbols.DefSymbols>
68-
<ListValues>
69-
<Value>NDEBUG</Value>
70-
</ListValues>
71-
</armgcc.compiler.symbols.DefSymbols>
72-
<armgcc.compiler.optimization.level>Optimize for size (-Os)</armgcc.compiler.optimization.level>
73-
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
74-
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
75-
<armgcc.linker.libraries.Libraries>
76-
<ListValues>
77-
<Value>libm</Value>
78-
</ListValues>
79-
</armgcc.linker.libraries.Libraries>
80-
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
81-
<armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
82-
</ArmGcc>
72+
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
73+
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
74+
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
75+
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
76+
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
77+
<armgcc.compiler.symbols.DefSymbols>
78+
<ListValues>
79+
<Value>NDEBUG</Value>
80+
</ListValues>
81+
</armgcc.compiler.symbols.DefSymbols>
82+
<armgcc.compiler.optimization.level>Optimize for size (-Os)</armgcc.compiler.optimization.level>
83+
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
84+
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
85+
<armgcc.linker.libraries.Libraries>
86+
<ListValues>
87+
<Value>libm</Value>
88+
</ListValues>
89+
</armgcc.linker.libraries.Libraries>
90+
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
91+
<armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
92+
</ArmGcc>
8393
</ToolchainSettings>
8494
</PropertyGroup>
8595
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
8696
<ToolchainSettings>
8797
<ArmGcc>
88-
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
89-
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
90-
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
91-
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
92-
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
93-
<armgcc.compiler.symbols.DefSymbols>
94-
<ListValues>
95-
<Value>DEBUG</Value>
96-
</ListValues>
97-
</armgcc.compiler.symbols.DefSymbols>
98-
<armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
99-
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
100-
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
101-
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
102-
<armgcc.linker.libraries.Libraries>
103-
<ListValues>
104-
<Value>libm</Value>
105-
</ListValues>
106-
</armgcc.linker.libraries.Libraries>
107-
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
108-
<armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
109-
<armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
110-
<armgcc.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcc.preprocessingassembler.debugging.DebugLevel>
111-
</ArmGcc>
98+
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
99+
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
100+
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
101+
<armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
102+
<armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
103+
<armgcc.compiler.symbols.DefSymbols>
104+
<ListValues>
105+
<Value>DEBUG</Value>
106+
</ListValues>
107+
</armgcc.compiler.symbols.DefSymbols>
108+
<armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
109+
<armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
110+
<armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
111+
<armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
112+
<armgcc.linker.libraries.Libraries>
113+
<ListValues>
114+
<Value>libm</Value>
115+
</ListValues>
116+
</armgcc.linker.libraries.Libraries>
117+
<armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
118+
<armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
119+
<armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
120+
<armgcc.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcc.preprocessingassembler.debugging.DebugLevel>
121+
</ArmGcc>
112122
</ToolchainSettings>
113123
<UsesExternalMakeFile>True</UsesExternalMakeFile>
114124
<OutputDirectory />

0 commit comments

Comments
 (0)