diff --git a/boards/esp32-heltec-lora32-v2/include/periph_conf.h b/boards/esp32-heltec-lora32-v2/include/periph_conf.h
index 3655b5eb84..5ec6a49088 100644
--- a/boards/esp32-heltec-lora32-v2/include/periph_conf.h
+++ b/boards/esp32-heltec-lora32-v2/include/periph_conf.h
@@ -152,7 +152,7 @@
 #define UART0_TXD   GPIO1  /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
 #define UART0_RXD   GPIO3  /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
 
-#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
+#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
 #ifndef UART1_TXD
 #define UART1_TXD   GPIO10  /**< direct I/O pin for UART_DEV(1) TxD */
 #endif
diff --git a/boards/esp32-mh-et-live-minikit/include/periph_conf.h b/boards/esp32-mh-et-live-minikit/include/periph_conf.h
index 15fe2760ae..ab19f89237 100644
--- a/boards/esp32-mh-et-live-minikit/include/periph_conf.h
+++ b/boards/esp32-mh-et-live-minikit/include/periph_conf.h
@@ -145,7 +145,7 @@
 #define UART0_TXD   GPIO1  /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
 #define UART0_RXD   GPIO3  /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
 
-#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
+#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
 #ifndef UART1_TXD
 #define UART1_TXD   GPIO10  /**< direct I/O pin for UART_DEV(1) TxD */
 #endif
diff --git a/boards/esp32-olimex-evb/include/periph_conf.h b/boards/esp32-olimex-evb/include/periph_conf.h
index 3f3cfe610d..6d921cf739 100644
--- a/boards/esp32-olimex-evb/include/periph_conf.h
+++ b/boards/esp32-olimex-evb/include/periph_conf.h
@@ -129,7 +129,7 @@ extern "C" {
  * as PWM channels with `PWM_DEV(0)`.
  */
 #ifndef PWM0_GPIOS
-#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
+#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
 #define PWM0_GPIOS { GPIO9, GPIO10 }
 #else
 #error Configuration problem: Flash mode qio or qout is used, \
diff --git a/boards/esp32-wroom-32/include/periph_conf.h b/boards/esp32-wroom-32/include/periph_conf.h
index 98b3ab80e3..8a245a7e4b 100644
--- a/boards/esp32-wroom-32/include/periph_conf.h
+++ b/boards/esp32-wroom-32/include/periph_conf.h
@@ -182,7 +182,7 @@ extern "C" {
 #define UART0_TXD   GPIO1  /**< direct I/O pin for UART_DEV(0) TxD, can't be changed */
 #define UART0_RXD   GPIO3  /**< direct I/O pin for UART_DEV(0) RxD, can't be changed */
 
-#if FLASH_MODE_DOUT || FLASH_MODE_DIO || DOXYGEN
+#if CONFIG_FLASHMODE_DOUT || CONFIG_FLASHMODE_DIO || DOXYGEN
 #ifndef UART1_TXD
 #define UART1_TXD   GPIO10  /**< direct I/O pin for UART_DEV(1) TxD */
 #endif
diff --git a/boards/esp8266-esp-12x/include/arduino_board.h b/boards/esp8266-esp-12x/include/arduino_board.h
index 07465013ec..c8e2e62dfb 100644
--- a/boards/esp8266-esp-12x/include/arduino_board.h
+++ b/boards/esp8266-esp-12x/include/arduino_board.h
@@ -39,7 +39,7 @@ static const gpio_t arduino_pinmap[] = {
     GPIO3,      /* ARDUINO_PIN_1 (TxD) */
     GPIO0,      /* ARDUINO_PIN_2 */
     GPIO2,      /* ARDUINO_PIN_3 */
-    #if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
+    #if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
     GPIO9,      /* ARDUINO_PIN_4 */
     GPIO10,     /* ARDUINO_PIN_5 */
     #else
diff --git a/boards/esp8266-olimex-mod/include/arduino_board.h b/boards/esp8266-olimex-mod/include/arduino_board.h
index 7da0540f29..188618a3f3 100644
--- a/boards/esp8266-olimex-mod/include/arduino_board.h
+++ b/boards/esp8266-olimex-mod/include/arduino_board.h
@@ -37,7 +37,7 @@ static const gpio_t arduino_pinmap[] = {
     GPIO3,      /* ARDUINO_PIN_1 (TxD) */
     GPIO0,      /* ARDUINO_PIN_2 */
     GPIO4,      /* ARDUINO_PIN_3 */
-    #if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
+    #if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
     GPIO9,      /* ARDUINO_PIN_4 */
     GPIO10,     /* ARDUINO_PIN_5 */
     #else
diff --git a/boards/esp8266-sparkfun-thing/include/arduino_board.h b/boards/esp8266-sparkfun-thing/include/arduino_board.h
index c7949427be..7a65bf89d6 100644
--- a/boards/esp8266-sparkfun-thing/include/arduino_board.h
+++ b/boards/esp8266-sparkfun-thing/include/arduino_board.h
@@ -37,7 +37,7 @@ static const gpio_t arduino_pinmap[] = {
     GPIO3,      /* ARDUINO_PIN_1 (TxD) */
     GPIO0,      /* ARDUINO_PIN_2 */
     GPIO4,      /* ARDUINO_PIN_3 */
-    #if defined(FLASH_MODE_QIO) || defined(FLASH_MODE_QOUT)
+    #if defined(CONFIG_FLASHMODE_QIO) || defined(CONFIG_FLASHMODE_QOUT)
     GPIO9,      /* ARDUINO_PIN_4 */
     GPIO10,     /* ARDUINO_PIN_5 */
     #else