Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-08 01:42:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

boards/arm/samv7: improve progmem common interface

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko
2021-12-30 01:26:30 +02:00
committed by Xiang Xiao
parent 95db3ce741
commit 438a62c4fc
12 changed files with 118 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/sama5/sama5d4-ek/src/sam_at25.c
+2 -2
View File
@@ -117,8 +117,8 @@ int sam_at25_automount(int minor)
#if defined(CONFIG_BCH)
/* Use the minor number to create device paths */
snprintf(blockdev, 18, "/dev/mtdblock%d", minor);
snprintf(chardev, 12, "/dev/mtd%d", minor);
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d", minor);
snprintf(chardev, sizeof(chardev), "/dev/mtd%d", minor);
/* Now create a character device on the block device */
boards/arm/samv7/common/include/sam_progmem_common.h → boards/arm/samv7/common/include/board_progmem.h
+14 -6
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/samv7/common/include/sam_progmem_common.h
* boards/arm/samv7/common/include/board_progmem.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __BOARDS_ARM_SAMV7_COMMON_INCLUDE_SAM_PROGMEM_COMMON_H
#define __BOARDS_ARM_SAMV7_COMMON_INCLUDE_SAM_PROGMEM_COMMON_H
#ifndef __BOARDS_ARM_SAMV7_COMMON_INCLUDE_BOARD_PROGMEM_H
#define __BOARDS_ARM_SAMV7_COMMON_INCLUDE_BOARD_PROGMEM_H
/****************************************************************************
* Public Types
@@ -45,13 +45,21 @@ extern "C"
****************************************************************************/
/****************************************************************************
* Name: sam_progmem_init
* Name: board_progmem_init
*
* Description:
* Initialize the FLASH and register MTD devices.
*
* Input Parameters:
* minor - The starting minor number for progmem MTD partitions.
*
* Returned Value:
* Zero is returned on success. Otherwise, a negated errno value is
* returned to indicate the nature of the failure.
*
****************************************************************************/
int sam_progmem_common_initialize(void);
int board_progmem_init(int minor);
#undef EXTERN
#if defined(__cplusplus)
@@ -59,4 +67,4 @@ int sam_progmem_common_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __BOARDS_ARM_SAMV7_COMMON_INCLUDE_SAM_PROGMEM_COMMON_H */
#endif /* __BOARDS_ARM_SAMV7_COMMON_INCLUDE_BOARD_PROGMEM_H */
boards/arm/samv7/common/src/Make.defs
+2 -2
View File
@@ -23,9 +23,9 @@ CSRCS += sam_boot_image.c
endif
ifeq ($(CONFIG_BOARDCTL),y)
CSRCS += sam_progmem_common.c
CSRCS += sam_progmem.c
else ifeq ($(CONFIG_BOARD_LATE_INITIALIZE),y)
CSRCS += sam_progmem_common.c
CSRCS += sam_progmem.c
endif
DEPPATH += --dep-path src
boards/arm/samv7/common/src/sam_progmem_common.c → boards/arm/samv7/common/src/sam_progmem.c
+80 -54
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* boards/arm/samv7/common/src/sam_progmem_common.c
* boards/arm/samv7/common/src/sam_progmem.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,21 +33,19 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/mtd/mtd.h>
#ifdef CONFIG_BCH
#include <nuttx/drivers/drivers.h>
#endif
#include "sam_progmem.h"
#include "sam_progmem_common.h"
#include "board_progmem.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
#define PROGMEM_MTD_MINOR 0
/****************************************************************************
* Private Types
@@ -85,11 +83,70 @@ static const struct mcuboot_partition_s g_mcuboot_partition_table[] =
.devpath = CONFIG_SAMV7_OTA_SCRATCH_DEVPATH
}
};
#endif /* CONFIG_SAMV7_PROGMEM_OTA_PARTITION */
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: sam_progmem_register_driver
*
* Description:
* Initialize the FLASH and register MTD devices.
*
* Input Parameters:
* minor - The minor number for progmem MTD block driver.
* mtd - MTD partition data pointer
* devpath - Character device path
*
* Returned Value:
* Zero on success; a negated errno value on failure.
*
****************************************************************************/
static int sam_progmem_register_driver(int minor, FAR struct mtd_dev_s *mtd,
FAR const char *devpath)
{
#ifdef CONFIG_BCH
char blockdev[18];
char chardev[12];
#endif
int ret = OK;
/* Use the FTL layer to wrap the MTD driver as a block driver */
ret = ftl_initialize(minor, mtd);
if (ret < 0)
{
ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
return ret;
}
#ifdef CONFIG_BCH
/* Use the minor number to create device paths */
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d", minor);
if (devpath == NULL)
{
snprintf(chardev, sizeof(chardev), "/dev/mtd%d", minor);
devpath = chardev;
}
/* Now create a character device on the block device */
ret = bchdev_register(blockdev, devpath, false);
if (ret < 0)
{
ferr("ERROR: bchdev_register %s failed: %d\n", devpath, ret);
return ret;
}
#endif
return ret;
}
#if defined(CONFIG_SAMV7_PROGMEM_OTA_PARTITION)
/****************************************************************************
* Name: sam_progmem_alloc_mtdpart
*
@@ -116,8 +173,8 @@ static struct mtd_dev_s *sam_progmem_alloc_mtdpart(uint32_t mtd_offset,
ASSERT((mtd_offset % up_progmem_pagesize(0)) == 0);
ASSERT((mtd_size % up_progmem_pagesize(0)) == 0);
finfo("\tMTD offset = 0x%"PRIx32"\n", mtd_offset);
finfo("\tMTD size = 0x%"PRIx32"\n", mtd_size);
finfo("\tMTD offset = 0x%" PRIx32 "\n", mtd_offset);
finfo("\tMTD size = 0x%" PRIx32 "\n", mtd_size);
startblock = up_progmem_getpage(mtd_offset);
if (startblock < 0)
@@ -137,19 +194,16 @@ static struct mtd_dev_s *sam_progmem_alloc_mtdpart(uint32_t mtd_offset,
* Initialize partitions that are dedicated to firmware MCUBOOT update.
*
* Input Parameters:
* None.
* minor - The starting minor number for progmem MTD partitions.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
*
****************************************************************************/
static int init_mcuboot_partitions(void)
static int init_mcuboot_partitions(int minor)
{
FAR struct mtd_dev_s *mtd;
#ifdef CONFIG_BCH
char blockdev[18];
#endif
int ret = OK;
for (int i = 0; i < ARRAYSIZE(g_mcuboot_partition_table); ++i)
@@ -157,29 +211,17 @@ static int init_mcuboot_partitions(void)
const struct mcuboot_partition_s *part = &g_mcuboot_partition_table[i];
mtd = sam_progmem_alloc_mtdpart(part->offset, part->size);
if (!mtd)
if (mtd == NULL)
{
ferr("ERROR: create MTD OTA partition %s", part->devpath);
continue;
}
ret = ftl_initialize(i, mtd);
ret = sam_progmem_register_driver(minor + i, mtd, part->devpath);
if (ret < 0)
{
ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
return ret;
}
#ifdef CONFIG_BCH
snprintf(blockdev, 18, "/dev/mtdblock%d", i);
ret = bchdev_register(blockdev, part->devpath, false);
if (ret < 0)
{
ferr("ERROR: bchdev_register %s failed: %d\n", part->devpath, ret);
return ret;
}
#endif
}
return ret;
@@ -191,13 +233,21 @@ static int init_mcuboot_partitions(void)
****************************************************************************/
/****************************************************************************
* Name: sam_progmem_init
* Name: board_progmem_init
*
* Description:
* Initialize the FLASH and register the MTD device.
* Initialize the FLASH and register MTD devices.
*
* Input Parameters:
* minor - The starting minor number for progmem MTD partitions.
*
* Returned Value:
* Zero is returned on success. Otherwise, a negated errno value is
* returned to indicate the nature of the failure.
*
****************************************************************************/
int sam_progmem_common_initialize(void)
int board_progmem_init(int minor)
{
int ret = OK;
@@ -214,41 +264,17 @@ int sam_progmem_common_initialize(void)
}
#if defined(CONFIG_SAMV7_PROGMEM_OTA_PARTITION)
ret = init_mcuboot_partitions();
ret = init_mcuboot_partitions(minor);
if (ret < 0)
{
return ret;
}
#else
/* Use the FTL layer to wrap the MTD driver as a block driver */
ret = ftl_initialize(PROGMEM_MTD_MINOR, g_samv7_progmem_mtd);
ret = sam_progmem_register_driver(minor, g_samv7_progmem_mtd, NULL);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to initialize the FTL layer: %d\n",
ret);
return ret;
}
#ifdef CONFIG_BCH
char blockdev[18];
char chardev[12];
/* Use the minor number to create device paths */
snprintf(blockdev, 18, "/dev/mtdblock%d", PROGMEM_MTD_MINOR);
snprintf(chardev, 12, "/dev/mtd%d", PROGMEM_MTD_MINOR);
/* Now create a character device on the block device */
ret = bchdev_register(blockdev, chardev, false);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: bchdev_register %s failed: %d\n",
chardev, ret);
return ret;
}
#endif /* CONFIG_BCH */
#endif
return ret;
boards/arm/samv7/same70-qmtech/src/sam_bringup.c
+5 -4
View File
@@ -36,12 +36,13 @@
#include <nuttx/drivers/ramdisk.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/nxffs.h>
#include <nuttx/i2c/i2c_master.h>
#include "sam_twihs.h"
#include "sam_progmem_common.h"
#include "same70-qmtech.h"
#ifdef HAVE_PROGMEM_CHARDEV
# include "board_progmem.h"
#endif
#ifdef HAVE_ROMFS
# include <arch/board/boot_romfsimg.h>
#endif
@@ -152,7 +153,7 @@ int sam_bringup(void)
#ifdef HAVE_PROGMEM_CHARDEV
/* Initialize the SAME70 FLASH programming memory library */
ret = sam_progmem_common_initialize();
ret = board_progmem_init(PROGMEM_MTD_MINOR);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to initialize progmem: %d\n", ret);
boards/arm/samv7/same70-qmtech/src/same70-qmtech.h
-11
View File
@@ -268,17 +268,6 @@ int sam_hsmci_initialize(int slot, int minor);
# define sam_hsmci_initialize(s,m) (-ENOSYS)
#endif
/****************************************************************************
* Name: sam_progmem_init
*
* Description:
* Initialize the FLASH and register the MTD device.
****************************************************************************/
#ifdef HAVE_PROGMEM_CHARDEV
int sam_progmem_init(void);
#endif
/****************************************************************************
* Name: sam_can_setup
*
boards/arm/samv7/same70-xplained/src/sam_bringup.c
+5 -2
View File
@@ -43,9 +43,12 @@
#include <nuttx/i2c/i2c_master.h>
#include "sam_twihs.h"
#include "sam_progmem_common.h"
#include "same70-xplained.h"
#ifdef HAVE_PROGMEM_CHARDEV
# include "board_progmem.h"
#endif
#ifdef HAVE_ROMFS
# include <arch/board/boot_romfsimg.h>
#endif
@@ -241,7 +244,7 @@ int sam_bringup(void)
#ifdef HAVE_PROGMEM_CHARDEV
/* Initialize the SAME70 FLASH programming memory library */
ret = sam_progmem_common_initialize();
ret = board_progmem_init(PROGMEM_MTD_MINOR);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to initialize progmem: %d\n", ret);
boards/arm/samv7/same70-xplained/src/same70-xplained.h
-11
View File
@@ -500,17 +500,6 @@ int sam_hsmci_initialize(int slot, int minor);
# define sam_hsmci_initialize(s,m) (-ENOSYS)
#endif
/****************************************************************************
* Name: sam_progmem_init
*
* Description:
* Initialize the FLASH and register the MTD device.
****************************************************************************/
#ifdef HAVE_PROGMEM_CHARDEV
int sam_progmem_init(void);
#endif
/****************************************************************************
* Name: sam_usbinitialize
*
boards/arm/samv7/samv71-xult/src/sam_bringup.c
+5 -5
View File
@@ -61,8 +61,7 @@
#endif
#ifdef HAVE_PROGMEM_CHARDEV
# include "sam_progmem.h"
# include "sam_progmem_common.h"
# include "board_progmem.h"
#endif
#if defined(HAVE_RTC_DSXXXX) || defined(HAVE_RTC_PCF85263)
@@ -421,8 +420,9 @@ int sam_bringup(void)
#if defined(CONFIG_BCH)
/* Use the minor number to create device paths */
snprintf(blockdev, 18, "/dev/mtdblock%d", S25FL1_MTD_MINOR);
snprintf(chardev, 12, "/dev/mtd%d", S25FL1_MTD_MINOR);
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d",
S25FL1_MTD_MINOR);
snprintf(chardev, sizeof(chardev), "/dev/mtd%d", S25FL1_MTD_MINOR);
/* Now create a character device on the block device */
@@ -441,7 +441,7 @@ int sam_bringup(void)
#ifdef HAVE_PROGMEM_CHARDEV
/* Initialize the SAMV71 FLASH programming memory library */
ret = sam_progmem_common_initialize();
ret = board_progmem_init(PROGMEM_MTD_MINOR);
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: Failed to initialize progmem: %d\n", ret);
boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c
+3 -2
View File
@@ -253,8 +253,9 @@ int board_app_initialize(uintptr_t arg)
#if defined(CONFIG_BCH)
/* Use the minor number to create device paths */
snprintf(blockdev, 18, "/dev/mtdblock%d", N25QXXX_MTD_MINOR);
snprintf(chardev, 12, "/dev/mtd%d", N25QXXX_MTD_MINOR);
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d",
N25QXXX_MTD_MINOR);
snprintf(chardev, sizeof(chardev), "/dev/mtd%d", N25QXXX_MTD_MINOR);
/* Now create a character device on the block device */
boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c
+1 -1
View File
@@ -140,7 +140,7 @@ static int init_ota_partitions(void)
}
#ifdef CONFIG_BCH
snprintf(blockdev, 18, "/dev/mtdblock%d", i);
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d", i);
ret = bchdev_register(blockdev, part->devpath, false);
if (ret < 0)
boards/xtensa/esp32/common/src/esp32_board_spiflash.c
+1 -1
View File
@@ -123,7 +123,7 @@ static int init_ota_partitions(void)
}
#ifdef CONFIG_BCH
snprintf(blockdev, 18, "/dev/mtdblock%d", i);
snprintf(blockdev, sizeof(blockdev), "/dev/mtdblock%d", i);
ret = bchdev_register(blockdev, part->devpath, false);
if (ret < 0)