boards: Changes for nuttx-10.3.0

sed -i 's/arm_arch.h/arm_internal.h/g'

boards/airmind/mindpx-v2/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/airmind/mindpx-v2/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/ark/can-flow/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/ark/can-gps/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/ark/can-rtk-gps/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/atl/mantis-edu/src/pwr.cpp

@@ -55,7 +55,7 @@
 #include <uORB/uORB.h>
 #include <uORB/Publication.hpp>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include "board_config.h"
 #include <stm32_pwr.h>
 

boards/bitcraze/crazyflie/src/spi.cpp

@@ -44,7 +44,7 @@
 #include <systemlib/px4_macros.h>
 #include <nuttx/mmcsd.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include "board_config.h"

boards/bitcraze/crazyflie/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/bitcraze/crazyflie21/src/spi.cpp

@@ -44,7 +44,7 @@
 #include <systemlib/px4_macros.h>
 #include <nuttx/mmcsd.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include "board_config.h"

boards/bitcraze/crazyflie21/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/cuav/can-gps-v1/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/freefly/can-rtk-gps/src/can.c

@@ -48,7 +48,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/freefly/can-rtk-gps/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/holybro/can-gps-v1/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/holybro/can-gps-v1/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/holybro/durandal-v1/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/holybro/durandal-v1/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/holybro/kakutef7/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/holybro/kakuteh7/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/holybro/pix32v5/src/can.c

@@ -69,7 +69,7 @@ uint16_t board_get_can_interfaces(void)
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/holybro/pix32v5/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/matek/gnss-m9n-f4/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/matek/gnss-m9n-f4/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/modalai/fc-v1/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/modalai/fc-v1/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/modalai/fc-v2/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/modalai/fc-v2/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/ctrl-zero-f7-oem/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/ctrl-zero-f7/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/ctrl-zero-h7-oem/src/usb.c

@@ -47,7 +47,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/ctrl-zero-h7/src/usb.c

@@ -47,7 +47,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/x21-777/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/mro/x21/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/mro/x21/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 
 #include "board_config.h"

boards/nxp/fmuk66-e/src/can.c

@@ -51,7 +51,7 @@
 
 #include <chip.h>
 #include <kinetis.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "board_config.h"
 

boards/nxp/fmuk66-e/src/init.c

@@ -67,7 +67,7 @@
 #include <kinetis_lpuart.h>
 #include "board_config.h"
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>

boards/nxp/fmuk66-e/src/spi.cpp

@@ -47,7 +47,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include <kinetis.h>
 #include "board_config.h"

boards/nxp/fmuk66-e/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <kinetis.h>
 #include <kinetis_usbotg.h>
 #include "board_config.h"

boards/nxp/fmuk66-v3/src/init.c

@@ -67,7 +67,7 @@
 #include <kinetis_lpuart.h>
 #include "board_config.h"
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>

boards/nxp/fmuk66-v3/src/spi.cpp

@@ -47,7 +47,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include <kinetis.h>
 #include "board_config.h"

boards/nxp/fmuk66-v3/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <kinetis.h>
 #include <kinetis_usbotg.h>
 #include "board_config.h"

boards/nxp/fmurt1062-v1/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include <chip.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "board_config.h"
 

boards/nxp/fmurt1062-v1/src/init.c

@@ -63,7 +63,7 @@
 #include <nuttx/analog/adc.h>
 #include <nuttx/mm/gran.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "arm_internal.h"
 #include "imxrt_flexspi_nor_boot.h"
 #include "imxrt_iomuxc.h"

boards/nxp/fmurt1062-v1/src/spi.cpp

@@ -53,7 +53,7 @@
 #include <systemlib/px4_macros.h>
 #include <px4_platform/gpio.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"

boards/nxp/fmurt1062-v1/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <hardware/imxrt_usb_analog.h>
 #include "board_config.h"

boards/nxp/ucans32k146/src/autoleds.c

@@ -72,7 +72,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "s32k1xx_pin.h"

boards/nxp/ucans32k146/src/spi.c

@@ -48,7 +48,7 @@
 #include <nuttx/spi/spi_transfer.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "s32k1xx_config.h"
 #include "s32k1xx_lpspi.h"

boards/nxp/ucans32k146/src/spi.cpp

@@ -47,7 +47,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include <systemlib/px4_macros.h>
 

boards/nxp/ucans32k146/src/userleds.c

@@ -45,7 +45,7 @@
 
 #include <nuttx/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "arm_internal.h"
 
 #include "s32k1xx_pin.h"

boards/omnibus/f4sd/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/px4/fmu-v2/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/px4/fmu-v2/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/px4/fmu-v3/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/px4/fmu-v3/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/px4/fmu-v4/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/px4/fmu-v4/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/px4/fmu-v4pro/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/px4/fmu-v4pro/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

boards/px4/fmu-v5/nuttx-config/uavcanv1/defconfig

@@ -136,6 +136,7 @@ CONFIG_SCHED_HPWORKPRIORITY=249
 CONFIG_SCHED_HPWORKSTACKSIZE=1280
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_EXTERNAL=y
+CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=50
 CONFIG_SCHED_LPWORKSTACKSIZE=1632

boards/px4/fmu-v5/src/can.c

@@ -69,7 +69,7 @@ uint16_t board_get_can_interfaces(void)
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/px4/fmu-v5/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/px4/fmu-v5x/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/px4/fmu-v5x/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/px4/fmu-v6u/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/px4/fmu-v6u/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/px4/fmu-v6x/src/can.c

@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "stm32_can.h"

boards/px4/fmu-v6x/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/raspberrypi/pico/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include "board_config.h"
 
 /************************************************************************************

boards/spracing/h7extreme/src/qspi.c

@@ -59,7 +59,7 @@
 #include <nuttx/spi/qspi.h>
 
 #include "arm_internal.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "barriers.h"
 
 #include "stm32_gpio.h"

boards/spracing/h7extreme/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 #include <stm32_otg.h>

boards/uvify/core/src/can.c

@@ -50,7 +50,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "stm32.h"
 #include "stm32_can.h"

boards/uvify/core/src/usb.c

@@ -51,7 +51,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 #include "board_config.h"
 

platforms/nuttx/src/bootloader/stm/stm32_common/systick.c

@@ -31,7 +31,7 @@
  *
  ****************************************************************************/
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "lib/systick.h"
 #include <nvic.h>
 

platforms/nuttx/src/px4/nxp/imxrt/board_critmon/board_critmon.c

@@ -42,7 +42,7 @@
 #include <fixedmath.h>
 
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/clock.h>
 

platforms/nuttx/src/px4/nxp/imxrt/board_reset/board_reset.cpp

@@ -40,7 +40,7 @@
 #include <px4_platform_common/px4_config.h>
 #include <errno.h>
 #include <nuttx/board.h>
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <hardware/imxrt_snvs.h>
 
 #define PX4_IMXRT_RTC_REBOOT_REG 3 // Must be common with bootloader and:

platforms/nuttx/src/px4/nxp/imxrt/version/board_identity.c

@@ -41,7 +41,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <hardware/imxrt_ocotp.h>
 
 #define CPU_UUID_BYTE_FORMAT_ORDER          {3, 2, 1, 0, 7, 6, 5, 4}

platforms/nuttx/src/px4/nxp/imxrt/version/board_mcu_version.c

@@ -42,7 +42,7 @@
 
 #include <chip.h>
 #include <hardware/imxrt_usb_analog.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #define DIGPROG_MINOR_SHIFT           0
 #define DIGPROG_MINOR_MASK            (0xff << DIGPROG_MINOR_SHIFT)

platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c

@@ -40,7 +40,7 @@
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/kinetis_sim.h"
 
 #define CHIP_TAG     "Kinetis K??"

platforms/nuttx/src/px4/nxp/s32k1xx/version/board_mcu_version.c

@@ -41,7 +41,7 @@
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "hardware/s32k1xx_sim.h"
 
 #define CHIP_TAG     "S32KXXX"

platforms/nuttx/src/px4/rpi/rpi_common/spi/spi.cpp

@@ -43,7 +43,7 @@
 
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 
 static const px4_spi_bus_t *_spi_bus0;

platforms/nuttx/src/px4/stm/stm32_common/board_critmon/board_critmon.c

@@ -42,7 +42,7 @@
 #include <fixedmath.h>
 
 #include "dwt.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include <nuttx/clock.h>
 

platforms/nuttx/src/px4/stm/stm32_common/spi/spi.cpp

@@ -42,7 +42,7 @@
 
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <chip.h>
 #include <stm32_gpio.h>
 

platforms/nuttx/src/px4/stm/stm32f7/watchdog/iwdg.c

@@ -34,7 +34,7 @@
 
 #include <nuttx/config.h>
 #include "arm_internal.h"
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 
 #include "nvic.h"

src/drivers/bootloaders/boot_app_shared.c

@@ -43,7 +43,7 @@
 #include <errno.h>
 
 #include <px4_arch/micro_hal.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "boot_app_shared.h"
 
 #include <lib/systemlib/crc.h>

src/drivers/uavcan/uavcan_drivers/kinetis/driver/src/internal.hpp

@@ -9,7 +9,7 @@
 
 #if UAVCAN_KINETIS_NUTTX
 # include <nuttx/arch.h>
-# include "arm_arch.h"
+# include "arm_internal.h"
 # include <arch/board/board.h>
 # include <hardware/kinetis_pit.h>
 # include <hardware/kinetis_sim.h>

src/modules/px4iofirmware/serial.c

@@ -49,7 +49,7 @@
 /* XXX might be able to prune these */
 #include <chip.h>
 #include <arm_internal.h>
-#include <arm_arch.h>
+#include <arm_internal.h>
 #include <stm32.h>
 
 //#define DEBUG