sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32F7: flash: macro naming errors, there is no FLASH_CONFIG_F for F7

Browse Source 
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen 2017-05-02 12:36:01 +03:00 committed by Gregory Nutt
parent fbe02dfe6b
commit 74e016d013
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/src/stm32f7/Kconfig
View File

@ -26,7 +26,7 @@ config ARCH_CHIP_STM32F745VE
select STM32F7_FLASH_CONFIG_E
select STM32F7_IO_CONFIG_V
---help---
STM32 F7 Cortex M7, 512 320K FLASH, 320K (240+16+64) Kb SRAM
STM32 F7 Cortex M7, 512 FLASH, 320K (240+16+64) Kb SRAM
config ARCH_CHIP_STM32F745IG
bool "STM32F745IG"
@ -835,7 +835,7 @@ config STM32F7_FLASH_CONFIG_E
bool
default n
config STM32F7_FLASH_CONFIG_I
config STM32F7_FLASH_CONFIG_G
bool
default n
@ -844,7 +844,7 @@ config STM32F7_FLASH_CONFIG_I
default n
choice
prompt "Overrdide Flash Size Designator"
prompt "Override Flash Size Designator"
depends on ARCH_CHIP_STM32F7
default STM32F7_FLASH_OVERRIDE_DEFAULT
---help---
@ -862,7 +862,7 @@ choice
Examples:
If the STM32F745VE is chosen, the Flash configuration would be 'E', if a variant of
the part with a 2048 KiB Flash is released in the future one could simply select
the part with a 2048 KiB Flash is released in the future one could simply select
the 'I' designator here.
If an STM32F7xxx Series parts is chosen the default Flash configuration will be set
@ -880,7 +880,7 @@ config STM32F7_FLASH_OVERRIDE_G
config STM32F7_FLASH_OVERRIDE_I
bool "I 2048KiB"
endchoice # "Overrdide Flash Size Designator"
endchoice # "Override Flash Size Designator"
menu "STM32 Peripheral Support"
@ -895,7 +895,6 @@ config STM32F7_HAVE_FSMC
bool
default n
config STM32F7_HAVE_ETHRNET
bool
default n
@ -928,7 +927,6 @@ config STM32F7_HAVE_ADC3_DMA
bool
default n
config STM32F7_HAVE_CAN3
bool
default n
@ -966,7 +964,7 @@ config STM32F7_HAVE_DFSDM1
default n
# These "hidden" settings are the OR of individual peripheral selections
# indicating that the general capabilitiy is required.
# indicating that the general capability is required.
config STM32F7_ADC
bool

16
arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
View File

@ -56,13 +56,11 @@
#define _K(x) ((x)*1024)
#if !defined(CONFIG_STM32F7_FLASH_OVERRIDE_DEFAULT) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_E) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_F) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_G) && \
!defined(CONFIG_STM32_FLASH_CONFIG_E) && \
!defined(CONFIG_STM32_FLASH_CONFIG_F) && \
!defined(CONFIG_STM32_FLASH_CONFIG_G)
# define CONFIG_STM32_FLASH_OVERRIDE_E
!defined(CONFIG_STM32F7_FLASH_OVERRIDE_E) && \
!defined(CONFIG_STM32F7_FLASH_OVERRIDE_G) && \
!defined(CONFIG_STM32F7_FLASH_CONFIG_E) && \
!defined(CONFIG_STM32F7_FLASH_CONFIG_G)
# define CONFIG_STM32F7_FLASH_OVERRIDE_E
# warning "Flash size not defined defaulting to 512KiB (E)"
#endif
@ -82,14 +80,14 @@
# endif
#endif
#if defined(CONFIG_STM32_FLASH_CONFIG_E)
#if defined(CONFIG_STM32F7_FLASH_CONFIG_E)
# define STM32_FLASH_NPAGES 6
# define STM32_FLASH_SIZE _K((4 * 32) + (1 * 128) + (1 * 256))
# define STM32_FLASH_SIZES {_K(32), _K(32), _K(32), _K(32), \
_K(128), _K(256)}
#elif defined(CONFIG_STM32_FLASH_CONFIG_G)
#elif defined(CONFIG_STM32F7_FLASH_CONFIG_G)
# define STM32_FLASH_NPAGES 8
# define STM32_FLASH_SIZE _K((4 * 32) + (1 * 128) + (3 * 256))

22
arch/arm/src/stm32f7/chip/stm32f76xx77xx_flash.h
View File

@ -56,15 +56,13 @@
#define _K(x) ((x)*1024)
#if !defined(CONFIG_STM32F7_FLASH_OVERRIDE_DEFAULT) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_E) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_F) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_G) && \
!defined(CONFIG_STM32_FLASH_OVERRIDE_I) && \
!defined(CONFIG_STM32_FLASH_CONFIG_E) && \
!defined(CONFIG_STM32_FLASH_CONFIG_F) && \
!defined(CONFIG_STM32_FLASH_CONFIG_G) && \
!defined(CONFIG_STM32_FLASH_CONFIG_I)
# define CONFIG_STM32_FLASH_OVERRIDE_E
!defined(CONFIG_STM32F7_FLASH_OVERRIDE_E) && \
!defined(CONFIG_STM32F7_FLASH_OVERRIDE_G) && \
!defined(CONFIG_STM32F7_FLASH_OVERRIDE_I) && \
!defined(CONFIG_STM32F7_FLASH_CONFIG_E) && \
!defined(CONFIG_STM32F7_FLASH_CONFIG_G) && \
!defined(CONFIG_STM32F7_FLASH_CONFIG_I)
# define CONFIG_STM32F7_FLASH_OVERRIDE_E
# warning "Flash size not defined defaulting to 512KiB (E)"
#endif
@ -89,21 +87,21 @@
# endif
#endif
#if defined(CONFIG_STM32_FLASH_CONFIG_E)
#if defined(CONFIG_STM32F7_FLASH_CONFIG_E)
# define STM32_FLASH_NPAGES 6
# define STM32_FLASH_SIZE _K((4 * 32) + (1 * 128) + (1 * 256))
# define STM32_FLASH_SIZES {_K(32), _K(32), _K(32), _K(32), \
_K(128), _K(256)}
#elif defined(CONFIG_STM32_FLASH_CONFIG_G)
#elif defined(CONFIG_STM32F7_FLASH_CONFIG_G)
# define STM32_FLASH_NPAGES 8
# define STM32_FLASH_SIZE _K((4 * 32) + (1 * 128) + (3 * 256))
# define STM32_FLASH_SIZES {_K(32), _K(32), _K(32), _K(32), \
_K(128), _K(256), _K(256), _K(256)}
#elif defined(CONFIG_STM32_FLASH_CONFIG_I)
#elif defined(CONFIG_STM32F7_FLASH_CONFIG_I)
# define STM32_FLASH_NPAGES 12
# define STM32_FLASH_SIZE _K((4 * 32) + (1 * 128) + (7 * 256))