From 93e3b525157d37f2ab4b22d0b9eae23bccfa6668 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 12 Aug 2020 13:20:01 -0700 Subject: [PATCH] cuav_nora Updates for NuttX 9.1.0- --- boards/cuav/nora/nuttx-config/bootloader/defconfig | 8 +------- boards/cuav/nora/nuttx-config/nsh/defconfig | 6 +----- .../cuav/nora/nuttx-config/scripts/bootloader_script.ld | 5 ----- boards/cuav/nora/nuttx-config/scripts/script.ld | 5 ----- boards/cuav/nora/src/bootloader_main.c | 2 +- boards/cuav/nora/src/init.c | 2 +- boards/cuav/nora/src/led.c | 2 +- 7 files changed, 5 insertions(+), 25 deletions(-) diff --git a/boards/cuav/nora/nuttx-config/bootloader/defconfig b/boards/cuav/nora/nuttx-config/bootloader/defconfig index 7871bae2ba..0da54c42d1 100644 --- a/boards/cuav/nora/nuttx-config/bootloader/defconfig +++ b/boards/cuav/nora/nuttx-config/bootloader/defconfig @@ -15,7 +15,7 @@ CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config" CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" CONFIG_ARCH_CHIP="stm32h7" -CONFIG_ARCH_CHIP_STM32H743ZI=y +CONFIG_ARCH_CHIP_STM32H743XI=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_INTERRUPTSTACK=512 CONFIG_ARMV7M_BASEPRI_WAR=y @@ -44,7 +44,6 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_EXPERIMENTAL=y CONFIG_FDCLONE_DISABLE=y CONFIG_FDCLONE_STDIO=y -CONFIG_FS_WRITABLE=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=750 @@ -53,15 +52,12 @@ CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_STRERROR=y CONFIG_LIB_BOARDCTL=y CONFIG_MAX_TASKS=8 -CONFIG_MAX_WDOGPARMS=2 CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_REGIONS=3 CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=3 -CONFIG_NPTHREAD_KEYS=4 CONFIG_PREALLOC_TIMERS=50 -CONFIG_PREALLOC_WDOGS=50 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 @@ -87,11 +83,9 @@ CONFIG_STM32H7_USART6=y CONFIG_SYSTEMTICK_HOOK=y CONFIG_SYSTEM_CDCACM=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_TTY_SIGINT=y CONFIG_TTY_SIGINT_CHAR=0x03 CONFIG_TTY_SIGSTP=y -CONFIG_USART6_DMA=y CONFIG_USART6_RXBUFSIZE=600 CONFIG_USART6_TXBUFSIZE=300 CONFIG_USBDEV=y diff --git a/boards/cuav/nora/nuttx-config/nsh/defconfig b/boards/cuav/nora/nuttx-config/nsh/defconfig index f850275688..6fe24580fe 100644 --- a/boards/cuav/nora/nuttx-config/nsh/defconfig +++ b/boards/cuav/nora/nuttx-config/nsh/defconfig @@ -27,7 +27,7 @@ CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config" CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" CONFIG_ARCH_CHIP="stm32h7" -CONFIG_ARCH_CHIP_STM32H743ZI=y +CONFIG_ARCH_CHIP_STM32H743XI=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_INTERRUPTSTACK=512 CONFIG_ARCH_STACKDUMP=y @@ -83,11 +83,9 @@ CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_STRERROR=y CONFIG_MAX_TASKS=64 -CONFIG_MAX_WDOGPARMS=2 CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MM_REGIONS=3 @@ -119,7 +117,6 @@ CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=50 -CONFIG_PREALLOC_WDOGS=50 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_STACK_MIN=512 @@ -210,7 +207,6 @@ CONFIG_STM32H7_USART_SWAP=y CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_TTY_SIGINT=y CONFIG_TTY_SIGSTP=y CONFIG_UART4_BAUD=57600 diff --git a/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld index 5c047d9a24..c2eba58f26 100644 --- a/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld @@ -158,11 +158,6 @@ SECTIONS *(.gnu.linkonce.r.*) _etext = ABSOLUTE(.); - /* - * This is a hack to make the newlib libm __errno() call - * use the NuttX get_errno_ptr() function. - */ - __errno = get_errno_ptr; } > FLASH /* diff --git a/boards/cuav/nora/nuttx-config/scripts/script.ld b/boards/cuav/nora/nuttx-config/scripts/script.ld index ef23884ca0..984b5293c3 100644 --- a/boards/cuav/nora/nuttx-config/scripts/script.ld +++ b/boards/cuav/nora/nuttx-config/scripts/script.ld @@ -156,11 +156,6 @@ SECTIONS *(.gnu.linkonce.r.*) _etext = ABSOLUTE(.); - /* - * This is a hack to make the newlib libm __errno() call - * use the NuttX get_errno_ptr() function. - */ - __errno = get_errno_ptr; } > FLASH /* diff --git a/boards/cuav/nora/src/bootloader_main.c b/boards/cuav/nora/src/bootloader_main.c index d2b0c0e0de..88b10e683d 100644 --- a/boards/cuav/nora/src/bootloader_main.c +++ b/boards/cuav/nora/src/bootloader_main.c @@ -45,7 +45,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" extern int sercon_main(int c, char **argv); diff --git a/boards/cuav/nora/src/init.c b/boards/cuav/nora/src/init.c index 797ded3592..392c4317f6 100644 --- a/boards/cuav/nora/src/init.c +++ b/boards/cuav/nora/src/init.c @@ -48,7 +48,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" #include #include diff --git a/boards/cuav/nora/src/led.c b/boards/cuav/nora/src/led.c index 466f433de9..79792ca1a2 100644 --- a/boards/cuav/nora/src/led.c +++ b/boards/cuav/nora/src/led.c @@ -49,7 +49,7 @@ #include /* - * Ideally we'd be able to get these from up_internal.h, + * Ideally we'd be able to get these from arm_internal.h, * but since we want to be able to disable the NuttX use * of leds for system indication at will and there is no * separate switch, we need to build independent of the