dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Insure that CONFIG_ARCH_BOARD_xxx is defined and to be consistent with Nuttx build place them in defconfig files so that config.h will have ONFIG_ARCH_BOARD_xxx defined

This commit is contained in:
David Sidrane 2015-02-17 12:04:25 -10:00 committed by Lorenz Meier
parent 63fd54f44e
commit 17615b22a4
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuttX

@ -1 +1 @@
Subproject commit 8d51b780f611ad73268a41a8d8007f39a344758a
Subproject commit 33e56f1a3aac0ef5474c57b565bd9f9e8813b2fb

1
nuttx-configs/aerocore/nsh/defconfig
View File

@ -346,6 +346,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
#
# Board Selection
#
CONFIG_ARCH_BOARD_AEROCORE=y
CONFIG_ARCH_BOARD_CUSTOM=y
CONFIG_ARCH_BOARD=""

2
nuttx-configs/px4fmu-v1/nsh/defconfig
View File

@ -3,7 +3,6 @@
# Nuttx/ Configuration
#
CONFIG_NUTTX_NEWCONFIG=y
#
# Build Setup
#
@ -340,6 +339,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V1=y
CONFIG_ARCH_BOARD_CUSTOM=y
CONFIG_ARCH_BOARD=""

1
nuttx-configs/px4fmu-v2/nsh/defconfig
View File

@ -381,6 +381,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V2=y
CONFIG_ARCH_BOARD_CUSTOM=y
CONFIG_ARCH_BOARD=""

5
src/drivers/drv_gpio.h
View File

@ -110,6 +110,11 @@
/* no GPIO driver on the PX4IOv2 board */
#endif
#if !defined(CONFIG_ARCH_BOARD_PX4IO_V1) && !defined(CONFIG_ARCH_BOARD_PX4IO_V2) && \
!defined(CONFIG_ARCH_BOARD_PX4FMU_V1) && !defined(CONFIG_ARCH_BOARD_PX4FMU_V2) && \
!defined(CONFIG_ARCH_BOARD_AEROCORE)
# error No CONFIG_ARCH_BOARD_xxxx set
#endif
/*
* IOCTL definitions.
*