Skip to content

Commit 9033d23

Browse files
daskygitptrxyz
authored andcommitted
Enable eeprom with F401xE ld (qmk#14752)
1 parent 3b5c9ef commit 9033d23

File tree

3 files changed

+89
-4
lines changed

3 files changed

+89
-4
lines changed

common_features.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ else
174174
SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
175175
SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
176176
OPT_DEFS += -DEEPROM_EMU_STM32F072xB
177-
else ifneq ($(filter $(MCU_SERIES)_$(MCU_LDSCRIPT),STM32F4xx_STM32F401xC STM32F4xx_STM32F411xE STM32F4xx_STM32F405xG),)
177+
else ifneq ($(filter $(MCU_SERIES)_$(MCU_LDSCRIPT),STM32F4xx_STM32F401xC STM32F4xx_STM32F401xE STM32F4xx_STM32F411xE STM32F4xx_STM32F405xG),)
178178
OPT_DEFS += -DEEPROM_DRIVER
179179
COMMON_VPATH += $(DRIVER_PATH)/eeprom
180180
SRC += eeprom_driver.c
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
/*
18+
* STM32F401xE memory setup.
19+
*/
20+
MEMORY
21+
{
22+
flash0 (rx) : org = 0x08000000, len = 16k /* Sector 0 - Init code as ROM bootloader assumes application starts here */
23+
flash1 (rx) : org = 0x08004000, len = 16k /* Sector 1 - Emulated eeprom */
24+
flash2 (rx) : org = 0x08008000, len = 512k - 32k /* Sector 2..7 - Rest of firmware */
25+
flash3 (rx) : org = 0x00000000, len = 0
26+
flash4 (rx) : org = 0x00000000, len = 0
27+
flash5 (rx) : org = 0x00000000, len = 0
28+
flash6 (rx) : org = 0x00000000, len = 0
29+
flash7 (rx) : org = 0x00000000, len = 0
30+
ram0 (wx) : org = 0x20000000, len = 96k
31+
ram1 (wx) : org = 0x00000000, len = 0
32+
ram2 (wx) : org = 0x00000000, len = 0
33+
ram3 (wx) : org = 0x00000000, len = 0
34+
ram4 (wx) : org = 0x00000000, len = 0
35+
ram5 (wx) : org = 0x00000000, len = 0
36+
ram6 (wx) : org = 0x00000000, len = 0
37+
ram7 (wx) : org = 0x00000000, len = 0
38+
}
39+
40+
/* For each data/text section two region are defined, a virtual region
41+
and a load region (_LMA suffix).*/
42+
43+
/* Flash region to be used for exception vectors.*/
44+
REGION_ALIAS("VECTORS_FLASH", flash0);
45+
REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
46+
47+
/* Flash region to be used for constructors and destructors.*/
48+
REGION_ALIAS("XTORS_FLASH", flash2);
49+
REGION_ALIAS("XTORS_FLASH_LMA", flash2);
50+
51+
/* Flash region to be used for code text.*/
52+
REGION_ALIAS("TEXT_FLASH", flash2);
53+
REGION_ALIAS("TEXT_FLASH_LMA", flash2);
54+
55+
/* Flash region to be used for read only data.*/
56+
REGION_ALIAS("RODATA_FLASH", flash2);
57+
REGION_ALIAS("RODATA_FLASH_LMA", flash2);
58+
59+
/* Flash region to be used for various.*/
60+
REGION_ALIAS("VARIOUS_FLASH", flash2);
61+
REGION_ALIAS("VARIOUS_FLASH_LMA", flash2);
62+
63+
/* Flash region to be used for RAM(n) initialization data.*/
64+
REGION_ALIAS("RAM_INIT_FLASH_LMA", flash2);
65+
66+
/* RAM region to be used for Main stack. This stack accommodates the processing
67+
of all exceptions and interrupts.*/
68+
REGION_ALIAS("MAIN_STACK_RAM", ram0);
69+
70+
/* RAM region to be used for the process stack. This is the stack used by
71+
the main() function.*/
72+
REGION_ALIAS("PROCESS_STACK_RAM", ram0);
73+
74+
/* RAM region to be used for data segment.*/
75+
REGION_ALIAS("DATA_RAM", ram0);
76+
REGION_ALIAS("DATA_RAM_LMA", flash2);
77+
78+
/* RAM region to be used for BSS segment.*/
79+
REGION_ALIAS("BSS_RAM", ram0);
80+
81+
/* RAM region to be used for the default heap.*/
82+
REGION_ALIAS("HEAP_RAM", ram0);
83+
84+
/* Generic rules inclusion.*/
85+
INCLUDE rules.ld

tmk_core/common/chibios/eeprom_stm32_defs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# ifndef FEE_PAGE_COUNT
3333
# define FEE_PAGE_COUNT 4 // How many pages are used
3434
# endif
35-
# elif defined(STM32F401xC) || defined(STM32F405xG) || defined(STM32F411xE)
35+
# elif defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
3636
# ifndef FEE_PAGE_SIZE
3737
# define FEE_PAGE_SIZE 0x4000 // Page size = 16KByte
3838
# endif
@@ -49,7 +49,7 @@
4949
# define FEE_MCU_FLASH_SIZE 128 // Size in Kb
5050
# elif defined(STM32F303xC) || defined(STM32F401xC)
5151
# define FEE_MCU_FLASH_SIZE 256 // Size in Kb
52-
# elif defined(STM32F103xE) || defined(STM32F411xE)
52+
# elif defined(STM32F103xE) || defined(STM32F401xE) || defined(STM32F411xE)
5353
# define FEE_MCU_FLASH_SIZE 512 // Size in Kb
5454
# elif defined(STM32F405xG)
5555
# define FEE_MCU_FLASH_SIZE 1024 // Size in Kb
@@ -58,7 +58,7 @@
5858

5959
/* Start of the emulated eeprom */
6060
#if !defined(FEE_PAGE_BASE_ADDRESS)
61-
# if defined(STM32F401xC) || defined(STM32F405xG) || defined(STM32F411xE)
61+
# if defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
6262
# ifndef FEE_PAGE_BASE_ADDRESS
6363
# define FEE_PAGE_BASE_ADDRESS 0x08004000 // bodge to force 2nd 16k page
6464
# endif

0 commit comments

Comments
 (0)