diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 13c83b8878..eded971f32 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -200,6 +200,18 @@ config ESP32_DEFAULT_CPU_FREQ_MHZ
 	default 160 if ESP32_DEFAULT_CPU_FREQ_160
 	default 240 if ESP32_DEFAULT_CPU_FREQ_240
 
+choice
+	prompt "On-board Crystal Frequency"
+	default ESP32_XTAL_40MZ
+
+config ESP32_XTAL_40MZ
+	bool "40MHz"
+
+config ESP32_XTAL_26MHz
+	bool "26MHz"
+
+endchoice # On-board Crystal Frequency
+
 config ESP32_RT_TIMER
 	bool "Real-time Timer"
 	default n
@@ -212,6 +224,13 @@ config ESP32_PARTITION
 		Decode esp-idf's partition file and initialize
 		partition by nuttx MTD.
 
+config ESP32_RUN_IRAM
+	bool "Run from IRAM"
+	default n
+	---help---
+		This loads all of NuttX inside IRAM.  Used to test somewhat small
+		images that can fit entirely in IRAM.
+
 menu "ESP32 Peripheral Selection"
 
 config ESP32_UART
diff --git a/boards/xtensa/esp32/esp32-devkitc/Kconfig b/boards/xtensa/esp32/esp32-devkitc/Kconfig
index e537922f1f..dd0405eafb 100644
--- a/boards/xtensa/esp32/esp32-devkitc/Kconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/Kconfig
@@ -5,25 +5,6 @@
 
 if ARCH_BOARD_ESP32_DEVKITC
 
-choice
-	prompt "On-board Crystal Frequency"
-	default ESP32_DEVKITC_XTAL_40MZ
-
-config ESP32_DEVKITC_XTAL_40MZ
-	bool "40MHz"
-
-config ESP32_DEVKITC_XTAL_26MHz
-	bool "26MHz"
-
-endchoice # On-board Crystal Frequency
-
-config ESP32_DEVKITC_RUN_IRAM
-	bool "Run from IRAM"
-	default n
-	---help---
-		This loads all of NuttX inside IRAM.  Used to test somewhat small
-		images that can fit entirely in IRAM.
-
 source boards/xtensa/esp32/common/Kconfig
 
 if PM
diff --git a/boards/xtensa/esp32/esp32-devkitc/include/board.h b/boards/xtensa/esp32/esp32-devkitc/include/board.h
index f1a6e7074c..2afaef90fd 100644
--- a/boards/xtensa/esp32/esp32-devkitc/include/board.h
+++ b/boards/xtensa/esp32/esp32-devkitc/include/board.h
@@ -29,7 +29,7 @@
 
 /* The ESP32 Core board V2 is fitted with either a 26 a 40MHz crystal */
 
-#ifdef CONFIG_ESP32_DEVKITC_XTAL_26MHz
+#ifdef CONFIG_ESP32_XTAL_26MHz
 #  define BOARD_XTAL_FREQUENCY  26000000
 #else
 #  define BOARD_XTAL_FREQUENCY  40000000
@@ -60,7 +60,7 @@
  *           /bootloader_support/src/bootloader_clock.c#L38-L62
  */
 
-#ifdef CONFIG_ESP32_DEVKITC_RUN_IRAM
+#ifdef CONFIG_ESP32_RUN_IRAM
 #  define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
 #else
 #ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
index e61b56949f..873156f9ad 100644
--- a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs
@@ -27,7 +27,7 @@ LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
 LDSCRIPT3 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
 LDSCRIPT4 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_peripherals.ld
 
-ifeq ($(CONFIG_ESP32_DEVKITC_RUN_IRAM),y)
+ifeq ($(CONFIG_ESP32_RUN_IRAM),y)
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
 else
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_flash.ld
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig b/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
index 14b948f51c..1d0445489d 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
@@ -5,25 +5,6 @@
 
 if ARCH_BOARD_ESP32_ETHERNETKIT
 
-choice
-	prompt "On-board Crystal Frequency"
-	default ESP32_ETHERNETKIT_XTAL_40MZ
-
-config ESP32_ETHERNETKIT_XTAL_40MZ
-	bool "40MHz"
-
-config ESP32_ETHERNETKIT_XTAL_26MHz
-	bool "26MHz"
-
-endchoice # On-board Crystal Frequency
-
-config ESP32_ETHERNETKIT_RUN_IRAM
-	bool "Run from IRAM"
-	default n
-	---help---
-		This loads all of NuttX inside IRAM.  Used to test somewhat small
-		images that can fit entirely in IRAM.
-
 source boards/xtensa/esp32/common/Kconfig
 
 endif # ARCH_BOARD_ESP32_ETHERNETKIT
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h b/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
index db86bf3e09..46977212a4 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/include/board.h
@@ -31,7 +31,7 @@
  * crystal
  */
 
-#ifdef CONFIG_ESP32_ETHERNETKIT_XTAL_26MHz
+#ifdef CONFIG_ESP32_XTAL_26MHz
 #  define BOARD_XTAL_FREQUENCY  26000000
 #else
 #  define BOARD_XTAL_FREQUENCY  40000000
@@ -62,7 +62,7 @@
  *           /bootloader_support/src/bootloader_clock.c#L38-L62
  */
 
-#ifdef CONFIG_ESP32_ETHERNETKIT_RUN_IRAM
+#ifdef CONFIG_ESP32_RUN_IRAM
 #  define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
 #else
 #ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
index 920c9c4a33..1b4e115248 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs
@@ -27,7 +27,7 @@ LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
 LDSCRIPT3 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
 LDSCRIPT4 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_peripherals.ld
 
-ifeq ($(CONFIG_ESP32_ETHERNETKIT_RUN_IRAM),y)
+ifeq ($(CONFIG_ESP32_RUN_IRAM),y)
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
 else
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_flash.ld
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/Kconfig b/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
index 5e2142dd92..ab44d065f4 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
@@ -5,25 +5,6 @@
 
 if ARCH_BOARD_ESP32_WROVERKIT
 
-choice
-	prompt "On-board Crystal Frequency"
-	default ESP32_WROVERKIT_XTAL_40MZ
-
-config ESP32_WROVERKIT_XTAL_40MZ
-	bool "40MHz"
-
-config ESP32_WROVERKIT_XTAL_26MHz
-	bool "26MHz"
-
-endchoice # On-board Crystal Frequency
-
-config ESP32_WROVERKIT_RUN_IRAM
-	bool "Run from IRAM"
-	default n
-	---help---
-		This loads all of NuttX inside IRAM.  Used to test somewhat small
-		images that can fit entirely in IRAM.
-
 source boards/xtensa/esp32/common/Kconfig
 
 endif # ARCH_BOARD_ESP32_WROVERKIT
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
index e5f083bbb8..260655bc71 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
+++ b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
@@ -31,7 +31,7 @@
  * crystal
  */
 
-#ifdef CONFIG_ESP32_WROVERKIT_XTAL_26MHz
+#ifdef CONFIG_ESP32_XTAL_26MHz
 #  define BOARD_XTAL_FREQUENCY  26000000
 #else
 #  define BOARD_XTAL_FREQUENCY  40000000
@@ -62,7 +62,7 @@
  *           /bootloader_support/src/bootloader_clock.c#L38-L62
  */
 
-#ifdef CONFIG_ESP32_WROVERKIT_RUN_IRAM
+#ifdef CONFIG_ESP32_RUN_IRAM
 #  define BOARD_CLOCK_FREQUENCY (2 * BOARD_XTAL_FREQUENCY)
 #else
 #ifdef CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
index 1ec0f24a84..4c02ca2f3e 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
+++ b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs
@@ -27,7 +27,7 @@ LDSCRIPT1 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_out.ld
 LDSCRIPT3 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_rom.ld
 LDSCRIPT4 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_peripherals.ld
 
-ifeq ($(CONFIG_ESP32_WROVERKIT_RUN_IRAM),y)
+ifeq ($(CONFIG_ESP32_RUN_IRAM),y)
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_iram.ld
 else
   LDSCRIPT2 = $(BOARD_DIR)$(DELIM)scripts$(DELIM)esp32_flash.ld