From 4f80c0f27ed014e591ca30aca1e25c50a3ed0948 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Thu, 21 Jul 2022 15:25:33 +0800
Subject: [PATCH] esp_adc: remove esp_adc from g1 component dependencies

---
 components/driver/CMakeLists.txt                    | 2 +-
 components/driver/deprecated/adc_dma_legacy.c       | 1 -
 components/driver/deprecated/adc_i2s_deprecated.c   | 1 -
 components/driver/deprecated/adc_legacy.c           | 1 -
 tools/test_apps/system/g1_components/CMakeLists.txt | 3 ---
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/components/driver/CMakeLists.txt b/components/driver/CMakeLists.txt
index 5dc25f9776..4e65c15274 100644
--- a/components/driver/CMakeLists.txt
+++ b/components/driver/CMakeLists.txt
@@ -121,7 +121,7 @@ else()
     idf_component_register(SRCS "${srcs}"
                         INCLUDE_DIRS ${includes}
                         PRIV_INCLUDE_DIRS "include/driver"
-                        PRIV_REQUIRES efuse esp_timer esp_adc
+                        PRIV_REQUIRES efuse esp_timer
                         REQUIRES esp_pm esp_ringbuf freertos soc hal esp_hw_support
                         LDFRAGMENTS linker.lf)
 endif()
diff --git a/components/driver/deprecated/adc_dma_legacy.c b/components/driver/deprecated/adc_dma_legacy.c
index 5feca81c9b..9097a7170e 100644
--- a/components/driver/deprecated/adc_dma_legacy.c
+++ b/components/driver/deprecated/adc_dma_legacy.c
@@ -19,7 +19,6 @@
 #include "freertos/timers.h"
 #include "freertos/ringbuf.h"
 #include "esp_private/periph_ctrl.h"
-#include "esp_private/adc_private.h"
 #include "esp_private/adc_share_hw_ctrl.h"
 #include "hal/adc_types.h"
 #include "hal/adc_hal.h"
diff --git a/components/driver/deprecated/adc_i2s_deprecated.c b/components/driver/deprecated/adc_i2s_deprecated.c
index 245214f9f6..ad125c8481 100644
--- a/components/driver/deprecated/adc_i2s_deprecated.c
+++ b/components/driver/deprecated/adc_i2s_deprecated.c
@@ -20,7 +20,6 @@
 #ifdef CONFIG_PM_ENABLE
 #include "esp_pm.h"
 #endif
-#include "esp_private/adc_private.h"
 #include "freertos/FreeRTOS.h"
 
 #include "driver/adc_i2s_legacy.h"
diff --git a/components/driver/deprecated/adc_legacy.c b/components/driver/deprecated/adc_legacy.c
index 853da7a19e..67d586efc5 100644
--- a/components/driver/deprecated/adc_legacy.c
+++ b/components/driver/deprecated/adc_legacy.c
@@ -18,7 +18,6 @@
 #include "driver/rtc_io.h"
 #include "sys/lock.h"
 #include "driver/gpio.h"
-#include "esp_private/adc_private.h"
 #include "esp_private/adc_share_hw_ctrl.h"
 #include "adc1_private.h"
 #include "hal/adc_types.h"
diff --git a/tools/test_apps/system/g1_components/CMakeLists.txt b/tools/test_apps/system/g1_components/CMakeLists.txt
index c29e1eadb8..7c69876019 100644
--- a/tools/test_apps/system/g1_components/CMakeLists.txt
+++ b/tools/test_apps/system/g1_components/CMakeLists.txt
@@ -40,9 +40,6 @@ set(extra_components_which_shouldnt_be_included
     #   Figure out if these components can exist without a dependency on efuse.
     #   If not, see if esp_hw_support can provide minimal efuse component replacement in G1 build.
     efuse
-    # [refactor-todo]: esp_adc is a dependency of driver.
-    #   Driver dependency only exists in legacy drivers. After removing deprecated drivers, this dependency can be fixed
-    esp_adc
     # esp_pm is pulled in by freertos, can be made a weak dependency
     #   conditional on related Kconfig option. It is also used by esp_wifi, driver, mbedtls,
     #   all of which should be removed from G1-only build.