From 59f914427c075fb5aaa4dca71e53f61022364266 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 17 Jun 2020 14:32:22 -0700 Subject: [PATCH] holybro_durandal-v1 Updates for NuttX 9.1.0- holybro_durandal-v1: defconfig MMCSD enable multiblock --- .../holybro/durandal-v1/nuttx-config/bootloader/defconfig | 7 +------ boards/holybro/durandal-v1/nuttx-config/nsh/defconfig | 6 +----- .../durandal-v1/nuttx-config/scripts/bootloader_script.ld | 5 ----- boards/holybro/durandal-v1/nuttx-config/scripts/script.ld | 5 ----- .../holybro/durandal-v1/nuttx-config/stackcheck/defconfig | 6 +----- boards/holybro/durandal-v1/src/bootloader_main.c | 2 +- boards/holybro/durandal-v1/src/init.c | 4 ++-- boards/holybro/durandal-v1/src/led.c | 2 +- boards/holybro/durandal-v1/src/usb.c | 2 +- 9 files changed, 8 insertions(+), 31 deletions(-) diff --git a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig b/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig index f479773b3d..4d46facf8d 100644 --- a/boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig +++ b/boards/holybro/durandal-v1/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_STM32H743II=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,7 +83,6 @@ CONFIG_STM32H7_USART3=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 diff --git a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig b/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig index 43a9b17093..008033b05d 100644 --- a/boards/holybro/durandal-v1/nuttx-config/nsh/defconfig +++ b/boards/holybro/durandal-v1/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_STM32H743II=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 @@ -203,7 +200,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/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld index 4f7c59e38a..e4741a1f9a 100644 --- a/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_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/holybro/durandal-v1/nuttx-config/scripts/script.ld b/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld index db14743238..96b6686795 100644 --- a/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld +++ b/boards/holybro/durandal-v1/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/holybro/durandal-v1/nuttx-config/stackcheck/defconfig b/boards/holybro/durandal-v1/nuttx-config/stackcheck/defconfig index dbc93a0aed..71250753cf 100644 --- a/boards/holybro/durandal-v1/nuttx-config/stackcheck/defconfig +++ b/boards/holybro/durandal-v1/nuttx-config/stackcheck/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_STM32H743II=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_INTERRUPTSTACK=512 CONFIG_ARCH_STACKDUMP=y @@ -84,11 +84,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 @@ -120,7 +118,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 @@ -204,7 +201,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/holybro/durandal-v1/src/bootloader_main.c b/boards/holybro/durandal-v1/src/bootloader_main.c index ba458389b8..5d09e24c58 100644 --- a/boards/holybro/durandal-v1/src/bootloader_main.c +++ b/boards/holybro/durandal-v1/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/holybro/durandal-v1/src/init.c b/boards/holybro/durandal-v1/src/init.c index 3be2972a54..355831afd0 100644 --- a/boards/holybro/durandal-v1/src/init.c +++ b/boards/holybro/durandal-v1/src/init.c @@ -63,7 +63,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" #include #include @@ -81,7 +81,7 @@ /* Configuration ************************************************************/ /* - * 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 diff --git a/boards/holybro/durandal-v1/src/led.c b/boards/holybro/durandal-v1/src/led.c index 33ae1ce045..bff4b09864 100644 --- a/boards/holybro/durandal-v1/src/led.c +++ b/boards/holybro/durandal-v1/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 diff --git a/boards/holybro/durandal-v1/src/usb.c b/boards/holybro/durandal-v1/src/usb.c index d1d9922144..9d5915c0e6 100644 --- a/boards/holybro/durandal-v1/src/usb.c +++ b/boards/holybro/durandal-v1/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include