vhad/RIOT
1
0
Fork 0
mirror of https://github.com/gosticks/RIOT.git synced 2025-10-16 12:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8272 from OTAkeys/pr/clean-up-mtd-native

Browse Source 
boards/native: clean-up MTD and SPIFFS default config
This commit is contained in:
Vincent Dupont 2018-02-09 14:49:54 +01:00 committed by GitHub
commit 368818aa23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boards/native/board_init.c
View File

@ -42,25 +42,12 @@ void board_init(void)
} }
#ifdef MODULE_MTD #ifdef MODULE_MTD
#ifndef MTD_NATIVE_PAGE_SIZE
#define MTD_NATIVE_PAGE_SIZE 256
#endif
#ifndef MTD_NATIVE_SECTOR_SIZE
#define MTD_NATIVE_SECTOR_SIZE 4096
#endif
#ifndef MTD_NATIVE_SECTOR_NUM
#define MTD_NATIVE_SECTOR_NUM 2048
#endif
#ifndef MTD_NATIVE_FILENAME
#define MTD_NATIVE_FILENAME "MEMORY.bin"
#endif
static mtd_native_dev_t mtd0_dev = { static mtd_native_dev_t mtd0_dev = {
.dev = { .dev = {
.driver = &native_flash_driver, .driver = &native_flash_driver,
.sector_count = MTD_NATIVE_SECTOR_NUM, .sector_count = MTD_SECTOR_NUM,
.pages_per_sector = MTD_NATIVE_SECTOR_SIZE / MTD_NATIVE_PAGE_SIZE, .pages_per_sector = MTD_SECTOR_SIZE / MTD_PAGE_SIZE,
.page_size = MTD_NATIVE_PAGE_SIZE, .page_size = MTD_PAGE_SIZE,
}, },
.fname = MTD_NATIVE_FILENAME, .fname = MTD_NATIVE_FILENAME,
}; };

77
boards/native/include/board.h
View File

@ -53,37 +53,78 @@ void _native_LED_RED_TOGGLE(void);
#define LED1_TOGGLE (_native_LED_GREEN_TOGGLE()) #define LED1_TOGGLE (_native_LED_GREEN_TOGGLE())
/** @} */ /** @} */
#ifdef MODULE_MTD #if defined(MODULE_MTD) || DOXYGEN
/**
* @name MTD emulation configuration
* @{
*/
#ifndef MTD_PAGE_SIZE
#define MTD_PAGE_SIZE (256)
#endif
#ifndef MTD_SECTOR_SIZE
#define MTD_SECTOR_SIZE (4096)
#endif
#ifndef MTD_SECTOR_NUM
#define MTD_SECTOR_NUM (2048)
#endif
#ifndef MTD_NATIVE_FILENAME
#define MTD_NATIVE_FILENAME "MEMORY.bin"
#endif
/** @} */
/** Default MTD device */
#define MTD_0 mtd0 #define MTD_0 mtd0
/** mtd flash emulation device */ /** mtd flash emulation device */
extern mtd_dev_t *mtd0; extern mtd_dev_t *mtd0;
#endif #endif
#ifdef MODULE_SPIFFS #if defined(MODULE_SPIFFS) || DOXYGEN
#define SPIFFS_READ_ONLY 0 /**
#define SPIFFS_SINGLETON 0 * @name SPIFFS default configuration
* @{
#define SPIFFS_HAL_CALLBACK_EXTRA 1 */
/* SPIFFS config flags */
#define SPIFFS_CACHE 1 #ifndef SPIFFS_READ_ONLY
#define SPIFFS_READ_ONLY (0)
#endif
#ifndef SPIFFS_SINGLETON
#define SPIFFS_SINGLETON (0)
#endif
#ifndef SPIFFS_HAL_CALLBACK_EXTRA
#define SPIFFS_HAL_CALLBACK_EXTRA (1)
#endif
#ifndef SPIFFS_CACHE
#define SPIFFS_CACHE (1)
#endif
#if SPIFFS_SINGLETON == 1 #if SPIFFS_SINGLETON == 1
#define SPIFFS_CFG_PHYS_SZ(ignore) (0x800000) /* MTD config if singleton is used */
#ifndef SPIFFS_CFG_PHYS_SZ
#define SPIFFS_CFG_PHYS_ERASE_SZ(ignore) (4096) #define SPIFFS_CFG_PHYS_SZ(ignore) (MTD_SECTOR_SIZE * MTD_SECTOR_NUM)
#endif
#define SPIFFS_CFG_PHYS_ADDR(ignore) (0) #ifndef SPIFFS_CFG_PHYS_ERASE_SZ
#define SPIFFS_CFG_PHYS_ERASE_SZ(ignore) (MTD_SECTOR_SIZE)
#define SPIFFS_CFG_LOG_PAGE_SZ(ignore) (256) #endif
#ifndef SPIFFS_CFG_PHYS_ADDR
#define SPIFFS_CFG_LOG_BLOCK_SZ(ignore) (4096) #define SPIFFS_CFG_PHYS_ADDR(ignore) (0)
#endif
#ifndef SPIFFS_CFG_LOG_PAGE_SZ
#define SPIFFS_CFG_LOG_PAGE_SZ(ignore) (MTD_PAGE_SIZE)
#endif
#ifndef SPIFFS_CFG_LOG_BLOCK_SZ
#define SPIFFS_CFG_LOG_BLOCK_SZ(ignore) (MTD_SECTOR_SIZE)
#endif
#endif #endif
#if SPIFFS_HAL_CALLBACK_EXTRA == 0 #if SPIFFS_HAL_CALLBACK_EXTRA == 0
#define SPIFFS_MTD_DEV (MTD_0) /* Default MTD device if no callback parameter */
#ifndef SPIFFS_MTD_DEV
#define SPIFFS_MTD_DEV (MTD_0)
#endif #endif
#endif #endif
/** @} */
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }