From f9adf861dc3583d156b2bf9ced1e6f62ec2f0a43 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 12 Aug 2020 05:17:45 -0700 Subject: [PATCH] spracing_h7extreme Updates for NuttX 9.1.0- --- boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld | 5 ----- boards/cubepilot/cubeyellow/src/init.c | 2 +- boards/cubepilot/io-v2/nuttx-config/nsh/defconfig | 2 -- boards/cubepilot/io-v2/nuttx-config/scripts/script.ld | 5 ----- boards/holybro/pix32v5/nuttx-config/nsh/defconfig | 1 - boards/holybro/pix32v5/nuttx-config/scripts/script.ld | 5 ----- boards/holybro/pix32v5/src/can.c | 2 +- boards/holybro/pix32v5/src/init.c | 4 ++-- boards/holybro/pix32v5/src/led.c | 2 +- boards/holybro/pix32v5/src/usb.c | 2 +- boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig | 2 -- boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig | 2 -- boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig | 2 -- boards/px4/fmu-v5/nuttx-config/debug/defconfig | 1 - boards/px4/io-v2/nuttx-config/nsh/defconfig | 3 --- boards/spracing/h7extreme/nuttx-config/nsh/defconfig | 5 ----- boards/spracing/h7extreme/nuttx-config/scripts/script.ld | 6 ------ boards/spracing/h7extreme/src/flash_w25q128.c | 2 +- boards/spracing/h7extreme/src/init.c | 4 ++-- boards/spracing/h7extreme/src/led.c | 2 +- boards/spracing/h7extreme/src/qspi.c | 4 ++-- boards/spracing/h7extreme/src/usb.c | 2 +- 22 files changed, 13 insertions(+), 52 deletions(-) diff --git a/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld index 40d3b89f5c..bfe0940542 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld +++ b/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld @@ -115,11 +115,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_AXIM /* diff --git a/boards/cubepilot/cubeyellow/src/init.c b/boards/cubepilot/cubeyellow/src/init.c index 51690f1324..1cdeeb9fed 100644 --- a/boards/cubepilot/cubeyellow/src/init.c +++ b/boards/cubepilot/cubeyellow/src/init.c @@ -48,7 +48,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" #include #include diff --git a/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig b/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig index 9a2148386e..227a50fa2d 100644 --- a/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig +++ b/boards/cubepilot/io-v2/nuttx-config/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NAME_MAX=12 CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=1 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=1 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -66,4 +65,3 @@ CONFIG_USART3_TXBUFSIZE=64 CONFIG_USEC_PER_TICK=1000 CONFIG_USERMAIN_STACKSIZE=1100 CONFIG_USER_ENTRYPOINT="user_start" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/cubepilot/io-v2/nuttx-config/scripts/script.ld b/boards/cubepilot/io-v2/nuttx-config/scripts/script.ld index 54e3fc73f9..c84215389d 100644 --- a/boards/cubepilot/io-v2/nuttx-config/scripts/script.ld +++ b/boards/cubepilot/io-v2/nuttx-config/scripts/script.ld @@ -72,11 +72,6 @@ SECTIONS *(.gcc_except_table) *(.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/pix32v5/nuttx-config/nsh/defconfig b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig index f4de209946..8b244551ab 100644 --- a/boards/holybro/pix32v5/nuttx-config/nsh/defconfig +++ b/boards/holybro/pix32v5/nuttx-config/nsh/defconfig @@ -202,7 +202,6 @@ CONFIG_STM32F7_WWDG=y CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_UART4_BAUD=57600 CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXDMA=y diff --git a/boards/holybro/pix32v5/nuttx-config/scripts/script.ld b/boards/holybro/pix32v5/nuttx-config/scripts/script.ld index dcaf04fd2c..bc2193fac2 100644 --- a/boards/holybro/pix32v5/nuttx-config/scripts/script.ld +++ b/boards/holybro/pix32v5/nuttx-config/scripts/script.ld @@ -115,11 +115,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_AXIM /* diff --git a/boards/holybro/pix32v5/src/can.c b/boards/holybro/pix32v5/src/can.c index ed241c48aa..d25a500cd4 100644 --- a/boards/holybro/pix32v5/src/can.c +++ b/boards/holybro/pix32v5/src/can.c @@ -69,7 +69,7 @@ uint16_t board_get_can_interfaces(void) #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_can.h" diff --git a/boards/holybro/pix32v5/src/init.c b/boards/holybro/pix32v5/src/init.c index a717f03c60..822147b67f 100644 --- a/boards/holybro/pix32v5/src/init.c +++ b/boards/holybro/pix32v5/src/init.c @@ -63,7 +63,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" #include #include @@ -82,7 +82,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/pix32v5/src/led.c b/boards/holybro/pix32v5/src/led.c index e4da076512..edc8784688 100644 --- a/boards/holybro/pix32v5/src/led.c +++ b/boards/holybro/pix32v5/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/pix32v5/src/usb.c b/boards/holybro/pix32v5/src/usb.c index ad6d39ec12..ef279653d9 100644 --- a/boards/holybro/pix32v5/src/usb.c +++ b/boards/holybro/pix32v5/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig index b985f810cf..e310821a9b 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig @@ -163,7 +163,6 @@ CONFIG_NSH_ROMFSSECTSIZE=128 CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=50 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_MIN=512 @@ -200,7 +199,6 @@ CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD=57600 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_UART0_IFLOWCONTROL=y CONFIG_UART0_OFLOWCONTROL=y CONFIG_UART1_RXBUFSIZE=600 diff --git a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig index 9b696b1a49..f60df65c89 100644 --- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig +++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig @@ -160,7 +160,6 @@ CONFIG_NSH_ROMFSSECTSIZE=128 CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=50 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_MIN=512 @@ -197,7 +196,6 @@ CONFIG_SYSTEM_CUTERM_DEFAULT_BAUD=57600 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_UART0_IFLOWCONTROL=y CONFIG_UART0_OFLOWCONTROL=y CONFIG_UART1_RXBUFSIZE=600 diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig b/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig index 1c5c140297..dc22ce8323 100644 --- a/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig +++ b/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig @@ -66,7 +66,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=126976 CONFIG_RAM_START=0x1fff0000 CONFIG_RAW_BINARY=y @@ -89,7 +88,6 @@ CONFIG_SERIAL_TERMIOS=y CONFIG_SIG_DEFAULT=y CONFIG_SPITOOL_DEFFREQ=400000 CONFIG_SPITOOL_MAXBUS=0 -CONFIG_SPITOOL_PROGNAME="spi" CONFIG_STACK_COLORATION=y CONFIG_START_DAY=18 CONFIG_START_MONTH=8 diff --git a/boards/px4/fmu-v5/nuttx-config/debug/defconfig b/boards/px4/fmu-v5/nuttx-config/debug/defconfig index 71da88d8c7..ac13b4b483 100644 --- a/boards/px4/fmu-v5/nuttx-config/debug/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/debug/defconfig @@ -245,7 +245,6 @@ CONFIG_STM32F7_WWDG=y CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y CONFIG_UART4_BAUD=57600 CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXDMA=y diff --git a/boards/px4/io-v2/nuttx-config/nsh/defconfig b/boards/px4/io-v2/nuttx-config/nsh/defconfig index 040106ac18..227a50fa2d 100644 --- a/boards/px4/io-v2/nuttx-config/nsh/defconfig +++ b/boards/px4/io-v2/nuttx-config/nsh/defconfig @@ -29,14 +29,12 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_IDLETHREAD_STACKSIZE=280 CONFIG_MAX_TASKS=2 -CONFIG_MAX_WDOGPARMS=2 CONFIG_MM_FILL_ALLOCATIONS=y CONFIG_MM_SMALL=y CONFIG_NAME_MAX=12 CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=1 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=1 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -67,4 +65,3 @@ CONFIG_USART3_TXBUFSIZE=64 CONFIG_USEC_PER_TICK=1000 CONFIG_USERMAIN_STACKSIZE=1100 CONFIG_USER_ENTRYPOINT="user_start" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig index d4e022ec4b..3ead6488fd 100644 --- a/boards/spracing/h7extreme/nuttx-config/nsh/defconfig +++ b/boards/spracing/h7extreme/nuttx-config/nsh/defconfig @@ -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 @@ -114,9 +112,7 @@ CONFIG_NSH_ROMFSSECTSIZE=128 CONFIG_NSH_STRERROR=y CONFIG_NSH_VARS=y CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_TIMERS=50 -CONFIG_PREALLOC_WDOGS=50 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_STACK_MIN=512 @@ -196,7 +192,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/spracing/h7extreme/nuttx-config/scripts/script.ld b/boards/spracing/h7extreme/nuttx-config/scripts/script.ld index 99ccd7b721..939e8e9f93 100644 --- a/boards/spracing/h7extreme/nuttx-config/scripts/script.ld +++ b/boards/spracing/h7extreme/nuttx-config/scripts/script.ld @@ -201,12 +201,6 @@ SECTIONS *(.gcc_except_table) *(.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; } > qspi .ramfunc : { diff --git a/boards/spracing/h7extreme/src/flash_w25q128.c b/boards/spracing/h7extreme/src/flash_w25q128.c index bf0a0be1f0..9f943d2854 100644 --- a/boards/spracing/h7extreme/src/flash_w25q128.c +++ b/boards/spracing/h7extreme/src/flash_w25q128.c @@ -40,7 +40,7 @@ #include "board_config.h" #include "qspi.h" -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ diff --git a/boards/spracing/h7extreme/src/init.c b/boards/spracing/h7extreme/src/init.c index 1b5f305bd3..16aca544f8 100644 --- a/boards/spracing/h7extreme/src/init.c +++ b/boards/spracing/h7extreme/src/init.c @@ -63,7 +63,7 @@ #include #include #include -#include "up_internal.h" +#include "arm_internal.h" #include #include @@ -84,7 +84,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/spracing/h7extreme/src/led.c b/boards/spracing/h7extreme/src/led.c index dfdafb5358..d3453aebd7 100644 --- a/boards/spracing/h7extreme/src/led.c +++ b/boards/spracing/h7extreme/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/spracing/h7extreme/src/qspi.c b/boards/spracing/h7extreme/src/qspi.c index d3d7d01000..f00f1c6d9f 100644 --- a/boards/spracing/h7extreme/src/qspi.c +++ b/boards/spracing/h7extreme/src/qspi.c @@ -58,8 +58,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "barriers.h" #include "stm32_gpio.h" diff --git a/boards/spracing/h7extreme/src/usb.c b/boards/spracing/h7extreme/src/usb.c index d1d9922144..9d5915c0e6 100644 --- a/boards/spracing/h7extreme/src/usb.c +++ b/boards/spracing/h7extreme/src/usb.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include