From ff0d19b686cad2814f20ee9ea9da320815556790 Mon Sep 17 00:00:00 2001 From: Pieter Willemsen <pieter.willemsen@altran.com> Date: Mon, 11 Dec 2017 18:03:01 +0100 Subject: [PATCH] native: move MTD defines to board.h --- boards/native/board_init.c | 19 +++---------------- boards/native/include/board.h | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/boards/native/board_init.c b/boards/native/board_init.c index 7e3f4706a3..1ec9b386da 100644 --- a/boards/native/board_init.c +++ b/boards/native/board_init.c @@ -34,25 +34,12 @@ void board_init(void) } #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 = { .dev = { .driver = &native_flash_driver, - .sector_count = MTD_NATIVE_SECTOR_NUM, - .pages_per_sector = MTD_NATIVE_SECTOR_SIZE / MTD_NATIVE_PAGE_SIZE, - .page_size = MTD_NATIVE_PAGE_SIZE, + .sector_count = MTD_SECTOR_NUM, + .pages_per_sector = MTD_SECTOR_SIZE / MTD_PAGE_SIZE, + .page_size = MTD_PAGE_SIZE, }, .fname = MTD_NATIVE_FILENAME, }; diff --git a/boards/native/include/board.h b/boards/native/include/board.h index 967e258e91..30b9d5d76a 100644 --- a/boards/native/include/board.h +++ b/boards/native/include/board.h @@ -53,7 +53,26 @@ void _native_LED_RED_TOGGLE(void); #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 /** mtd flash emulation device */ -- GitLab