Skip to content

Commit 623d2a5

Browse files
fpistmfpistm
committed
[GenF4] Fix Flash Memory Size management
Signed-off-by: Frederic.Pillon <[email protected]>
1 parent d86b19a commit 623d2a5

File tree

6 files changed

+31
-235
lines changed

6 files changed

+31
-235
lines changed

‎boards.txt

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -578,21 +578,25 @@ GenF4.menu.pnum.BLACK_F407VE.build.board=BLACK_F407VE
578578
GenF4.menu.pnum.BLACK_F407VE.build.product_line=STM32F407xx
579579
GenF4.menu.pnum.BLACK_F407VE.build.variant=BLACK_F407VE
580580

581-
# Black F407Z(E-G)
581+
# Black F407ZE
582582
# Support: Serial1 (USART1 on PA10, PA9)
583583
# Default SPI: SPI (SPI1 on PB3,PB4,PB5 - NRF24 connector and W25Q16 (on board flash))
584-
GenF4.menu.pnum.BLACK_F407ZE=Black F407Z(E-G)
584+
GenF4.menu.pnum.BLACK_F407ZE=Black F407ZE
585+
GenF4.menu.pnum.BLACK_F407ZE.upload.maximum_size=524288
585586
GenF4.menu.pnum.BLACK_F407ZE.upload.maximum_data_size=131072
586-
GenF4.menu.pnum.BLACK_F407ZE.build.board=BLACK_F407ZE_G
587+
GenF4.menu.pnum.BLACK_F407ZE.build.board=BLACK_F407ZE
587588
GenF4.menu.pnum.BLACK_F407ZE.build.product_line=STM32F407xx
588589
GenF4.menu.pnum.BLACK_F407ZE.build.variant=BLACK_F407VE
589590

590-
GenF4.menu.flash.ZE=ZE 512k (default)
591-
GenF4.menu.flash.ZE.upload.maximum_size=524288
592-
GenF4.menu.flash.ZE.build.ldscript=ldscript.ld
593-
GenF4.menu.flash.ZG=ZG 1024k
594-
GenF4.menu.flash.ZG.upload.maximum_size=1048576
595-
GenF4.menu.flash.ZG.build.ldscript=ldscript_zg.ld
591+
# Black F407ZG
592+
# Support: Serial1 (USART1 on PA10, PA9)
593+
# Default SPI: SPI (SPI1 on PB3,PB4,PB5 - NRF24 connector and W25Q16 (on board flash))
594+
GenF4.menu.pnum.BLACK_F407ZG=Black F407ZG
595+
GenF4.menu.pnum.BLACK_F407ZG.upload.maximum_size=1048576
596+
GenF4.menu.pnum.BLACK_F407ZG.upload.maximum_data_size=131072
597+
GenF4.menu.pnum.BLACK_F407ZG.build.board=BLACK_F407ZG
598+
GenF4.menu.pnum.BLACK_F407ZG.build.product_line=STM32F407xx
599+
GenF4.menu.pnum.BLACK_F407ZG.build.variant=BLACK_F407VE
596600

597601
# Blue F407VE mini: http://wiki.stm32duino.com/index.php?title=Vcc-gnd.com_STM32F407VET6_Mini
598602
# Support: Serial1 (USART1 on PA10, PA9)

‎variants/BLACK_F407VE/PeripheralPins.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const PinMap PinMap_ADC[] = {
5757
// {PA_4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
5858
// {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
5959
{PA_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
60-
#ifdef ARDUINO_BLACK_F407ZE_G
60+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
6161
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
6262
// {PA_6, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
6363
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
@@ -83,7 +83,7 @@ const PinMap PinMap_ADC[] = {
8383
{PC_4, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
8484
// {PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
8585
{PC_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
86-
#ifdef ARDUINO_BLACK_F407ZE_G
86+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
8787
// {PF_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9
8888
// {PF_4, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14
8989
// {PF_5, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15
@@ -115,7 +115,7 @@ const PinMap PinMap_I2C_SDA[] = {
115115
{PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
116116
{PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
117117
{PC_9, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
118-
#ifdef ARDUINO_BLACK_F407ZE_G
118+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
119119
{PF_0, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
120120
#endif
121121
{NC, NP, 0}
@@ -128,7 +128,7 @@ const PinMap PinMap_I2C_SCL[] = {
128128
{PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
129129
{PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
130130
{PB_10, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
131-
#ifdef ARDUINO_BLACK_F407ZE_G
131+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
132132
{PF_1, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
133133
#endif
134134
{NC, NP, 0}
@@ -207,7 +207,7 @@ const PinMap PinMap_PWM[] = {
207207
{PE_12, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
208208
{PE_13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
209209
{PE_14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
210-
#ifdef ARDUINO_BLACK_F407ZE_G
210+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
211211
{PF_6, TIM10, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
212212
{PF_7, TIM11, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
213213
{PF_8, TIM13, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
@@ -232,7 +232,7 @@ const PinMap PinMap_UART_TX[] = {
232232
{PC_12, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
233233
{PD_5, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
234234
{PD_8, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
235-
#ifdef ARDUINO_BLACK_F407ZE_G
235+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
236236
// {PG_14, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
237237
#endif
238238
{NC, NP, 0}
@@ -252,7 +252,7 @@ const PinMap PinMap_UART_RX[] = {
252252
{PD_2, UART5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)},
253253
{PD_6, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
254254
{PD_9, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
255-
#ifdef ARDUINO_BLACK_F407ZE_G
255+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
256256
// {PG_9, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
257257
#endif
258258
{NC, NP, 0}
@@ -266,7 +266,7 @@ const PinMap PinMap_UART_RTS[] = {
266266
{PB_14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
267267
{PD_4, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
268268
{PD_12, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
269-
#ifdef ARDUINO_BLACK_F407ZE_G
269+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
270270
{PG_8, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
271271
{PG_12, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
272272
#endif
@@ -281,7 +281,7 @@ const PinMap PinMap_UART_CTS[] = {
281281
{PB_13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
282282
{PD_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
283283
{PD_11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
284-
#ifdef ARDUINO_BLACK_F407ZE_G
284+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
285285
{PG_13, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
286286
{PG_15, USART6, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)},
287287
#endif
@@ -386,7 +386,7 @@ const PinMap PinMap_Ethernet[] = {
386386
{PC_4, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
387387
{PC_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
388388
{PE_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
389-
#ifdef ARDUINO_BLACK_F407ZE_G
389+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
390390
{PG_8, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
391391
{PG_11, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
392392
{PG_13, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0

‎variants/BLACK_F407VE/ldscript.ld

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
*****************************************************************************
33
**
44

5-
** File : LinkerScript.ld
5+
** File : lscript.ld
66
**
7-
** Abstract : Linker script for STM32F407VETx Device with
8-
** 512KByte FLASH, 128KByte RAM
7+
** Abstract : Linker script for STM32F407(VZ)(EG)Tx Device with
8+
** 512/1024KByte FLASH, 128KByte RAM
99
**
1010
** Set heap size, stack size and stack location according
1111
** to application requirements.
@@ -62,7 +62,7 @@ MEMORY
6262
{
6363
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
6464
CCMRAM (rw) : ORIGIN = 0x10000000, LENGTH = 64K
65-
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 512K
65+
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = LD_MAX_SIZE
6666
}
6767

6868
/* Define output sections */

‎variants/BLACK_F407VE/ldscript_zg.ld

Lines changed: 0 additions & 208 deletions
This file was deleted.

‎variants/BLACK_F407VE/variant.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const PinName digitalPin[] = {
110110
};
111111
#endif // ARDUINO_BLACK_F407VE
112112

113-
#ifdef ARDUINO_BLACK_F407ZE_G
113+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
114114
const PinName digitalPin[] = {
115115
// Left Side
116116
//Ext //Int
@@ -200,7 +200,7 @@ const PinName digitalPin[] = {
200200
PF_7,
201201
PF_8
202202
};
203-
#endif // ARDUINO_BLACK_F407ZE_G
203+
#endif // ARDUINO_BLACK_F407ZE || ARDUINO_BLACK_F407ZG
204204

205205
#ifdef __cplusplus
206206
}

‎variants/BLACK_F407VE/variant.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ extern const PinName digitalPin[];
150150

151151
#endif // ARDUINO_BLACK_F407VE
152152

153-
#ifdef ARDUINO_BLACK_F407ZE_G
153+
#if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG)
154154
// Left Side
155155
#define PB12 0
156156
#define PB13 1
@@ -278,7 +278,7 @@ extern const PinName digitalPin[];
278278
// Board specific button
279279
#define BTN_WK_UP PA0
280280

281-
#endif // ARDUINO_BLACK_F407ZE_G
281+
#endif // ARDUINO_BLACK_F407ZE || ARDUINO_BLACK_F407ZG
282282

283283
#define LED_BUILTIN LED_D2
284284
#define LED_GREEN LED_D2

0 commit comments

Comments
 (0)