diff --git a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
index 89c4e03b086..08be20cb39b 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c
@@ -147,7 +147,7 @@ int sam_smartfs_initialize(void)
 
               /* Test if this is the config partition */
 
-            #if defined  CONFIG_MTD_CONFIG
+            #ifndef  CONFIG_MTD_CONFIG_NONE
               if (partno == 0)
                 {
                   /* Register the partition as the config device */
diff --git a/boards/arm/samv7/same70-xplained/src/Make.defs b/boards/arm/samv7/same70-xplained/src/Make.defs
index 4c835407efe..fd88fa181bf 100644
--- a/boards/arm/samv7/same70-xplained/src/Make.defs
+++ b/boards/arm/samv7/same70-xplained/src/Make.defs
@@ -68,7 +68,7 @@ ifeq ($(CONFIG_SAMV7_MCAN),y)
 CSRCS += sam_mcan.c
 endif
 
-ifeq ($(CONFIG_MTD_CONFIG),y)
+ifneq ($(CONFIG_MTD_CONFIG_NONE),y)
 ifeq ($(CONFIG_SAMV7_TWIHS0),y)
 ifeq ($(CONFIG_MTD_AT24XX),y)
 CSRCS += sam_at24config.c
diff --git a/boards/arm/samv7/same70-xplained/src/same70-xplained.h b/boards/arm/samv7/same70-xplained/src/same70-xplained.h
index 4cb6931da09..eedb54062e2 100644
--- a/boards/arm/samv7/same70-xplained/src/same70-xplained.h
+++ b/boards/arm/samv7/same70-xplained/src/same70-xplained.h
@@ -151,7 +151,7 @@
 #  undef HAVE_MACADDR
 #endif
 
-#if !defined(CONFIG_MTD_CONFIG)
+#if defined(CONFIG_MTD_CONFIG_NONE)
 #  undef HAVE_MTDCONFIG
 #endif
 
diff --git a/boards/arm/samv7/samv71-xult/src/Make.defs b/boards/arm/samv7/samv71-xult/src/Make.defs
index 8ef5a489749..0a7984b2f93 100644
--- a/boards/arm/samv7/samv71-xult/src/Make.defs
+++ b/boards/arm/samv7/samv71-xult/src/Make.defs
@@ -80,7 +80,7 @@ ifeq ($(CONFIG_AUDIO_NULL),y)
 CSRCS += sam_audio_null.c
 endif
 
-ifeq ($(CONFIG_MTD_CONFIG),y)
+ifneq ($(CONFIG_MTD_CONFIG_NONE),y)
 ifeq ($(CONFIG_SAMV7_TWIHS0),y)
 ifeq ($(CONFIG_MTD_AT24XX),y)
 CSRCS += sam_at24config.c
diff --git a/boards/arm/samv7/samv71-xult/src/samv71-xult.h b/boards/arm/samv7/samv71-xult/src/samv71-xult.h
index 0d88cd08504..9cc798098b7 100644
--- a/boards/arm/samv7/samv71-xult/src/samv71-xult.h
+++ b/boards/arm/samv7/samv71-xult/src/samv71-xult.h
@@ -159,7 +159,7 @@
 #  undef HAVE_MACADDR
 #endif
 
-#if !defined(CONFIG_MTD_CONFIG)
+#if defined(CONFIG_MTD_CONFIG_NONE)
 #  undef HAVE_MTDCONFIG
 #endif
 
diff --git a/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_flash.c b/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_flash.c
index 591cc9c6c9e..8bcdf20f08d 100644
--- a/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_flash.c
+++ b/boards/arm/stm32wl5/nucleo-wl55jc/src/stm32_flash.c
@@ -330,7 +330,7 @@ int stm32wl5_flash_init(void)
         }
 #endif
 
-#if defined(CONFIG_MTD_CONFIG)
+#if !defined(CONFIG_MTD_CONFIG_NONE)
       else if (strcmp(fs, "mtdconfig") == 0)
         {
           if (mtdconfig_minor)