diff options
author | David Sidrane <david_s5@nscdg.com> | 2015-02-17 12:04:25 -1000 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-17 23:27:34 +0100 |
commit | 17615b22a4ee899091fe12f70f02a79f59af8b63 (patch) | |
tree | af4b175a0464393396beee9c306d96ef12adb2f1 | |
parent | 63fd54f44ef711f8fa1736230f88decbe3ab3cba (diff) | |
download | px4-firmware-17615b22a4ee899091fe12f70f02a79f59af8b63.tar.gz px4-firmware-17615b22a4ee899091fe12f70f02a79f59af8b63.tar.bz2 px4-firmware-17615b22a4ee899091fe12f70f02a79f59af8b63.zip |
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
m--------- | NuttX | 0 | ||||
-rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 1 | ||||
-rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 1 | ||||
-rw-r--r-- | src/drivers/drv_gpio.h | 5 |
5 files changed, 8 insertions, 1 deletions
diff --git a/NuttX b/NuttX -Subproject 8d51b780f611ad73268a41a8d8007f39a344758 +Subproject 33e56f1a3aac0ef5474c57b565bd9f9e8813b2f diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index c44b074f3..29dff64aa 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -346,6 +346,7 @@ CONFIG_BOOT_RUNFROMFLASH=y # # Board Selection # +CONFIG_ARCH_BOARD_AEROCORE=y CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD="" diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 539634e3d..86ed041ff 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -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="" diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index dedebdfa0..6a1aec22b 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -381,6 +381,7 @@ CONFIG_BOOT_RUNFROMFLASH=y # # Board Selection # +CONFIG_ARCH_BOARD_PX4FMU_V2=y CONFIG_ARCH_BOARD_CUSTOM=y CONFIG_ARCH_BOARD="" diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h index 5acd0d343..bacafe1dc 100644 --- a/src/drivers/drv_gpio.h +++ b/src/drivers/drv_gpio.h @@ -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. * |