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

Jump to bottom

[refactoring] Cleanup for option bytes and flash settings #941

Merged
merged 14 commits into from
Apr 22, 2020
Merged

[refactoring] Cleanup for option bytes and flash settings #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e8503fb
stlink.h: document a bit flash types.
grevaillot Apr 17, 2020
498de0c
option write : remove size check, this has already been done earlier
grevaillot Apr 17, 2020
598af1c
use constant for optkey
grevaillot Apr 17, 2020
4a28814
common: add some flash option lock/unlock helpers
grevaillot Apr 17, 2020
29cfb7d
common: add some l0/l1 support in helpers
grevaillot Apr 20, 2020
2cff67a
update f2 and f4 option read/write code routines
grevaillot Apr 20, 2020
9e53550
update l4 option code to use helpers, based on l496.
grevaillot Apr 20, 2020
70043c4
update gx option code: use helpers.
grevaillot Apr 20, 2020
f23de87
update l0/l1 option code:
grevaillot Apr 20, 2020
c4d9936
common: implement flash check error for l0 and f0
grevaillot Apr 17, 2020
a69a6fb
use defines
grevaillot Apr 20, 2020
853468d
common: whitespace fixes
grevaillot Apr 21, 2020
f29e1a6
common: warn on unsupported access.
grevaillot Apr 21, 2020
8e69625
write option byte: final refactor
grevaillot Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/stlink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ extern "C" {

enum stlink_flash_type {
STLINK_FLASH_TYPE_UNKNOWN = 0,
STLINK_FLASH_TYPE_F0,
STLINK_FLASH_TYPE_L0,
STLINK_FLASH_TYPE_F4,
STLINK_FLASH_TYPE_L4,
STLINK_FLASH_TYPE_F1_XL,
STLINK_FLASH_TYPE_F0, /* used by f0, f1 (except f1xl),f3. */
STLINK_FLASH_TYPE_F1_XL, /* f0 flash with dual bank, apparently */
STLINK_FLASH_TYPE_F4, /* used by f2, f4, f7 */
STLINK_FLASH_TYPE_L0, /* l0, l1 */
STLINK_FLASH_TYPE_L4, /* l4, l4+ */
STLINK_FLASH_TYPE_G0,
STLINK_FLASH_TYPE_G4,
STLINK_FLASH_TYPE_WB
Expand Down
8 changes: 6 additions & 2 deletions src/chipid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ static const struct stlink_chipid_params devices[] = {
.flash_pagesize = 0x20000,
.sram_size = 0x20000,
.bootrom_base = 0x1fff0000,
.bootrom_size = 0x7800
.bootrom_size = 0x7800,
.option_base = 0x1FFFC000,
.option_size = 4,
},
{ // PM0063
.chip_id = STLINK_CHIPID_STM32_F1_LOW,
Expand Down Expand Up @@ -218,7 +220,9 @@ static const struct stlink_chipid_params devices[] = {
.flash_pagesize = 0x20000,
.sram_size = 0x20000,
.bootrom_base = 0x1fff0000,
.bootrom_size = 0x7800
.bootrom_size = 0x7800,
.option_base = 0x1FFFC000,
.option_size = 4,
},
{
// STM32F410 MCUs. Support based on DM00180366.pdf (RM0401) document.
Expand Down