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

Added option byte info for STM32F411XX #1141

Merged
merged 1 commit into from
May 12, 2021
Merged

Added option byte info for STM32F411XX #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2739,7 +2739,7 @@ uint32_t stlink_calculate_pagesize(stlink_t *sl, uint32_t flashaddr) {
(sl->chip_id == STLINK_CHIPID_STM32_F4_DE) ||
(sl->chip_id == STLINK_CHIPID_STM32_F4_LP) ||
(sl->chip_id == STLINK_CHIPID_STM32_F4_HD) ||
(sl->chip_id == STLINK_CHIPID_STM32_F411RE) ||
(sl->chip_id == STLINK_CHIPID_STM32_F411XX) ||
(sl->chip_id == STLINK_CHIPID_STM32_F446) ||
(sl->chip_id == STLINK_CHIPID_STM32_F4_DSI) ||
(sl->chip_id == STLINK_CHIPID_STM32_F72XXX) ||
Expand Down
2 changes: 1 addition & 1 deletion src/st-util/gdb-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ char* make_memory_map(stlink_t *sl) {

if (sl->chip_id == STLINK_CHIPID_STM32_F4 ||
sl->chip_id == STLINK_CHIPID_STM32_F446 ||
sl->chip_id == STLINK_CHIPID_STM32_F411RE) {
sl->chip_id == STLINK_CHIPID_STM32_F411XX) {
strcpy(map, memory_map_template_F4);
} else if (sl->chip_id == STLINK_CHIPID_STM32_F4_DE) {
strcpy(map, memory_map_template_F4_DE);
Expand Down
6 changes: 4 additions & 2 deletions src/stlink-lib/chipid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,16 @@ static const struct stlink_chipid_params devices[] = {
.flags = CHIP_F_HAS_SWO_TRACING,
},
{
.chip_id = STLINK_CHIPID_STM32_F411RE,
.description = "stm32f411re",
.chip_id = STLINK_CHIPID_STM32_F411XX,
.description = "STM32F411xC/E",
.flash_type = STLINK_FLASH_TYPE_F4,
.flash_size_reg = 0x1FFF7A22,
.flash_pagesize = 0x4000,
.sram_size = 0x20000,
.bootrom_base = 0x1fff0000,
.bootrom_size = 0x7800,
.option_base = STM32_F4_OPTION_BYTES_BASE,
.option_size = 4,
.flags = CHIP_F_HAS_SWO_TRACING,
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/stlink-lib/chipid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enum stlink_stm32_chipids {
STLINK_CHIPID_STM32_F1_VL_HIGH = 0x428,
STLINK_CHIPID_STM32_L1_CAT2 = 0x429,
STLINK_CHIPID_STM32_F1_XL = 0x430,
STLINK_CHIPID_STM32_F411RE = 0x431,
STLINK_CHIPID_STM32_F411XX = 0x431,
STLINK_CHIPID_STM32_F37x = 0x432,
STLINK_CHIPID_STM32_F4_DE = 0x433,
STLINK_CHIPID_STM32_F4_DSI = 0x434,
Expand Down
2 changes: 1 addition & 1 deletion src/stlink-lib/flash_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ int stlink_flash_loader_write_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t*
sl->chip_id == STLINK_CHIPID_STM32_F4_HD ||
sl->chip_id == STLINK_CHIPID_STM32_F4_DSI ||
sl->chip_id == STLINK_CHIPID_STM32_F410 ||
sl->chip_id == STLINK_CHIPID_STM32_F411RE ||
sl->chip_id == STLINK_CHIPID_STM32_F411XX ||
sl->chip_id == STLINK_CHIPID_STM32_F412 ||
sl->chip_id == STLINK_CHIPID_STM32_F413 ||
sl->chip_id == STLINK_CHIPID_STM32_F446) {
Expand Down