From a2f9bc469a30a16b125d7f1a01f9bd2fbfc7eeac Mon Sep 17 00:00:00 2001 From: barthess Date: Wed, 14 Oct 2015 17:46:40 +0300 Subject: FSMC code cleanup --- demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.cproject | 48 ++++++++++------------ demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.project | 1 + .../STM32F429xI_SDRAM.ld | 3 ++ .../halconf_community.h | 7 ++++ .../STM32/RT-STM32F429-DISCOVERY-TRIBUF/.cproject | 48 ++++++++++------------ demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.project | 1 + .../halconf_community.h | 7 ++++ 7 files changed, 61 insertions(+), 54 deletions(-) (limited to 'demos/STM32') diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.cproject b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.cproject index ddfa092..fa8fb6f 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.cproject +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.cproject @@ -1,36 +1,33 @@ - - + + - + + + - - - - - - - - - - - + + + + - - - - - - diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.project b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.project index 8f3403e..49061be 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.project +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/.project @@ -74,6 +74,7 @@ org.eclipse.cdt.core.cnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.eclipse.cdt.core.ccnature diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld index 1fb424a..26bed86 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld @@ -48,6 +48,9 @@ REGION_ALIAS("DATA_RAM", ram0); /* RAM region to be used for BSS segment.*/ REGION_ALIAS("BSS_RAM", ram0); +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("HEAP_RAM", ram0); + /* RAM region to be used for SDRAM segment.*/ REGION_ALIAS("SDRAM_RAM", ram7); diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h index 44e89df..1bd2950 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h @@ -24,6 +24,13 @@ #define HAL_USE_COMMUNITY TRUE #endif +/** + * @brief Enables the NAND subsystem. + */ +#if !defined(HAL_USE_FSMC) || defined(__DOXYGEN__) +#define HAL_USE_FSMC TRUE +#endif + /** * @brief Enables the NAND subsystem. */ diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.cproject b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.cproject index 742db7a..ddcfd48 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.cproject +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.cproject @@ -1,36 +1,33 @@ - - + + - + + + - - - - - - - - - - - + + + + - - - - - - diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.project b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.project index 26c76f3..78214cd 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.project +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/.project @@ -74,6 +74,7 @@ org.eclipse.cdt.core.cnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.eclipse.cdt.core.ccnature diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h index 44e89df..3bf2f0b 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h @@ -24,6 +24,13 @@ #define HAL_USE_COMMUNITY TRUE #endif +/** + * @brief Enables the NAND subsystem. + */ +#if !defined(HAL_USE_FSMC) || defined(__DOXYGEN__) +#define HAL_USE_FSMC FALSE +#endif + /** * @brief Enables the NAND subsystem. */ -- cgit v1.2.3 From c457b4d7d14a37eca844b5979cb705264ed4c155 Mon Sep 17 00:00:00 2001 From: barthess Date: Thu, 15 Oct 2015 10:17:53 +0300 Subject: Fixed copypaste typo in comments --- demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h | 2 +- demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'demos/STM32') diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h index 1bd2950..b2376d4 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h @@ -25,7 +25,7 @@ #endif /** - * @brief Enables the NAND subsystem. + * @brief Enables the FSMC subsystem. */ #if !defined(HAL_USE_FSMC) || defined(__DOXYGEN__) #define HAL_USE_FSMC TRUE diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h index 3bf2f0b..4156dbf 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h @@ -25,7 +25,7 @@ #endif /** - * @brief Enables the NAND subsystem. + * @brief Enables the FSMC subsystem. */ #if !defined(HAL_USE_FSMC) || defined(__DOXYGEN__) #define HAL_USE_FSMC FALSE -- cgit v1.2.3 From 2c7dc44fad1de5ff9ce449aeaf2ff94784d7807f Mon Sep 17 00:00:00 2001 From: barthess Date: Wed, 13 Jan 2016 10:21:50 +0300 Subject: Added WDG switch to halconf.h files --- demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h | 7 +++++++ demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf.h | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'demos/STM32') diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h index a0b3a2e..389c09d 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h @@ -163,6 +163,13 @@ #define HAL_USE_USB FALSE #endif +/** + * @brief Enables the WDG subsystem. + */ +#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) +#define HAL_USE_WDG FALSE +#endif + /*===========================================================================*/ /* ADC driver related settings. */ /*===========================================================================*/ diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf.h b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf.h index 2e601fc..bec24bd 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf.h +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf.h @@ -163,6 +163,13 @@ #define HAL_USE_USB TRUE #endif +/** + * @brief Enables the WDG subsystem. + */ +#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) +#define HAL_USE_WDG FALSE +#endif + /*===========================================================================*/ /* ADC driver related settings. */ /*===========================================================================*/ -- cgit v1.2.3