fmurt1062:Support upstream move from chip->hardware

PX4 · Jul 5, 2019 · d48e943 · d48e943
1 parent 9c57dc8
commit d48e943
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 32 deletions.
diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
@@ -109,6 +109,7 @@ CONFIG_ARCH_CHIP_IMXRT=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F0 is not set
 # CONFIG_ARCH_CHIP_STM32L0 is not set
+# CONFIG_ARCH_CHIP_STM32G0 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
 # CONFIG_ARCH_CHIP_STM32H7 is not set
 # CONFIG_ARCH_CHIP_STM32L4 is not set
@@ -209,6 +210,7 @@ CONFIG_IMXRT_HAVE_LCD=y
 # i.MX RT Peripheral Selection
 #
 CONFIG_IMXRT_EDMA=y
+# CONFIG_IMXRT_USBOTG is not set
 # CONFIG_IMXRT_ENET is not set
 # CONFIG_IMXRT_LCD is not set
 
@@ -228,6 +230,11 @@ CONFIG_IMXRT_LPUART3=y
 # CONFIG_IMXRT_LPUART7 is not set
 # CONFIG_IMXRT_LPUART8 is not set
 
+#
+# LPUART Configuration
+#
+CONFIG_IMXRT_LPUART_INVERT=y
+
 #
 # LPI2C Peripherals
 #
@@ -557,7 +564,6 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 #
 # Device Drivers
 #
-# CONFIG_DISABLE_POLL is not set
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_URANDOM is not set
@@ -597,7 +603,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CS_CONTROL is not set
 # CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_SPI_TRIGGER is not set
-# CONFIG_SPI_DRIVER is not set
+CONFIG_SPI_DRIVER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_I2S is not set
 
@@ -694,6 +700,7 @@ CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_RS485CONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_TXDMA is not set
 # CONFIG_SERIAL_RXDMA is not set
@@ -736,6 +743,8 @@ CONFIG_LPUART1_BAUD=115200
 CONFIG_LPUART1_BITS=8
 CONFIG_LPUART1_PARITY=0
 CONFIG_LPUART1_2STOP=0
+CONFIG_LPUART1_NOIFLOWCONTROL=y
+# CONFIG_LPUART1_RS485RTSCONTROL is not set
 # CONFIG_LPUART1_IFLOWCONTROL is not set
 # CONFIG_LPUART1_OFLOWCONTROL is not set
 # CONFIG_LPUART1_DMA is not set
@@ -749,6 +758,8 @@ CONFIG_LPUART2_BAUD=115200
 CONFIG_LPUART2_BITS=8
 CONFIG_LPUART2_PARITY=0
 CONFIG_LPUART2_2STOP=0
+CONFIG_LPUART2_NOIFLOWCONTROL=y
+# CONFIG_LPUART2_RS485RTSCONTROL is not set
 # CONFIG_LPUART2_IFLOWCONTROL is not set
 # CONFIG_LPUART2_OFLOWCONTROL is not set
 CONFIG_LPUART2_DMA=y
@@ -762,6 +773,8 @@ CONFIG_LPUART3_BAUD=57600
 CONFIG_LPUART3_BITS=8
 CONFIG_LPUART3_PARITY=0
 CONFIG_LPUART3_2STOP=0
+CONFIG_LPUART3_NOIFLOWCONTROL=y
+# CONFIG_LPUART3_RS485RTSCONTROL is not set
 # CONFIG_LPUART3_IFLOWCONTROL is not set
 # CONFIG_LPUART3_OFLOWCONTROL is not set
 # CONFIG_LPUART3_DMA is not set
@@ -1132,6 +1145,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+# CONFIG_EXAMPLES_ABNTCODI is not set
 # CONFIG_EXAMPLES_ADXL372_TEST is not set
 # CONFIG_EXAMPLES_APA102 is not set
 # CONFIG_EXAMPLES_BATTERY is not set
@@ -1144,10 +1158,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_DHTXX is not set
 # CONFIG_EXAMPLES_DSPTEST is not set
-
-#
-# embedlog example needs SYSTEM_EMBEDLOG
-#
 # CONFIG_EXAMPLES_FLOWC is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
@@ -1158,10 +1168,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_INA219 is not set
 # CONFIG_EXAMPLES_INA226 is not set
-
-#
-# ini dumper example needs FSUTILS_INIH
-#
 # CONFIG_EXAMPLES_LSM330SPI_TEST is not set
 # CONFIG_EXAMPLES_LVGLDEMO is not set
 # CONFIG_EXAMPLES_MAX31855 is not set
@@ -1220,7 +1226,6 @@ CONFIG_FSUTILS_MKFATFS=y
 #
 # CONFIG_GRAPHICS_FT80X is not set
 # CONFIG_GRAPHICS_LVGL is not set
-# CONFIG_NXGLPYHS_LARGE_ICONS is not set
 
 #
 # NxWidgets
@@ -1232,6 +1237,11 @@ CONFIG_FSUTILS_MKFATFS=y
 # CONFIG_GRAPHICS_PDCURSES is not set
 # CONFIG_TIFF is not set
 
+#
+# Industrial Applications
+#
+# CONFIG_INDUSTRY_ABNT_CODI_LIB is not set
+
 #
 # Interpreters
 #
@@ -1253,7 +1263,6 @@ CONFIG_FSUTILS_MKFATFS=y
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_THTTPD is not set
 
@@ -1402,17 +1411,22 @@ CONFIG_SYSTEM_NSH_PRIORITY=100
 CONFIG_SYSTEM_NSH_STACKSIZE=2048
 # CONFIG_SYSTEM_NSH_CXXINITIALIZE is not set
 # CONFIG_SYSTEM_POPEN is not set
-
-#
-# psmq requires posix mqueue and SYSTEM_EMBEDLOG
-#
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SETLOGMASK is not set
+CONFIG_SYSTEM_SPITOOL=y
+CONFIG_SPITOOL_PRIORITY=100
+CONFIG_SPITOOL_STACKSIZE=2048
+CONFIG_SPITOOL_MINBUS=0
+CONFIG_SPITOOL_MAXBUS=3
+CONFIG_SPITOOL_DEFFREQ=4000000
+CONFIG_SPITOOL_DEFMODE=0
+CONFIG_SPITOOL_DEFWIDTH=8
+CONFIG_SPITOOL_DEFWORDS=1
 # CONFIG_SYSTEM_STACKMONITOR is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_SYSTEM is not set

diff --git a/boards/nxp/fmurt1062-v1/src/board_config.h b/boards/nxp/fmurt1062-v1/src/board_config.h
@@ -51,7 +51,7 @@
 
 #include "imxrt_gpio.h"
 #include "imxrt_iomuxc.h"
-#include "chip/imxrt_pinmux.h"
+#include "hardware/imxrt_pinmux.h"
 
 #include <arch/board/board.h>
 

diff --git a/boards/nxp/fmurt1062-v1/src/init.c b/boards/nxp/fmurt1062-v1/src/init.c
@@ -67,7 +67,7 @@
 #include <chip.h>
 #include "board_config.h"
 
-#include <chip/imxrt_lpuart.h>
+#include <hardware/imxrt_lpuart.h>
 
 #include <arch/board/board.h>
 

diff --git a/boards/nxp/fmurt1062-v1/src/led.c b/boards/nxp/fmurt1062-v1/src/led.c
@@ -42,7 +42,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include <chip/imxrt_gpio.h>
+#include <hardware/imxrt_gpio.h>
 #include "board_config.h"
 
 #include <arch/board/board.h>

diff --git a/boards/nxp/fmurt1062-v1/src/timer_config.c b/boards/nxp/fmurt1062-v1/src/timer_config.c
@@ -43,11 +43,11 @@
 #include <stdint.h>
 
 #include <chip.h>
-#include "chip/imxrt_tmr.h"
-#include "chip/imxrt_flexpwm.h"
+#include "hardware/imxrt_tmr.h"
+#include "hardware/imxrt_flexpwm.h"
 #include "imxrt_gpio.h"
 #include "imxrt_iomuxc.h"
-#include "chip/imxrt_pinmux.h"
+#include "hardware/imxrt_pinmux.h"
 #include "imxrt_xbar.h"
 #include "imxrt_periphclks.h"
 #include <drivers/drv_pwm_output.h>

diff --git a/boards/nxp/fmurt1062-v1/src/usb.c b/boards/nxp/fmurt1062-v1/src/usb.c
@@ -53,7 +53,7 @@
 
 #include <up_arch.h>
 #include <chip.h>
-#include <chip/imxrt_usb_analog.h>
+#include <hardware/imxrt_usb_analog.h>
 #include "board_config.h"
 #include "imxrt_periphclks.h"
 

diff --git a/src/drivers/boards/common/imxrt/board_identity.c b/src/drivers/boards/common/imxrt/board_identity.c
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include "board_config.h"
-#include <chip/imxrt_ocotp.h>
+#include <hardware/imxrt_ocotp.h>
 #include "up_arch.h"
 
 #define CPU_UUID_BYTE_FORMAT_ORDER          {3, 2, 1, 0, 7, 6, 5, 4}

diff --git a/src/drivers/boards/common/imxrt/board_mcu_version.c b/src/drivers/boards/common/imxrt/board_mcu_version.c
@@ -41,7 +41,7 @@
 #include <px4_defines.h>
 
 #include <chip.h>
-#include <chip/imxrt_usb_analog.h>
+#include <hardware/imxrt_usb_analog.h>
 #include "up_arch.h"
 
 #define DIGPROG_MINOR_SHIFT           0

diff --git a/src/drivers/boards/common/imxrt/board_reset.c b/src/drivers/boards/common/imxrt/board_reset.c
@@ -41,7 +41,7 @@
 #include <errno.h>
 #include <nuttx/board.h>
 #include <up_arch.h>
-#include <chip/imxrt_snvs.h>
+#include <hardware/imxrt_snvs.h>
 
 #define PX4_IMXRT_RTC_REBOOT_REG 3 // Must be common with bootloader and:
 

diff --git a/src/drivers/imxrt/adc/adc.cpp b/src/drivers/imxrt/adc/adc.cpp
@@ -61,7 +61,7 @@
 
 #include <nuttx/analog/adc.h>
 #include <chip.h>
-#include <chip/imxrt_adc.h>
+#include <hardware/imxrt_adc.h>
 #include "imxrt_periphclks.h"
 
 #include <perf/perf_counter.h>

diff --git a/src/drivers/imxrt/drv_hrt.c b/src/drivers/imxrt/drv_hrt.c
@@ -67,7 +67,7 @@
 
 
 #include "chip.h"
-#include "chip/imxrt_gpt.h"
+#include "hardware/imxrt_gpt.h"
 #include "imxrt_periphclks.h"
 
 #undef PPM_DEBUG

diff --git a/src/drivers/imxrt/drv_input_capture.c b/src/drivers/imxrt/drv_input_capture.c
@@ -65,7 +65,7 @@
 #include "drv_input_capture.h"
 
 #include <chip.h>
-#include "chip/imxrt_flexpwm.h"
+#include "hardware/imxrt_flexpwm.h"
 
 #define MAX_CHANNELS_PER_TIMER 2
 

diff --git a/src/drivers/imxrt/drv_io_timer.c b/src/drivers/imxrt/drv_io_timer.c
@@ -59,7 +59,7 @@
 #include "drv_io_timer.h"
 
 #include <chip.h>
-#include "chip/imxrt_flexpwm.h"
+#include "hardware/imxrt_flexpwm.h"
 #include "imxrt_periphclks.h"
 
 #if !defined(BOARD_PWM_FREQ)

diff --git a/src/drivers/imxrt/drv_led_pwm.cpp b/src/drivers/imxrt/drv_led_pwm.cpp
@@ -59,7 +59,7 @@
 #include "drv_io_timer.h"
 
 #include <chip.h>
-#include "chip/imxrt_tmr.h"
+#include "hardware/imxrt_tmr.h"
 
 int led_pwm_servo_set(unsigned channel, uint8_t  cvalue)
 {

diff --git a/src/drivers/imxrt/tone_alarm/ToneAlarmInterface.cpp b/src/drivers/imxrt/tone_alarm/ToneAlarmInterface.cpp
@@ -38,7 +38,7 @@
 #include <board_config.h>
 
 #include "chip.h"
-#include "chip/imxrt_gpt.h"
+#include "hardware/imxrt_gpt.h"
 #include "imxrt_periphclks.h"
 
 //#include <drivers/device/device.h>