From 0c6e1b94822b8079ca8dcf447054c4ddb9773bd8 Mon Sep 17 00:00:00 2001 From: morris Date: Thu, 26 Mar 2020 15:43:12 +0800 Subject: [PATCH] remove dependency of timer_group_caps.h on soc.h --- components/soc/soc/esp32/include/soc/timer_group_caps.h | 5 +---- components/soc/soc/esp32s2/include/soc/timer_group_caps.h | 6 ++---- tools/ci/config/target-test.yml | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/soc/soc/esp32/include/soc/timer_group_caps.h b/components/soc/soc/esp32/include/soc/timer_group_caps.h index 67dbe54ff..e1850107c 100644 --- a/components/soc/soc/esp32/include/soc/timer_group_caps.h +++ b/components/soc/soc/esp32/include/soc/timer_group_caps.h @@ -14,7 +14,4 @@ #pragma once -#include "soc/soc.h" - -//APB Frequency -#define WDT_SOURCE_CLK_FREQ_MHZ (APB_CLK_FREQ / 1000000) +#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default diff --git a/components/soc/soc/esp32s2/include/soc/timer_group_caps.h b/components/soc/soc/esp32s2/include/soc/timer_group_caps.h index 7c10dee29..aaf2294cd 100644 --- a/components/soc/soc/esp32s2/include/soc/timer_group_caps.h +++ b/components/soc/soc/esp32s2/include/soc/timer_group_caps.h @@ -14,8 +14,6 @@ #pragma once -#include "soc/soc.h" - #define TIMER_GROUP_SUPPORTS_XTAL_CLOCK -//APB Frequency -#define WDT_SOURCE_CLK_FREQ_MHZ (APB_CLK_FREQ / 1000000) + +#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 7cff836fd..5fb900716 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -495,7 +495,7 @@ UT_034: UT_035: extends: .unit_test_s2_template - parallel: 30 + parallel: 31 tags: - ESP32S2_IDF - UT_T1_1