Complete the migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT in Kconfig; this patch removes the support of MTDIDS_DEFAULT / MTDPARTS_DEFAULT in the configuration files (include/configs/*.h).
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---
cmd/mtdparts.c | 5 +---- drivers/mtd/mtd_uboot.c | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index bab75a262f3a..0984158f41ea 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -111,20 +111,17 @@ DECLARE_GLOBAL_DATA_PTR; #define MTD_WRITEABLE_CMD 1
/* default values for mtdids and mtdparts variables */ -#if !defined(MTDIDS_DEFAULT) #ifdef CONFIG_MTDIDS_DEFAULT #define MTDIDS_DEFAULT CONFIG_MTDIDS_DEFAULT #else #define MTDIDS_DEFAULT NULL #endif -#endif -#if !defined(MTDPARTS_DEFAULT) #ifdef CONFIG_MTDPARTS_DEFAULT #define MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT #else #define MTDPARTS_DEFAULT NULL #endif -#endif + #if defined(CONFIG_SYS_MTDPARTS_RUNTIME) extern void board_mtdparts_default(const char **mtdids, const char **mtdparts); #endif diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index dd0b0242f95f..14ce726b10d8 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -30,8 +30,6 @@ static const char *get_mtdids(void)
#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) board_mtdparts_default(&mtdids, &mtdparts); -#elif defined(MTDIDS_DEFAULT) - mtdids = MTDIDS_DEFAULT; #elif defined(CONFIG_MTDIDS_DEFAULT) mtdids = CONFIG_MTDIDS_DEFAULT; #endif @@ -147,8 +145,6 @@ static const char *get_mtdparts(void)
#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) board_mtdparts_default(&mtdids, &mtdparts); -#elif defined(MTDPARTS_DEFAULT) - mtdparts = MTDPARTS_DEFAULT; #elif defined(CONFIG_MTDPARTS_DEFAULT) mtdparts = CONFIG_MTDPARTS_DEFAULT; #endif