From cbecb4d249d16789e4ae21a4aa0d91ef8ee5254c Mon Sep 17 00:00:00 2001
From: Erik Ekman <eekman@google.com>
Date: Mon, 25 Oct 2021 15:53:45 +0200
Subject: [PATCH] boards/esp32-wrover-kit: Enable esp_jtag module

Allows use of openocd by just setting PROGRAMMER.
---
 boards/esp32-wrover-kit/Kconfig           | 2 +-
 boards/esp32-wrover-kit/Makefile.dep      | 3 +++
 boards/esp32-wrover-kit/Makefile.features | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/boards/esp32-wrover-kit/Kconfig b/boards/esp32-wrover-kit/Kconfig
index 0dea5f2fc3..2bde4ba541 100644
--- a/boards/esp32-wrover-kit/Kconfig
+++ b/boards/esp32-wrover-kit/Kconfig
@@ -15,11 +15,11 @@ config BOARD_ESP32_WROVER_KIT
     select HAS_ARDUINO
     select HAS_ESP_RTC_TIMER_32K
     select HAS_ESP_SPI_RAM
-    select HAS_ESP_JTAG
     select HAS_PERIPH_ADC
     select HAS_PERIPH_I2C
     select HAS_PERIPH_PWM
     select HAS_PERIPH_SPI
     select HAS_SDCARD_SPI
+    select MODULE_ESP_JTAG
 
 source "$(RIOTBOARD)/common/esp32/Kconfig"
diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep
index f6b6ba1bd4..c79cb6fdc2 100644
--- a/boards/esp32-wrover-kit/Makefile.dep
+++ b/boards/esp32-wrover-kit/Makefile.dep
@@ -2,4 +2,7 @@ ifneq (,$(filter disp_dev,$(USEMODULE)))
   USEMODULE += ili9341
 endif
 
+# Sets up configuration for openocd
+USEMODULE += esp_jtag
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-wrover-kit/Makefile.features b/boards/esp32-wrover-kit/Makefile.features
index a4e5f97d1c..0ff032ef03 100644
--- a/boards/esp32-wrover-kit/Makefile.features
+++ b/boards/esp32-wrover-kit/Makefile.features
@@ -11,7 +11,6 @@ FEATURES_PROVIDED += periph_spi
 
 # unique features provided by the board
 FEATURES_PROVIDED += sdcard_spi
-FEATURES_PROVIDED += esp_jtag
 FEATURES_PROVIDED += esp_spi_ram
 FEATURES_PROVIDED += esp_rtc_timer_32k