mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-28 19:32:36 +08:00
NuttX 10.3+ upgrade (#20190)
Co-authored-by: Peter van der Perk <peter.vanderperk@nxp.com> Co-authored-by: David Sidrane <David.Sidrane@NscDg.com> Co-authored-by: alexklimaj <alex@arkelectron.com>
This commit is contained in:
@@ -102,7 +102,6 @@ FLAGS = $(MAXOPTIMIZATION) -g2 \
|
||||
-fno-strict-aliasing \
|
||||
-fomit-frame-pointer \
|
||||
-Wall \
|
||||
-Werror \
|
||||
-Wextra \
|
||||
-Wlogical-op \
|
||||
-Wno-cpp \
|
||||
|
||||
Submodule platforms/nuttx/NuttX/apps updated: 6d9010f47e...a489381b49
Submodule platforms/nuttx/NuttX/nuttx updated: 6bafcb22b7...6ae751cd56
@@ -31,7 +31,7 @@
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include "arm_arch.h"
|
||||
#include "arm_internal.h"
|
||||
#include "lib/systick.h"
|
||||
#include <nvic.h>
|
||||
|
||||
|
||||
@@ -286,7 +286,7 @@ static void mavlink_usb_check(void *arg)
|
||||
#if defined(CONFIG_SERIAL_PASSTHRU_UBLOX)
|
||||
speed_t baudrate = cfgetspeed(&uart_config);
|
||||
char baudstring[16];
|
||||
snprintf(baudstring, sizeof(baudstring), "%d", baudrate);
|
||||
snprintf(baudstring, sizeof(baudstring), "%ld", baudrate);
|
||||
static const char *gps_argv[] {"gps", "stop", nullptr};
|
||||
|
||||
static const char *passthru_argv[] {"serial_passthru", "start", "-t", "-b", baudstring, "-e", USB_DEVICE_PATH, "-d", SERIAL_PASSTHRU_UBLOX_DEV, nullptr};
|
||||
|
||||
@@ -514,7 +514,6 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
|
||||
ret = at24c_eraseall(priv);
|
||||
break;
|
||||
|
||||
case MTDIOC_XIPBASE:
|
||||
default:
|
||||
ret = -ENOTTY; /* Bad command */
|
||||
break;
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <fixedmath.h>
|
||||
|
||||
#include "dwt.h"
|
||||
#include "arm_arch.h"
|
||||
#include "arm_internal.h"
|
||||
|
||||
#include <nuttx/clock.h>
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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??"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include "arm_internal.h"
|
||||
#include "arm_arch.h"
|
||||
#include "chip.h"
|
||||
|
||||
#include "nvic.h"
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <fixedmath.h>
|
||||
|
||||
#include "dwt.h"
|
||||
#include "arm_arch.h"
|
||||
#include "arm_internal.h"
|
||||
|
||||
#include <nuttx/clock.h>
|
||||
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user