yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

px4_fmu-v5 Updates for NuttX 9.1.0-

Browse Source 
px4_fmu-v5: defconfig MMCSD enable multiblock
This commit is contained in:
David Sidrane
2020-06-17 14:32:27 -07:00
committed by Daniel Agar
parent f98d10bf15
commit b52e10720e
10 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boards/px4/fmu-v5/nuttx-config/critmonitor/defconfig
View File

@@ -83,11 +83,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -118,7 +116,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512
@@ -206,7 +203,6 @@ CONFIG_SYSTEM_CDCACM=y
CONFIG_SYSTEM_CRITMONITOR=y CONFIG_SYSTEM_CRITMONITOR=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24 CONFIG_TASK_NAME_SIZE=24
CONFIG_TIME_EXTENDED=y
CONFIG_UART4_BAUD=57600 CONFIG_UART4_BAUD=57600
CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXBUFSIZE=600
CONFIG_UART4_RXDMA=y CONFIG_UART4_RXDMA=y

3
boards/px4/fmu-v5/nuttx-config/debug/defconfig
View File

@@ -128,11 +128,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -163,7 +161,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512

4
boards/px4/fmu-v5/nuttx-config/irqmonitor/defconfig
View File

@@ -83,11 +83,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -118,7 +116,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512
@@ -205,7 +202,6 @@ CONFIG_STM32F7_WWDG=y
CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_CDCACM=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24 CONFIG_TASK_NAME_SIZE=24
CONFIG_TIME_EXTENDED=y
CONFIG_UART4_BAUD=57600 CONFIG_UART4_BAUD=57600
CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXBUFSIZE=600
CONFIG_UART4_RXDMA=y CONFIG_UART4_RXDMA=y

4
boards/px4/fmu-v5/nuttx-config/nsh/defconfig
View File

@@ -84,11 +84,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -119,7 +117,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512
@@ -205,7 +202,6 @@ CONFIG_STM32F7_WWDG=y
CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_CDCACM=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24 CONFIG_TASK_NAME_SIZE=24
CONFIG_TIME_EXTENDED=y
CONFIG_UART4_BAUD=57600 CONFIG_UART4_BAUD=57600
CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXBUFSIZE=600
CONFIG_UART4_RXDMA=y CONFIG_UART4_RXDMA=y

4
boards/px4/fmu-v5/nuttx-config/optimized/defconfig
View File

@@ -84,11 +84,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -119,7 +117,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512
@@ -205,7 +202,6 @@ CONFIG_STM32F7_WWDG=y
CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_CDCACM=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24 CONFIG_TASK_NAME_SIZE=24
CONFIG_TIME_EXTENDED=y
CONFIG_UART4_BAUD=57600 CONFIG_UART4_BAUD=57600
CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXBUFSIZE=600
CONFIG_UART4_RXDMA=y CONFIG_UART4_RXDMA=y

5
boards/px4/fmu-v5/nuttx-config/scripts/script.ld
View File

@@ -115,11 +115,6 @@ SECTIONS
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
_etext = ABSOLUTE(.); _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 } > FLASH_AXIM
/* /*

4
boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig
View File

@@ -84,11 +84,9 @@ CONFIG_LIBC_FLOATINGPOINT=y
CONFIG_LIBC_LONG_LONG=y CONFIG_LIBC_LONG_LONG=y
CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR=y
CONFIG_MAX_TASKS=64 CONFIG_MAX_TASKS=64
CONFIG_MAX_WDOGPARMS=2
CONFIG_MEMSET_64BIT=y CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y CONFIG_MMCSD=y
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_SDIO=y CONFIG_MMCSD_SDIO=y
CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
CONFIG_MM_REGIONS=3 CONFIG_MM_REGIONS=3
@@ -119,7 +117,6 @@ CONFIG_NSH_STRERROR=y
CONFIG_NSH_VARS=y CONFIG_NSH_VARS=y
CONFIG_PIPES=y CONFIG_PIPES=y
CONFIG_PREALLOC_TIMERS=50 CONFIG_PREALLOC_TIMERS=50
CONFIG_PREALLOC_WDOGS=50
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_PTHREAD_MUTEX_ROBUST=y CONFIG_PTHREAD_MUTEX_ROBUST=y
CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_MIN=512
@@ -205,7 +202,6 @@ CONFIG_STM32F7_WWDG=y
CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_CDCACM=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=24 CONFIG_TASK_NAME_SIZE=24
CONFIG_TIME_EXTENDED=y
CONFIG_UART4_BAUD=57600 CONFIG_UART4_BAUD=57600
CONFIG_UART4_RXBUFSIZE=600 CONFIG_UART4_RXBUFSIZE=600
CONFIG_UART4_RXDMA=y CONFIG_UART4_RXDMA=y

2
boards/px4/fmu-v5/src/can.c
View File

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

4
boards/px4/fmu-v5/src/init.c
View File

@@ -63,7 +63,7 @@
#include <chip.h> #include <chip.h>
#include <stm32_uart.h> #include <stm32_uart.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_internal.h" #include "arm_internal.h"
#include <px4_arch/io_timer.h> #include <px4_arch/io_timer.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
@@ -82,7 +82,7 @@
/* Configuration ************************************************************/ /* 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 * but since we want to be able to disable the NuttX use
* of leds for system indication at will and there is no * of leds for system indication at will and there is no
* separate switch, we need to build independent of the * separate switch, we need to build independent of the

2
boards/px4/fmu-v5/src/led.c
View File

@@ -49,7 +49,7 @@
#include <arch/board/board.h> #include <arch/board/board.h>
/* /*
* 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 * but since we want to be able to disable the NuttX use
* of leds for system indication at will and there is no * of leds for system indication at will and there is no
* separate switch, we need to build independent of the * separate switch, we need to build independent of the