From 2e7c1d3ca6b554bd8b2b290671863c44c7f035de Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 1 Dec 2018 13:21:23 -0500
Subject: [PATCH] move bbblue_adc to beaglebone blue board directory
---
.../beaglebone/blue}/CMakeLists.txt | 24 +--------
.../beaglebone/blue/bbblue_adc/CMakeLists.txt | 51 +++++++++++++++++++
.../blue}/bbblue_adc/bbblue_adc.cpp | 0
boards/beaglebone/blue/cross.cmake | 2 -
boards/beaglebone/blue/native.cmake | 2 -
5 files changed, 53 insertions(+), 26 deletions(-)
rename {src/drivers/bbblue_adc => boards/beaglebone/blue}/CMakeLists.txt (71%)
create mode 100644 boards/beaglebone/blue/bbblue_adc/CMakeLists.txt
rename {src/drivers => boards/beaglebone/blue}/bbblue_adc/bbblue_adc.cpp (100%)
diff --git a/src/drivers/bbblue_adc/CMakeLists.txt b/boards/beaglebone/blue/CMakeLists.txt
similarity index 71%
rename from src/drivers/bbblue_adc/CMakeLists.txt
rename to boards/beaglebone/blue/CMakeLists.txt
index 8cb424ec2a..4d64c03d75 100644
--- a/src/drivers/bbblue_adc/CMakeLists.txt
+++ b/boards/beaglebone/blue/CMakeLists.txt
@@ -1,6 +1,6 @@
############################################################################
#
-# Copyright (c) 2015-2017 PX4 Development Team. All rights reserved.
+# Copyright (c) 2018 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -30,25 +30,5 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
-if ("${PX4_BOARD}" STREQUAL "bbblue")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
- px4_add_module(
- MODULE drivers__bbblue_adc
- MAIN bbblue_adc
- COMPILE_FLAGS
- SRCS
- bbblue_adc.cpp
-
- # Previous board specific code is now precluded from build after
- # the following was added to Frimware/CMakeLists.txt:
- #
- # add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
- #
- # so include bbblue board specific code here:
- ../boards/bbblue/init.c
- DEPENDS
- platforms__common
- )
-endif()
+add_subdirectory(bbblue_adc)
diff --git a/boards/beaglebone/blue/bbblue_adc/CMakeLists.txt b/boards/beaglebone/blue/bbblue_adc/CMakeLists.txt
new file mode 100644
index 0000000000..f7c6fec3de
--- /dev/null
+++ b/boards/beaglebone/blue/bbblue_adc/CMakeLists.txt
@@ -0,0 +1,51 @@
+############################################################################
+#
+# Copyright (c) 2018 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+px4_add_module(
+ MODULE drivers__bbblue_adc
+ MAIN bbblue_adc
+ COMPILE_FLAGS
+ -Wno-error
+ SRCS
+ bbblue_adc.cpp
+
+ # Previous board specific code is now precluded from build after
+ # the following was added to Frimware/CMakeLists.txt:
+ #
+ # add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
+ #
+ # so include bbblue board specific code here:
+ ../src/init.c
+ DEPENDS
+
+)
diff --git a/src/drivers/bbblue_adc/bbblue_adc.cpp b/boards/beaglebone/blue/bbblue_adc/bbblue_adc.cpp
similarity index 100%
rename from src/drivers/bbblue_adc/bbblue_adc.cpp
rename to boards/beaglebone/blue/bbblue_adc/bbblue_adc.cpp
diff --git a/boards/beaglebone/blue/cross.cmake b/boards/beaglebone/blue/cross.cmake
index 58e554c066..c3e8401e29 100644
--- a/boards/beaglebone/blue/cross.cmake
+++ b/boards/beaglebone/blue/cross.cmake
@@ -21,10 +21,8 @@ px4_add_board(
#telemetry # all available telemetry drivers
vmount
- linux_gpio
linux_pwm_out
linux_sbus
- bbblue_adc
DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers
mpu9250
diff --git a/boards/beaglebone/blue/native.cmake b/boards/beaglebone/blue/native.cmake
index ff967a92c5..fccf22e145 100644
--- a/boards/beaglebone/blue/native.cmake
+++ b/boards/beaglebone/blue/native.cmake
@@ -19,10 +19,8 @@ px4_add_board(
#telemetry # all available telemetry drivers
vmount
- linux_gpio
linux_pwm_out
linux_sbus
- bbblue_adc
DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers
mpu9250
--
GitLab