From 6c05b2479e4a9ba15243f74b2f368f711822228f Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
Date: Fri, 9 Apr 2021 10:39:40 -0300
Subject: [PATCH] boards/xtensa: Avoid multiple inclusion of the common Kconfig

Also added a condition (!ARCH_BOARD_CUSTOM) for preventing that
out-of-tree ESP32-based custom boards carry out the in-tree common
directory.
---
 boards/Kconfig                                 | 3 +++
 boards/xtensa/esp32/esp32-devkitc/Kconfig      | 2 --
 boards/xtensa/esp32/esp32-ethernet-kit/Kconfig | 2 --
 boards/xtensa/esp32/esp32-wrover-kit/Kconfig   | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/boards/Kconfig b/boards/Kconfig
index 85d98efb1b..e229027f69 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -3116,6 +3116,9 @@ endif
 if ARCH_BOARD_RX65N_GRROSE
 source "boards/renesas/rx65n/rx65n-grrose/Kconfig"
 endif
+if ARCH_CHIP_ESP32 && !ARCH_BOARD_CUSTOM
+source "boards/xtensa/esp32/common/Kconfig"
+endif
 if ARCH_BOARD_ESP32_DEVKITC
 source "boards/xtensa/esp32/esp32-devkitc/Kconfig"
 endif
diff --git a/boards/xtensa/esp32/esp32-devkitc/Kconfig b/boards/xtensa/esp32/esp32-devkitc/Kconfig
index dd0405eafb..a57370c170 100644
--- a/boards/xtensa/esp32/esp32-devkitc/Kconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/Kconfig
@@ -5,8 +5,6 @@
 
 if ARCH_BOARD_ESP32_DEVKITC
 
-source boards/xtensa/esp32/common/Kconfig
-
 if PM
 
 config PM_ALARM_SEC
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig b/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
index 1d0445489d..4a6f1a3cb0 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/Kconfig
@@ -5,6 +5,4 @@
 
 if ARCH_BOARD_ESP32_ETHERNETKIT
 
-source boards/xtensa/esp32/common/Kconfig
-
 endif # ARCH_BOARD_ESP32_ETHERNETKIT
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/Kconfig b/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
index ab44d065f4..e6f5394667 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/Kconfig
@@ -5,6 +5,4 @@
 
 if ARCH_BOARD_ESP32_WROVERKIT
 
-source boards/xtensa/esp32/common/Kconfig
-
 endif # ARCH_BOARD_ESP32_WROVERKIT