Skip to content

Commit 2fc3af9

Browse files
committed
mtdconfig: change the relevant judgments of mtd_config
For the MTD_CONFIG configuration item in drivers/mtd/Kconfig has changed. Signed-off-by: zhaoxingyu1 <zhaoxingyu1@xiaomi.com>
1 parent 797ddef commit 2fc3af9

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

boards/arm/samd5e5/metro-m4/src/sam_smartfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ int sam_smartfs_initialize(void)
147147

148148
/* Test if this is the config partition */
149149

150-
#if defined CONFIG_MTD_CONFIG
150+
#ifndef CONFIG_MTD_CONFIG_NONE
151151
if (partno == 0)
152152
{
153153
/* Register the partition as the config device */

boards/arm/samv7/same70-xplained/src/Make.defs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ifeq ($(CONFIG_SAMV7_MCAN),y)
6868
CSRCS += sam_mcan.c
6969
endif
7070

71-
ifeq ($(CONFIG_MTD_CONFIG),y)
71+
ifneq ($(CONFIG_MTD_CONFIG_NONE),y)
7272
ifeq ($(CONFIG_SAMV7_TWIHS0),y)
7373
ifeq ($(CONFIG_MTD_AT24XX),y)
7474
CSRCS += sam_at24config.c

boards/arm/samv7/same70-xplained/src/same70-xplained.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
# undef HAVE_MACADDR
152152
#endif
153153

154-
#if !defined(CONFIG_MTD_CONFIG)
154+
#if defined(CONFIG_MTD_CONFIG_NONE)
155155
# undef HAVE_MTDCONFIG
156156
#endif
157157

boards/arm/samv7/samv71-xult/src/Make.defs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ifeq ($(CONFIG_AUDIO_NULL),y)
8080
CSRCS += sam_audio_null.c
8181
endif
8282

83-
ifeq ($(CONFIG_MTD_CONFIG),y)
83+
ifneq ($(CONFIG_MTD_CONFIG_NONE),y)
8484
ifeq ($(CONFIG_SAMV7_TWIHS0),y)
8585
ifeq ($(CONFIG_MTD_AT24XX),y)
8686
CSRCS += sam_at24config.c

boards/arm/samv7/samv71-xult/src/samv71-xult.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
# undef HAVE_MACADDR
160160
#endif
161161

162-
#if !defined(CONFIG_MTD_CONFIG)
162+
#if defined(CONFIG_MTD_CONFIG_NONE)
163163
# undef HAVE_MTDCONFIG
164164
#endif
165165

boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_flash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ int stm32wl5_flash_init(void)
330330
}
331331
#endif
332332

333-
#if defined(CONFIG_MTD_CONFIG)
333+
#if !defined(CONFIG_MTD_CONFIG_NONE)
334334
else if (strcmp(fs, "mtdconfig") == 0)
335335
{
336336
if (mtdconfig_minor)

0 commit comments

Comments
 (0)