From 6dba2425c26e88b4e3924a2d9406de73a41795ad Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 20 Nov 2020 06:13:50 -0800 Subject: [PATCH] intel_aerofc-v1: Use px4_platform_configure --- .../aerofc-v1/nuttx-config/scripts/script.ld | 1 + boards/intel/aerofc-v1/src/CMakeLists.txt | 1 + boards/intel/aerofc-v1/src/init.c | 4 + boards/intel/aerofc-v1/src/mtd.cpp | 81 +++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 boards/intel/aerofc-v1/src/mtd.cpp diff --git a/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld b/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld index 45ce3349f6..2b4cb3817f 100644 --- a/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld +++ b/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld @@ -65,6 +65,7 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) +EXTERN(board_get_manifest) SECTIONS { diff --git a/boards/intel/aerofc-v1/src/CMakeLists.txt b/boards/intel/aerofc-v1/src/CMakeLists.txt index b94b7e8289..4859f08e69 100644 --- a/boards/intel/aerofc-v1/src/CMakeLists.txt +++ b/boards/intel/aerofc-v1/src/CMakeLists.txt @@ -36,6 +36,7 @@ add_library(drivers_board i2c.cpp init.c led.c + mtd.cpp spi.cpp timer_config.cpp ) diff --git a/boards/intel/aerofc-v1/src/init.c b/boards/intel/aerofc-v1/src/init.c index 9e37d59a72..4033b8d62f 100644 --- a/boards/intel/aerofc-v1/src/init.c +++ b/boards/intel/aerofc-v1/src/init.c @@ -219,5 +219,9 @@ __EXPORT int board_app_initialize(uintptr_t arg) dm_flash_sector_description_set(&dm_sector_map); #endif + /* Configure the HW based on the manifest */ + + px4_platform_configure(); + return OK; } diff --git a/boards/intel/aerofc-v1/src/mtd.cpp b/boards/intel/aerofc-v1/src/mtd.cpp new file mode 100644 index 0000000000..769a084a2b --- /dev/null +++ b/boards/intel/aerofc-v1/src/mtd.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** + * + * Copyright (C) 2020 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. + * + ****************************************************************************/ + +#include +#include +// KiB BS nB +static const px4_mft_device_t i2c3 = { // 24AA64FT on Base 8K 32 X 256 + .bus_type = px4_mft_device_t::I2C, + .devid = PX4_MK_I2C_DEVID(3, 0x50) +}; + + +static const px4_mtd_entry_t fmu_eeprom = { + .device = &i2c3, + .npart = 2, + .partd = { + { + .type = MTD_PARAMETERS, + .path = "/fs/mtd_params", + .nblocks = 128 + }, + { + .type = MTD_WAYPOINTS, + .path = "/fs/mtd_waypoints", + .nblocks = 128 + + } + }, +}; + +static const px4_mtd_manifest_t board_mtd_config = { + .nconfigs = 1, + .entries = { + &fmu_eeprom, + } +}; + +static const px4_mft_entry_s mtd_mft = { + .type = MTD, + .pmft = (void *) &board_mtd_config, +}; + +static const px4_mft_s mft = { + .nmft = 1, + .mfts = &mtd_mft +}; + +const px4_mft_s *board_get_manifest(void) +{ + return &mft; +}