Skip to content

Fix F4x7vx definitions #940

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

Merged
merged 3 commits into from
Feb 18, 2020
Merged

Fix F4x7vx definitions #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d056f2
[P-Nucleo-WB55RG] Add new node name NOD_WB55RG
fpistm Feb 17, 2020
9ee139f
Fix CCRAM definition
fpistm Feb 17, 2020
20c6173
Ensure CCM RAM clock is enabled
fpistm Feb 17, 2020
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
24 changes: 12 additions & 12 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Nucleo_144.menu.pnum.NUCLEO_F207ZG.build.cmsis_lib_gcc=arm_cortexM3l_math
Nucleo_144.menu.pnum.NUCLEO_F429ZI=Nucleo F429ZI
Nucleo_144.menu.pnum.NUCLEO_F429ZI.node=NODE_F429ZI
Nucleo_144.menu.pnum.NUCLEO_F429ZI.upload.maximum_size=2097152
Nucleo_144.menu.pnum.NUCLEO_F429ZI.upload.maximum_data_size=262144
Nucleo_144.menu.pnum.NUCLEO_F429ZI.upload.maximum_data_size=196608
Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.mcu=cortex-m4
Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.board=NUCLEO_F429ZI
Expand Down Expand Up @@ -398,7 +398,7 @@ Nucleo_64.menu.pnum.NUCLEO_L476RG.build.cmsis_lib_gcc=arm_cortexM4lf_math

# PNUCLEO_WB55RG board
Nucleo_64.menu.pnum.PNUCLEO_WB55RG=P-Nucleo WB55RG
Nucleo_64.menu.pnum.PNUCLEO_WB55RG.node=NODE_WB55RG
Nucleo_64.menu.pnum.PNUCLEO_WB55RG.node="NODE_WB55RG,NOD_WB55RG"
Nucleo_64.menu.pnum.PNUCLEO_WB55RG.upload.maximum_size=524288
Nucleo_64.menu.pnum.PNUCLEO_WB55RG.upload.maximum_data_size=196604
Nucleo_64.menu.pnum.PNUCLEO_WB55RG.build.mcu=cortex-m4
Expand Down Expand Up @@ -571,7 +571,7 @@ Disco.menu.pnum.DISCO_F100RB.build.cmsis_lib_gcc=arm_cortexM3l_math
Disco.menu.pnum.DISCO_F407VG=STM32F407G-DISC1
Disco.menu.pnum.DISCO_F407VG.node=DIS_F407VG
Disco.menu.pnum.DISCO_F407VG.upload.maximum_size=1048576
Disco.menu.pnum.DISCO_F407VG.upload.maximum_data_size=196608
Disco.menu.pnum.DISCO_F407VG.upload.maximum_data_size=131072
Disco.menu.pnum.DISCO_F407VG.build.mcu=cortex-m4
Disco.menu.pnum.DISCO_F407VG.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
Disco.menu.pnum.DISCO_F407VG.build.board=DISCO_F407VG
Expand Down Expand Up @@ -1137,23 +1137,23 @@ GenF4.menu.pnum.Generic_F423CH.build.variant=Generic_F4x3Cx
# Generic F417VG
GenF4.menu.pnum.Generic_F417VG=Generic F417VG
GenF4.menu.pnum.Generic_F417VG.upload.maximum_size=1048576
GenF4.menu.pnum.Generic_F417VG.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F417VG.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F417VG.build.board=GENERIC_F417VG
GenF4.menu.pnum.Generic_F417VG.build.product_line=STM32F417xx
GenF4.menu.pnum.Generic_F417VG.build.variant=Generic_F4x7Vx

# Generic F417VE
GenF4.menu.pnum.Generic_F417VE=Generic F417VE
GenF4.menu.pnum.Generic_F417VE.upload.maximum_size=524288
GenF4.menu.pnum.Generic_F417VE.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F417VE.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F417VE.build.board=GENERIC_F417VE
GenF4.menu.pnum.Generic_F417VE.build.product_line=STM32F417xx
GenF4.menu.pnum.Generic_F417VE.build.variant=Generic_F4x7Vx

# Generic F415RG
GenF4.menu.pnum.Generic_F415RG=Generic F415RG
GenF4.menu.pnum.Generic_F415RG.upload.maximum_size=1048576
GenF4.menu.pnum.Generic_F415RG.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F415RG.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F415RG.build.board=GENERIC_F415RG
GenF4.menu.pnum.Generic_F415RG.build.product_line=STM32F415xx
GenF4.menu.pnum.Generic_F415RG.build.variant=Generic_F4x5RG
Expand All @@ -1180,7 +1180,7 @@ GenF4.menu.pnum.Generic_F413CH.upload.maximum_size=1572864
GenF4.menu.pnum.Generic_F413CH.upload.maximum_data_size=327680
GenF4.menu.pnum.Generic_F413CH.build.board=GENERIC_F413CH
GenF4.menu.pnum.Generic_F413CH.build.product_line=STM32F413xx
GenF4.menu.pnum.Generic_F413CH.build.variant=Generic_F4x3Rx
GenF4.menu.pnum.Generic_F413CH.build.variant=Generic_F4x3Cx

# Generic F413CG
GenF4.menu.pnum.Generic_F413CG=Generic F413CG
Expand Down Expand Up @@ -1289,23 +1289,23 @@ GenF4.menu.pnum.Generic_F410C8.build.variant=Generic_F410Cx
# Generic F407VG
GenF4.menu.pnum.Generic_F407VG=Generic F407VG
GenF4.menu.pnum.Generic_F407VG.upload.maximum_size=1048576
GenF4.menu.pnum.Generic_F407VG.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F407VG.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F407VG.build.board=GENERIC_F407VG
GenF4.menu.pnum.Generic_F407VG.build.product_line=STM32F407xx
GenF4.menu.pnum.Generic_F407VG.build.variant=Generic_F4x7Vx

# Generic F407VE
GenF4.menu.pnum.Generic_F407VE=Generic F407VE
GenF4.menu.pnum.Generic_F407VE.upload.maximum_size=524288
GenF4.menu.pnum.Generic_F407VE.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F407VE.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F407VE.build.board=GENERIC_F407VE
GenF4.menu.pnum.Generic_F407VE.build.product_line=STM32F407xx
GenF4.menu.pnum.Generic_F407VE.build.variant=Generic_F4x7Vx

# Generic F405RG
GenF4.menu.pnum.Generic_F405RG=Generic F405RG
GenF4.menu.pnum.Generic_F405RG.upload.maximum_size=1048576
GenF4.menu.pnum.Generic_F405RG.upload.maximum_data_size=196608
GenF4.menu.pnum.Generic_F405RG.upload.maximum_data_size=131072
GenF4.menu.pnum.Generic_F405RG.build.board=GENERIC_F405RG
GenF4.menu.pnum.Generic_F405RG.build.product_line=STM32F405xx
GenF4.menu.pnum.Generic_F405RG.build.variant=Generic_F4x5RG
Expand Down Expand Up @@ -1613,7 +1613,7 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
# PRNTR_F407_V1 board
3dprinter.menu.pnum.PRNTR_F407_V1=PRNTR F407 v1
3dprinter.menu.pnum.PRNTR_F407_V1.upload.maximum_size=524288
3dprinter.menu.pnum.PRNTR_F407_V1.upload.maximum_data_size=196608
3dprinter.menu.pnum.PRNTR_F407_V1.upload.maximum_data_size=131072
3dprinter.menu.pnum.PRNTR_F407_V1.build.mcu=cortex-m4
3dprinter.menu.pnum.PRNTR_F407_V1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
3dprinter.menu.pnum.PRNTR_F407_V1.build.board=PRNTR_F407_V1
Expand All @@ -1625,7 +1625,7 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
# PRNTR_V2 board
3dprinter.menu.pnum.PRNTR_V2=PRNTR v2
3dprinter.menu.pnum.PRNTR_V2.upload.maximum_size=524288
3dprinter.menu.pnum.PRNTR_V2.upload.maximum_data_size=196608
3dprinter.menu.pnum.PRNTR_V2.upload.maximum_data_size=131072
3dprinter.menu.pnum.PRNTR_V2.build.mcu=cortex-m4
3dprinter.menu.pnum.PRNTR_V2.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
3dprinter.menu.pnum.PRNTR_V2.build.board=PRNTR_V2
Expand Down
4 changes: 4 additions & 0 deletions variants/BLACK_F407XX/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ WEAK void SystemClock_Config(void)
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
_Error_Handler(__FILE__, __LINE__);
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions variants/BLUE_F407VE_Mini/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ WEAK void SystemClock_Config(void)
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
_Error_Handler(__FILE__, __LINE__);
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
21 changes: 10 additions & 11 deletions variants/DISCO_F407VG/ldscript.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
**
** Target : STMicroelectronics STM32
**
**
** Distribution: The file is distributed as is, without any warranty
** Distribution: The file is distributed “as is,” without any warranty
** of any kind.
**
*****************************************************************************
** @attention
**
** <h2><center>&copy; COPYRIGHT(c) 2014 Ac6</center></h2>
** <h2><center>&copy; COPYRIGHT(c) 2019 STMicroelectronics</center></h2>
**
** Redistribution and use in source and binary forms, with or without modification,
** are permitted provided that the following conditions are met:
Expand All @@ -30,7 +29,7 @@
** 2. Redistributions in binary form must reproduce the above copyright notice,
** this list of conditions and the following disclaimer in the documentation
** and/or other materials provided with the distribution.
** 3. Neither the name of Ac6 nor the names of its contributors
** 3. Neither the name of STMicroelectronics nor the names of its contributors
** may be used to endorse or promote products derived from this software
** without specific prior written permission.
**
Expand All @@ -54,15 +53,15 @@ ENTRY(Reset_Handler)
/* Highest address of the user mode stack */
_estack = 0x20020000; /* end of RAM */
/* Generate a link error if heap and stack don't fit into RAM */
_Min_Heap_Size = 0x200;; /* required amount of heap */
_Min_Stack_Size = 0x400;; /* required amount of stack */
_Min_Heap_Size = 0x200; /* required amount of heap */
_Min_Stack_Size = 0x400; /* required amount of stack */

/* Specify the memory areas */
MEMORY
{
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 1024K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K
CCMRAM (rw) : ORIGIN = 0x10000000, LENGTH = 64K
FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 1024K
}

/* Define output sections */
Expand All @@ -77,7 +76,7 @@ SECTIONS
} >FLASH

/* The program code and other data goes into FLASH */
.text ALIGN(4):
.text :
{
. = ALIGN(4);
*(.text) /* .text sections (code) */
Expand All @@ -94,7 +93,7 @@ SECTIONS
} >FLASH

/* Constant data goes into FLASH */
.rodata ALIGN(4):
.rodata :
{
. = ALIGN(4);
*(.rodata) /* .rodata sections (constants, strings, etc.) */
Expand Down Expand Up @@ -184,12 +183,12 @@ SECTIONS
/* User_heap_stack section, used to check that there is enough RAM left */
._user_heap_stack :
{
. = ALIGN(4);
. = ALIGN(8);
PROVIDE ( end = . );
PROVIDE ( _end = . );
. = . + _Min_Heap_Size;
. = . + _Min_Stack_Size;
. = ALIGN(4);
. = ALIGN(8);
} >RAM


Expand Down
4 changes: 4 additions & 0 deletions variants/DISCO_F407VG/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ WEAK void SystemClock_Config(void)
/* Enable the Flash prefetch */
__HAL_FLASH_PREFETCH_BUFFER_ENABLE();
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions variants/DIYMORE_F407VGT/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ WEAK void SystemClock_Config(void)
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
_Error_Handler(__FILE__, __LINE__);
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions variants/FEATHER_F405/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ WEAK void SystemClock_Config(void)
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
_Error_Handler(__FILE__, __LINE__);
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions variants/FK407M1/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ WEAK void SystemClock_Config(void)
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
_Error_Handler(__FILE__, __LINE__);
}

/* Ensure CCM RAM clock is enabled */
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();

}

#ifdef __cplusplus
Expand Down
24 changes: 2 additions & 22 deletions variants/Generic_F412Cx/ldscript.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
CCMRAM (rw) : ORIGIN = 0x10000000, LENGTH = 64K
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
}

Expand All @@ -77,7 +76,7 @@ SECTIONS
} >FLASH

/* The program code and other data goes into FLASH */
.text ALIGN(8):
.text :
{
. = ALIGN(4);
*(.text) /* .text sections (code) */
Expand All @@ -94,7 +93,7 @@ SECTIONS
} >FLASH

/* Constant data goes into FLASH */
.rodata ALIGN(4):
.rodata :
{
. = ALIGN(4);
*(.rodata) /* .rodata sections (constants, strings, etc.) */
Expand Down Expand Up @@ -145,25 +144,6 @@ SECTIONS
_edata = .; /* define a global symbol at data end */
} >RAM AT> FLASH

_siccmram = LOADADDR(.ccmram);

/* CCM-RAM section
*
* IMPORTANT NOTE!
* If initialized variables will be placed in this section,
* the startup code needs to be modified to copy the init-values.
*/
.ccmram :
{
. = ALIGN(4);
_sccmram = .; /* create a global symbol at ccmram start */
*(.ccmram)
*(.ccmram*)

. = ALIGN(4);
_eccmram = .; /* create a global symbol at ccmram end */
} >CCMRAM AT> FLASH


/* Uninitialized data section */
. = ALIGN(4);
Expand Down
25 changes: 3 additions & 22 deletions variants/Generic_F412Rx/ldscript.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

** File : LinkerScript.ld
**
** Author : Auto-generated by System Workbench for STM32
**
** Abstract : Linker script for STM32F412Rx series
** 512/1024Kbytes FLASH and 256Kbytes RAM
Expand Down Expand Up @@ -61,7 +62,6 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
MEMORY
{
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
CCMRAM (rw) : ORIGIN = 0x10000000, LENGTH = 64K
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
}

Expand All @@ -77,7 +77,7 @@ SECTIONS
} >FLASH

/* The program code and other data goes into FLASH */
.text ALIGN(8):
.text :
{
. = ALIGN(4);
*(.text) /* .text sections (code) */
Expand All @@ -94,7 +94,7 @@ SECTIONS
} >FLASH

/* Constant data goes into FLASH */
.rodata ALIGN(4):
.rodata :
{
. = ALIGN(4);
*(.rodata) /* .rodata sections (constants, strings, etc.) */
Expand Down Expand Up @@ -145,25 +145,6 @@ SECTIONS
_edata = .; /* define a global symbol at data end */
} >RAM AT> FLASH

_siccmram = LOADADDR(.ccmram);

/* CCM-RAM section
*
* IMPORTANT NOTE!
* If initialized variables will be placed in this section,
* the startup code needs to be modified to copy the init-values.
*/
.ccmram :
{
. = ALIGN(4);
_sccmram = .; /* create a global symbol at ccmram start */
*(.ccmram)
*(.ccmram*)

. = ALIGN(4);
_eccmram = .; /* create a global symbol at ccmram end */
} >CCMRAM AT> FLASH


/* Uninitialized data section */
. = ALIGN(4);
Expand Down
Loading