From bc075208d57a2a5403cfce7ba1d1f1e59878d631 Mon Sep 17 00:00:00 2001 From: David Sidrane <david_s5@nscdg.com> Date: Mon, 11 Sep 2017 13:03:48 -1000 Subject: [PATCH] rpi:Use Non Arch specific Board identity API --- src/drivers/boards/rpi/CMakeLists.txt | 41 +++++++++++++++++++++++++++ src/drivers/boards/rpi/board_config.h | 5 ++-- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/drivers/boards/rpi/CMakeLists.txt b/src/drivers/boards/rpi/CMakeLists.txt index e69de29bb2..9ed4dc1139 100644 --- a/src/drivers/boards/rpi/CMakeLists.txt +++ b/src/drivers/boards/rpi/CMakeLists.txt @@ -0,0 +1,41 @@ +############################################################################ +# +# Copyright (c) 2017 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__boards__rpi + COMPILE_FLAGS + SRCS + ../common/board_identity.c + DEPENDS + platforms__common + ) +# vim: set noet ft=cmake fenc=utf-8 ff=unix : diff --git a/src/drivers/boards/rpi/board_config.h b/src/drivers/boards/rpi/board_config.h index 6e2afc992c..292ca4f127 100644 --- a/src/drivers/boards/rpi/board_config.h +++ b/src/drivers/boards/rpi/board_config.h @@ -39,9 +39,8 @@ #pragma once -#define BOARD_OVERRIDE_UUID "RPIID " // must be of length 12 (PX4_CPU_UUID_BYTE_LENGTH) -#define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID -#define BOARD_OVERRIDE_PX4_GUID "00000000" BOARD_OVERRIDE_UUID // must be of length 18 (PX4_GUID_BYTE_LENGTH) +#define BOARD_OVERRIDE_UUID "RPIID00000000000" // must be of length 16 +#define PX4_SOC_ARCH_ID 0x1002 #define BOARD_NAME "RPI" -- GitLab