From 26499b3c8bcf9896071d0d057a207c9162f8558c Mon Sep 17 00:00:00 2001 From: Alexis Guijarro Date: Wed, 11 Jun 2025 10:43:00 -0600 Subject: [PATCH] 3DR Control Zero H7 OEM RevG: MTD driver fix (#25015) --- .../nuttx-config/scripts/script.ld | 1 + .../ctrl-zero-h7-oem-revg/src/CMakeLists.txt | 1 + boards/3dr/ctrl-zero-h7-oem-revg/src/mtd.cpp | 76 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 boards/3dr/ctrl-zero-h7-oem-revg/src/mtd.cpp diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld index 02e763a790..45b12075e5 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld +++ b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld @@ -132,6 +132,7 @@ ENTRY(_stext) */ EXTERN(abort) EXTERN(_bootdelay_signature) +EXTERN(board_get_manifest) SECTIONS { diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/src/CMakeLists.txt b/boards/3dr/ctrl-zero-h7-oem-revg/src/CMakeLists.txt index 6a7d2ce306..1a47c940b7 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/src/CMakeLists.txt +++ b/boards/3dr/ctrl-zero-h7-oem-revg/src/CMakeLists.txt @@ -48,6 +48,7 @@ else() i2c.cpp init.c led.c + mtd.cpp spi.cpp timer_config.cpp usb.c diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/src/mtd.cpp b/boards/3dr/ctrl-zero-h7-oem-revg/src/mtd.cpp new file mode 100644 index 0000000000..c1b0f1bac3 --- /dev/null +++ b/boards/3dr/ctrl-zero-h7-oem-revg/src/mtd.cpp @@ -0,0 +1,76 @@ +/**************************************************************************** + * + * Copyright (C) 2025 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 spi2 = { // FM25V01A on FMUM native: 32K X 8, emulated as (1024 Blocks of 32) + .bus_type = px4_mft_device_t::SPI, + .devid = SPIDEV_FLASH(0) +}; + +static const px4_mtd_entry_t fmum_fram = { + .device = &spi2, + .npart = 1, + .partd = { + { + .type = MTD_PARAMETERS, + .path = "/fs/mtd_params", + .nblocks = (32768 / (1 << CONFIG_RAMTRON_EMULATE_PAGE_SHIFT)) + }, + }, +}; + +static const px4_mtd_manifest_t board_mtd_config = { + .nconfigs = 1, + .entries = { + &fmum_fram + } +}; + +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; +}