From 2cbec89e2b96909be317f6dd26441e11502cb7a9 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 13 Dec 2019 14:10:55 -0800 Subject: [PATCH] fmurt1062-v1:Fix and enable support for debut Probes --- boards/nxp/fmurt1062-v1/nuttx-config/Kconfig | 16 +++++++++++++++ .../fmurt1062-v1/nuttx-config/include/board.h | 20 +++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/Kconfig b/boards/nxp/fmurt1062-v1/nuttx-config/Kconfig index 6c309432bb..433c13fcad 100644 --- a/boards/nxp/fmurt1062-v1/nuttx-config/Kconfig +++ b/boards/nxp/fmurt1062-v1/nuttx-config/Kconfig @@ -14,3 +14,19 @@ config NXP_FMURT1062_V3_QSPI_FLASH bool "QSPI Flash" endchoice # Boot Flash + +config BOARD_HAS_PROBES + bool "Board provides GPIO or other Hardware for signaling to timing analyze." + default y + ---help--- + This board provides GPIO FMU-CH1-8, as PROBE_1-8 to provide timing signals + from selected drivers. + +config BOARD_USE_PROBES + bool "Enable the use the board provided FMU-CH1-8 as PROBE_1-8" + default n + depends on BOARD_HAS_PROBES + + ---help--- + Select to use GPIO FMU-CH1-8, as PROBE_1-8 to provide timing signals + from selected drivers. diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h index 859f4795eb..bec6d84fe6 100644 --- a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h +++ b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h @@ -325,16 +325,16 @@ /* Board provides GPIO or other Hardware for signaling to timing analyzer */ #if defined(CONFIG_BOARD_USE_PROBES) -#define PROBE_IOMUX (GPIO_OUTPUT | IOMUX_SPEED_MAX | IOMUX_SLEW_FAST | IOMUX_DRIVE_33OHM | IOMUX_CMOS_OUTPUT | IOMUX_PULL_NONE) +#define PROBE_IOMUX (IOMUX_SPEED_MAX | IOMUX_SLEW_FAST | IOMUX_DRIVE_33OHM | IOMUX_CMOS_OUTPUT | IOMUX_PULL_NONE) # define PROBE_N(n) (1<<((n)-1)) -# define PROBE_1 (GPIO_PORT2 | GPIO_PIN6 | PROBE_IOMUX) -# define PROBE_2 (GPIO_PORT4 | GPIO_PIN8 | PROBE_IOMUX) -# define PROBE_3 (GPIO_PORT4 | GPIO_PIN10 | PROBE_IOMUX) -# define PROBE_4 (GPIO_PORT1 | GPIO_PIN9 | PROBE_IOMUX) -# define PROBE_5 (GPIO_PORT3 | GPIO_PIN19 | PROBE_IOMUX) -# define PROBE_6 (GPIO_PORT4 | GPIO_PIN30 | PROBE_IOMUX) -# define PROBE_7 (GPIO_PORT4 | GPIO_PIN4 | PROBE_IOMUX) -# define PROBE_8 (GPIO_PORT4 | GPIO_PIN1 | PROBE_IOMUX) +# define PROBE_1 /* GPIO_B0_06 */ (GPIO_PORT2 | GPIO_PIN6 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_2 /* GPIO_EMC_08 */ (GPIO_PORT4 | GPIO_PIN8 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_3 /* GPIO_EMC_10 */ (GPIO_PORT4 | GPIO_PIN10 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_4 /* GPIO_AD_B0_09 */ (GPIO_PORT1 | GPIO_PIN9 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_5 /* GPIO_EMC_33 */ (GPIO_PORT3 | GPIO_PIN19 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_6 /* GPIO_EMC_30 */ (GPIO_PORT4 | GPIO_PIN30 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_7 /* GPIO_EMC_04 */ (GPIO_PORT4 | GPIO_PIN4 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) +# define PROBE_8 /* GPIO_EMC_01 */ (GPIO_PORT4 | GPIO_PIN1 | GPIO_OUTPUT | GPIO_OUTPUT_ONE | PROBE_IOMUX) # define PROBE_INIT(mask) \ do { \ @@ -348,7 +348,7 @@ if ((mask)& PROBE_N(8)) { imxrt_config_gpio(PROBE_8); } \ } while(0) -# define PROBE(n,s) do {stm32_gpiowrite(PROBE_##n,(s));}while(0) +# define PROBE(n,s) do {imxrt_gpio_write(PROBE_##n,(s));}while(0) # define PROBE_MARK(n) PROBE(n,false);PROBE(n,true) #else # define PROBE_INIT(mask)