Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing and merging of STM32L0 and STM32L1 loaders #1

Closed
wants to merge 8 commits into from
Closed

Fixing and merging of STM32L0 and STM32L1 loaders #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5d6cec
Fix for broken STML0 and STML1
tomdeboer May 6, 2016
a591a30
Merge pull request #407 from tomdeboer/STML1_Fix
texane May 6, 2016
2694936
Fixed the STM32L-problem according to @gluedig
tomdeboer May 6, 2016
17ab4bc
Revert "Merge pull request #407 from tomdeboer/STML1_Fix"
gluedig May 9, 2016
013fc42
fix for L0 flash loader
gluedig May 6, 2016
d8c4e7c
merge L0 and L1 flash loader
gluedig May 9, 2016
1900e37
Merge commit 'd8c4e7c1bd29921c2b24703d264669b9c711bae9' into STML1_Fix
tomdeboer May 9, 2016
75ed6cf
Formatted comments and stm32lx.s
tomdeboer May 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flashloaders/stm32lx.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
***************************************************************************/


// Build : arm-eabi-gcc -c stm32lx.S
// Build : arm-eabi-gcc -c stm32lx.s
.text
.syntax unified
.cpu cortex-m3
Expand All @@ -36,7 +36,7 @@
/*
r0 - source address
r1 - destination address
r2 - count
r2 - output, remaining word count
*/

// Go to compare
Expand All @@ -54,7 +54,7 @@ test_done:
// Test r2
cmp r2, #0
// Loop if not zero
bcc.n write_word
bhi write_word

// Set breakpoint to exit
bkpt #0x00
59 changes: 16 additions & 43 deletions src/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,45 +1509,20 @@ int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
};

static const uint8_t loader_code_stm32l[] = {

/* openocd.git/contrib/loaders/flash/stm32lx.S
r0, input, source addr
r1, input, dest addr
r2, input, word count
r2, output, remaining word count
*/

0x04, 0xe0,

0x50, 0xf8, 0x04, 0xcb,
0x41, 0xf8, 0x04, 0xcb,
0x01, 0x3a,

0x00, 0x2a,
0xf8, 0xd3,
0x00, 0xbe
};

static const uint8_t loader_code_stm32l0[] = {

/*
r0, input, source addr
r1, input, dest addr
r2, input, word count
r2, output, remaining word count
*/

0x04, 0xe0,

0x04, 0x68,
0x0c, 0x60,
0x01, 0x3a,
0x04, 0x31,
0x04, 0x30,

0x00, 0x2a,
0xf8, 0xd3,
0x00, 0xbe
// flashloaders/stm32lx.s

0x04, 0xe0, // b test_done ; Go to compare
// write_word:
0x04, 0x68, // ldr r4, [r0] ; Load one word from address in r0
0x0c, 0x60, // str r4, [r1] ; Store the word to address in r1
0x04, 0x30, // adds r0, #4 ; Increment r0
0x04, 0x31, // adds r1, #4 ; Increment r1
0x01, 0x3a, // subs r2, #1 ; Decrement r2
// test_done:
0x00, 0x2a, // cmp r2, #0 ; Compare r2 to 0
0xf8, 0xd8, // bhi write_word ; Loop if above 0
0x00, 0xbe, // bkpt #0x00 ; Set breakpoint to exit
0x00, 0x00
};

static const uint8_t loader_code_stm32f4[] = {
Expand Down Expand Up @@ -1636,7 +1611,8 @@ int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {

if (sl->chip_id == STM32_CHIPID_L1_MEDIUM || sl->chip_id == STM32_CHIPID_L1_CAT2
|| sl->chip_id == STM32_CHIPID_L1_MEDIUM_PLUS || sl->chip_id == STM32_CHIPID_L1_HIGH
|| sl->chip_id == STM32_CHIPID_L152_RE) { /* stm32l */
|| sl->chip_id == STM32_CHIPID_L152_RE
|| sl->chip_id == STM32_CHIPID_L0 || sl->chip_id == STM32_CHIPID_L0_CAT5) { /* stm32l */
loader_code = loader_code_stm32l;
loader_size = sizeof(loader_code_stm32l);
} else if (sl->core_id == STM32VL_CORE_ID
Expand Down Expand Up @@ -1667,9 +1643,6 @@ int write_loader_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size) {
} else if (sl->chip_id == STM32_CHIPID_F0 || sl->chip_id == STM32_CHIPID_F04 || sl->chip_id == STM32_CHIPID_F0_CAN || sl->chip_id == STM32_CHIPID_F0_SMALL || sl->chip_id == STM32_CHIPID_F09X) {
loader_code = loader_code_stm32f0;
loader_size = sizeof(loader_code_stm32f0);
} else if (sl->chip_id == STM32_CHIPID_L0 || sl->chip_id == STM32_CHIPID_L0_CAT5) {
loader_code = loader_code_stm32l0;
loader_size = sizeof(loader_code_stm32l0);
} else if (sl->chip_id == STM32_CHIPID_L4) {
loader_code = loader_code_stm32l4;
loader_size = sizeof(loader_code_stm32l4);
Expand Down