From e9f1011b1b442f8bd6c6ee3d75bd86e7cc654e42 Mon Sep 17 00:00:00 2001
From: Roland Dobai <dobai.roland@gmail.com>
Date: Mon, 29 Apr 2019 14:22:57 +0200
Subject: [PATCH] Rename Kconfig options (components/driver)

---
 components/driver/Kconfig              | 4 ++--
 components/driver/rtc_module.c         | 2 +-
 components/driver/sdkconfig.rename     | 4 ++++
 tools/ldgen/samples/sdkconfig          | 2 +-
 tools/unit-test-app/sdkconfig.defaults | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 components/driver/sdkconfig.rename

diff --git a/components/driver/Kconfig b/components/driver/Kconfig
index f00d7e809..497b1a928 100644
--- a/components/driver/Kconfig
+++ b/components/driver/Kconfig
@@ -10,11 +10,11 @@ menu "Driver configurations"
                 be shut off when it is not working leading to lower power consumption. However
                 using the FSM control ADC power will increase the noise of ADC.
 
-        config ADC2_DISABLE_DAC
+        config ADC_DISABLE_DAC
             bool "Disable DAC when ADC2 is used on GPIO 25 and 26"
             default y
             help
-                If this is set, the ADC2 driver will disables the output of the DAC corresponding to the specified
+                If this is set, the ADC2 driver will disable the output of the DAC corresponding to the specified
                 channel. This is the default value.
 
                 For testing, disable this option so that we can measure the output of DAC by internal ADC.
diff --git a/components/driver/rtc_module.c b/components/driver/rtc_module.c
index 12afe08ae..296c183c7 100644
--- a/components/driver/rtc_module.c
+++ b/components/driver/rtc_module.c
@@ -1706,7 +1706,7 @@ esp_err_t adc2_get_raw(adc2_channel_t channel, adc_bits_width_t width_bit, int*
     }
 
     //disable other peripherals
-#ifdef CONFIG_ADC2_DISABLE_DAC
+#ifdef CONFIG_ADC_DISABLE_DAC
     adc2_dac_disable( channel );
 #endif
     // set controller
diff --git a/components/driver/sdkconfig.rename b/components/driver/sdkconfig.rename
new file mode 100644
index 000000000..311467d01
--- /dev/null
+++ b/components/driver/sdkconfig.rename
@@ -0,0 +1,4 @@
+# sdkconfig replacement configurations for deprecated options formatted as
+# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
+
+CONFIG_ADC2_DISABLE_DAC     CONFIG_ADC_DISABLE_DAC
diff --git a/tools/ldgen/samples/sdkconfig b/tools/ldgen/samples/sdkconfig
index d9582a84c..7903bc73f 100644
--- a/tools/ldgen/samples/sdkconfig
+++ b/tools/ldgen/samples/sdkconfig
@@ -125,7 +125,7 @@ CONFIG_BT_RESERVE_DRAM=0
 # ADC configuration
 #
 CONFIG_ADC_FORCE_XPD_FSM=
-CONFIG_ADC2_DISABLE_DAC=y
+CONFIG_ADC_DISABLE_DAC=y
 
 #
 # ESP32-specific
diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults
index 371c08bb0..0289c96f4 100644
--- a/tools/unit-test-app/sdkconfig.defaults
+++ b/tools/unit-test-app/sdkconfig.defaults
@@ -25,7 +25,7 @@ CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
 CONFIG_COMPILER_STACK_CHECK=y
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_ESP_TIMER_PROFILING=y
-CONFIG_ADC2_DISABLE_DAC=n
+CONFIG_ADC_DISABLE_DAC=n
 CONFIG_COMPILER_WARN_WRITE_STRINGS=y
 CONFIG_SPI_MASTER_IN_IRAM=y
 CONFIG_EFUSE_VIRTUAL=y