Skip to content

Commit 36bd704

Browse files
raiden00plraiden00pl
committed
boards/stm32f1: migrate to new pinmap
migrate stm32f1 to new pinmap Signed-off-by: raiden00pl <raiden00@railab.me>
1 parent e2cc71f commit 36bd704

80 files changed

Lines changed: 764 additions & 15 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎boards/arm/stm32/cloudctrl/configs/nsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# CONFIG_NSH_DISABLE_IFCONFIG is not set
99
# CONFIG_NSH_DISABLE_PS is not set
1010
# CONFIG_SPI_CALLBACK is not set
11+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1112
CONFIG_ARCH="arm"
1213
CONFIG_ARCH_BOARD="cloudctrl"
1314
CONFIG_ARCH_BOARD_CLOUDCTRL=y

‎boards/arm/stm32/cloudctrl/include/board.h‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,4 +357,53 @@ const char *stm32_getchipid_string(void);
357357
#endif
358358

359359
#endif /* __ASSEMBLY__ */
360+
361+
/* Alternate function pin selections (auto-aliased for new pinmap) */
362+
363+
/* USART2 */
364+
365+
#define GPIO_USART2_TX GPIO_ADJUST_MODE(GPIO_USART2_TX_0, GPIO_MODE_50MHz)
366+
#define GPIO_USART2_RX GPIO_USART2_RX_0
367+
#define GPIO_USART2_CTS GPIO_USART2_CTS_0
368+
#define GPIO_USART2_RTS GPIO_ADJUST_MODE(GPIO_USART2_RTS_0, GPIO_MODE_50MHz)
369+
#define GPIO_USART2_CK GPIO_ADJUST_MODE(GPIO_USART2_CK_0, GPIO_MODE_50MHz)
370+
371+
/* SPI1 */
372+
373+
#define GPIO_SPI1_NSS GPIO_ADJUST_MODE(GPIO_SPI1_NSS_0, GPIO_MODE_50MHz)
374+
#define GPIO_SPI1_SCK GPIO_ADJUST_MODE(GPIO_SPI1_SCK_0, GPIO_MODE_50MHz)
375+
#define GPIO_SPI1_MISO GPIO_ADJUST_MODE(GPIO_SPI1_MISO_0, GPIO_MODE_50MHz)
376+
#define GPIO_SPI1_MOSI GPIO_ADJUST_MODE(GPIO_SPI1_MOSI_0, GPIO_MODE_50MHz)
377+
378+
/* MCO */
379+
380+
#define GPIO_MCO GPIO_ADJUST_MODE(GPIO_MCO_0, GPIO_MODE_50MHz)
381+
382+
/* Ethernet (MII/RMII) */
383+
384+
#define GPIO_ETH_MDC GPIO_ADJUST_MODE(GPIO_ETH_MDC_0, GPIO_MODE_50MHz)
385+
#define GPIO_ETH_MDIO GPIO_ADJUST_MODE(GPIO_ETH_MDIO_0, GPIO_MODE_50MHz)
386+
#define GPIO_ETH_MII_COL GPIO_ETH_MII_COL_0
387+
#define GPIO_ETH_MII_CRS GPIO_ETH_MII_CRS_0
388+
#define GPIO_ETH_MII_RX_CLK GPIO_ETH_MII_RX_CLK_0
389+
#define GPIO_ETH_MII_RXD0 GPIO_ETH_MII_RXD0_0
390+
#define GPIO_ETH_MII_RXD1 GPIO_ETH_MII_RXD1_0
391+
#define GPIO_ETH_MII_RXD2 GPIO_ETH_MII_RXD2_0
392+
#define GPIO_ETH_MII_RXD3 GPIO_ETH_MII_RXD3_0
393+
#define GPIO_ETH_MII_RX_DV GPIO_ETH_MII_RX_DV_0
394+
#define GPIO_ETH_MII_RX_ER GPIO_ETH_MII_RX_ER_0
395+
#define GPIO_ETH_MII_TX_CLK GPIO_ETH_MII_TX_CLK_0
396+
#define GPIO_ETH_MII_TXD0 GPIO_ADJUST_MODE(GPIO_ETH_MII_TXD0_0, GPIO_MODE_50MHz)
397+
#define GPIO_ETH_MII_TXD1 GPIO_ADJUST_MODE(GPIO_ETH_MII_TXD1_0, GPIO_MODE_50MHz)
398+
#define GPIO_ETH_MII_TXD2 GPIO_ADJUST_MODE(GPIO_ETH_MII_TXD2_0, GPIO_MODE_50MHz)
399+
#define GPIO_ETH_MII_TXD3 GPIO_ADJUST_MODE(GPIO_ETH_MII_TXD3_0, GPIO_MODE_50MHz)
400+
#define GPIO_ETH_MII_TX_EN GPIO_ADJUST_MODE(GPIO_ETH_MII_TX_EN_0, GPIO_MODE_50MHz)
401+
#define GPIO_ETH_RMII_CRS_DV GPIO_ETH_RMII_CRS_DV_0
402+
#define GPIO_ETH_RMII_REF_CLK GPIO_ETH_RMII_REF_CLK_0
403+
#define GPIO_ETH_RMII_RXD0 GPIO_ETH_RMII_RXD0_0
404+
#define GPIO_ETH_RMII_RXD1 GPIO_ETH_RMII_RXD1_0
405+
#define GPIO_ETH_RMII_TXD0 GPIO_ADJUST_MODE(GPIO_ETH_RMII_TXD0_0, GPIO_MODE_50MHz)
406+
#define GPIO_ETH_RMII_TXD1 GPIO_ADJUST_MODE(GPIO_ETH_RMII_TXD1_0, GPIO_MODE_50MHz)
407+
#define GPIO_ETH_RMII_TX_EN GPIO_ADJUST_MODE(GPIO_ETH_RMII_TX_EN_0, GPIO_MODE_50MHz)
408+
360409
#endif /* __BOARDS_ARM_STM32_CLOUDCTRL_INCLUDE_BOARD_H */

‎boards/arm/stm32/et-stm32-stamp/configs/nsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
66
# modifications.
77
#
8+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
89
CONFIG_ARCH="arm"
910
CONFIG_ARCH_BOARD="et-stm32-stamp"
1011
CONFIG_ARCH_BOARD_ET_STM32_STAMP=y

‎boards/arm/stm32/et-stm32-stamp/include/board.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,11 @@
145145
#define LED_ASSERTION 6 /* LED1 + LED2 */
146146
#define LED_PANIC 7 /* LED1 / LED2 blinking */
147147

148+
/* Alternate function pin selections (auto-aliased for new pinmap) */
149+
150+
/* USART1 */
151+
152+
#define GPIO_USART1_TX GPIO_ADJUST_MODE(GPIO_USART1_TX_0, GPIO_MODE_50MHz)
153+
#define GPIO_USART1_RX GPIO_USART1_RX_0
154+
148155
#endif /* __BOARDS_ARM_STM32_ET_STM32_STAMP_INCLUDE_BOARD_H */

‎boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# CONFIG_NSH_DISABLE_IFCONFIG is not set
1111
# CONFIG_NSH_DISABLE_PS is not set
1212
# CONFIG_SPI_CALLBACK is not set
13+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1314
CONFIG_ARCH="arm"
1415
CONFIG_ARCH_BOARD="fire-stm32v2"
1516
CONFIG_ARCH_BOARD_FIRE_STM32=y

‎boards/arm/stm32/fire-stm32v2/include/board.h‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,4 +406,46 @@ void fire_lcdclear(uint16_t color);
406406
#undef EXTERN
407407

408408
#endif /* __ASSEMBLY__ */
409+
410+
/* Alternate function pin selections (auto-aliased for new pinmap) */
411+
412+
/* USART1 */
413+
414+
#define GPIO_USART1_TX GPIO_ADJUST_MODE(GPIO_USART1_TX_0, GPIO_MODE_50MHz)
415+
#define GPIO_USART1_RX GPIO_USART1_RX_0
416+
417+
/* USART2 */
418+
419+
#define GPIO_USART2_TX GPIO_ADJUST_MODE(GPIO_USART2_TX_0, GPIO_MODE_50MHz)
420+
#define GPIO_USART2_RX GPIO_USART2_RX_0
421+
#define GPIO_USART2_CTS GPIO_USART2_CTS_0
422+
#define GPIO_USART2_RTS GPIO_ADJUST_MODE(GPIO_USART2_RTS_0, GPIO_MODE_50MHz)
423+
#define GPIO_USART2_CK GPIO_ADJUST_MODE(GPIO_USART2_CK_0, GPIO_MODE_50MHz)
424+
425+
/* SPI1 */
426+
427+
#define GPIO_SPI1_NSS GPIO_ADJUST_MODE(GPIO_SPI1_NSS_0, GPIO_MODE_50MHz)
428+
#define GPIO_SPI1_SCK GPIO_ADJUST_MODE(GPIO_SPI1_SCK_0, GPIO_MODE_50MHz)
429+
#define GPIO_SPI1_MISO GPIO_ADJUST_MODE(GPIO_SPI1_MISO_0, GPIO_MODE_50MHz)
430+
#define GPIO_SPI1_MOSI GPIO_ADJUST_MODE(GPIO_SPI1_MOSI_0, GPIO_MODE_50MHz)
431+
432+
/* I2C1 */
433+
434+
#define GPIO_I2C1_SCL GPIO_ADJUST_MODE(GPIO_I2C1_SCL_0, GPIO_MODE_50MHz)
435+
#define GPIO_I2C1_SDA GPIO_ADJUST_MODE(GPIO_I2C1_SDA_0, GPIO_MODE_50MHz)
436+
437+
/* SDIO */
438+
439+
#define GPIO_SDIO_CK GPIO_ADJUST_MODE(GPIO_SDIO_CK_0, GPIO_MODE_50MHz)
440+
#define GPIO_SDIO_CMD GPIO_ADJUST_MODE(GPIO_SDIO_CMD_0, GPIO_MODE_50MHz)
441+
#define GPIO_SDIO_D0 GPIO_ADJUST_MODE(GPIO_SDIO_D0_0, GPIO_MODE_50MHz)
442+
#define GPIO_SDIO_D1 GPIO_ADJUST_MODE(GPIO_SDIO_D1_0, GPIO_MODE_50MHz)
443+
#define GPIO_SDIO_D2 GPIO_ADJUST_MODE(GPIO_SDIO_D2_0, GPIO_MODE_50MHz)
444+
#define GPIO_SDIO_D3 GPIO_ADJUST_MODE(GPIO_SDIO_D3_0, GPIO_MODE_50MHz)
445+
446+
/* USB */
447+
448+
#define GPIO_USB_DM GPIO_USB_DM_0
449+
#define GPIO_USB_DP GPIO_USB_DP_0
450+
409451
#endif /* __BOARDS_ARM_STM32_FIRE_STM32V2_INCLUDE_BOARD_H */

‎boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#
88
# CONFIG_NSH_DISABLE_IFCONFIG is not set
99
# CONFIG_NSH_DISABLE_PS is not set
10+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1011
CONFIG_ARCH="arm"
1112
CONFIG_ARCH_BOARD="hymini-stm32v"
1213
CONFIG_ARCH_BOARD_HYMINI_STM32V=y

‎boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# CONFIG_NX_DISABLE_16BPP is not set
1313
# CONFIG_NX_PACKEDMSFIRST is not set
1414
# CONFIG_SPI_CALLBACK is not set
15+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1516
CONFIG_ARCH="arm"
1617
CONFIG_ARCH_BOARD="hymini-stm32v"
1718
CONFIG_ARCH_BOARD_HYMINI_STM32V=y

‎boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#
88
# CONFIG_MMCSD_HAVE_CARDDETECT is not set
99
# CONFIG_MMCSD_MMCSUPPORT is not set
10+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1011
CONFIG_ARCH="arm"
1112
CONFIG_ARCH_BOARD="hymini-stm32v"
1213
CONFIG_ARCH_BOARD_HYMINI_STM32V=y

‎boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#
88
# CONFIG_NSH_DISABLE_IFCONFIG is not set
99
# CONFIG_NSH_DISABLE_PS is not set
10+
# CONFIG_STM32_USE_LEGACY_PINMAP is not set
1011
CONFIG_ARCH="arm"
1112
CONFIG_ARCH_BOARD="hymini-stm32v"
1213
CONFIG_ARCH_BOARD_HYMINI_STM32V=y

0 commit comments

Comments
 (0)