This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 60549d3572 boards/stm32f7/stm32f746g-disco: fix FMC pin
60549d3572 is described below
commit 60549d3572d54bf285a73bbd86c31040ce132a0f
Author: raiden00pl <[email protected]>
AuthorDate: Tue Oct 8 11:42:18 2024 +0200
boards/stm32f7/stm32f746g-disco: fix FMC pin
during migration from legacy pinout some of the FMC pins were ommited
because
their names were identical to the new pinout, which didn't cause a
compilation error.
This fixes LCD examples.
Also update incomplete stm32f769i-disco FMC support to avoid this kind of
bug in the future
---
boards/arm/stm32f7/stm32f746g-disco/include/board.h | 3 +++
boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c | 2 +-
boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/boards/arm/stm32f7/stm32f746g-disco/include/board.h
b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
index 09a698dfac..6bfed5ab67 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/include/board.h
+++ b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
@@ -573,5 +573,8 @@
#define GPIO_FMC_D13 (GPIO_FMC_D13_0|GPIO_SPEED_100MHz)
#define GPIO_FMC_D14 (GPIO_FMC_D14_0|GPIO_SPEED_100MHz)
#define GPIO_FMC_D15 (GPIO_FMC_D15_0|GPIO_SPEED_100MHz)
+#define GPIO_FMC_SDCKE0 (GPIO_FMC_SDCKE0_1|GPIO_SPEED_100MHz)
+#define GPIO_FMC_SDNE0 (GPIO_FMC_SDNE0_3|GPIO_SPEED_100MHz)
+#define GPIO_FMC_SDNWE (GPIO_FMC_SDNWE_3|GPIO_SPEED_100MHz)
#endif /* __BOARDS_ARM_STM32F7_STM32F746G_DISCO_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
index 304615cac1..54725f982f 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c
@@ -90,7 +90,7 @@ static const uint32_t g_addressconfig[STM32_FMC_NADDRCONFIGS]
=
GPIO_FMC_A5, GPIO_FMC_A6, GPIO_FMC_A7, GPIO_FMC_A8, GPIO_FMC_A9,
GPIO_FMC_A10, GPIO_FMC_A11,
- GPIO_FMC_SDCKE0_1, GPIO_FMC_SDNE0_3, GPIO_FMC_SDNWE_3, GPIO_FMC_NBL0,
+ GPIO_FMC_SDCKE0, GPIO_FMC_SDNE0, GPIO_FMC_SDNWE, GPIO_FMC_NBL0,
GPIO_FMC_SDNRAS, GPIO_FMC_NBL1, GPIO_FMC_BA0, GPIO_FMC_BA1,
GPIO_FMC_SDCLK, GPIO_FMC_SDNCAS
};
diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
index 781bfb6e95..7bbf0a89a1 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
+++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_extmem.c
@@ -76,8 +76,8 @@ static const uint32_t g_addressconfig[STM32_FMC_NADDRCONFIGS]
=
GPIO_FMC_A10, GPIO_FMC_A11, GPIO_FMC_A12,
GPIO_FMC_NBL0, GPIO_FMC_NBL1, GPIO_FMC_NBL2, GPIO_FMC_NBL3, GPIO_FMC_BA0,
- GPIO_FMC_BA1, GPIO_FMC_SDNWE_3, GPIO_FMC_SDNCAS, GPIO_FMC_SDNRAS,
- GPIO_FMC_SDNE0_3, GPIO_FMC_SDCKE0_3, GPIO_FMC_SDCLK
+ GPIO_FMC_BA1, GPIO_FMC_SDNWE, GPIO_FMC_SDNCAS, GPIO_FMC_SDNRAS,
+ GPIO_FMC_SDNE0, GPIO_FMC_SDCKE0, GPIO_FMC_SDCLK
};
static const uint32_t g_dataconfig[STM32_FMC_NDATACONFIGS] =