From 546a7fc495ff0e6207d9827b864c82644f225a6b Mon Sep 17 00:00:00 2001 From: Darian Leung Date: Wed, 15 Jun 2022 16:17:59 +0800 Subject: [PATCH] esp_pm: Disable esp_pm when SMP FreeRTOS is enabled SMP FreeRTOS currently does not support power management yet. This commit makes SMP FreeRTOS and esp_pm mutually exclusive. --- components/esp_pm/Kconfig | 2 ++ tools/unit-test-app/configs/pm | 2 ++ tools/unit-test-app/configs/pm_c2 | 2 ++ tools/unit-test-app/configs/pm_c3 | 2 ++ tools/unit-test-app/configs/pm_s2 | 2 ++ tools/unit-test-app/configs/pm_s3 | 2 ++ 6 files changed, 12 insertions(+) diff --git a/components/esp_pm/Kconfig b/components/esp_pm/Kconfig index b47f087b45..d9eefd76e5 100644 --- a/components/esp_pm/Kconfig +++ b/components/esp_pm/Kconfig @@ -1,6 +1,8 @@ menu "Power Management" config PM_ENABLE bool "Support for power management" + # SMP FreeRTOS currently does not support power management IDF-4997 + depends on !FREERTOS_SMP default n help If enabled, application is compiled with support for power management. diff --git a/tools/unit-test-app/configs/pm b/tools/unit-test-app/configs/pm index a2967c2e1f..f66688be84 100644 --- a/tools/unit-test-app/configs/pm +++ b/tools/unit-test-app/configs/pm @@ -3,3 +3,5 @@ TEST_COMPONENTS=esp_pm CONFIG_PM_ENABLE=y CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_ULP_COPROC_TYPE_FSM=y +# SMP FreeRTOS currently does not support power management IDF-4997 +CONFIG_FREERTOS_SMP=n diff --git a/tools/unit-test-app/configs/pm_c2 b/tools/unit-test-app/configs/pm_c2 index 47444a0932..71d9b5ea46 100644 --- a/tools/unit-test-app/configs/pm_c2 +++ b/tools/unit-test-app/configs/pm_c2 @@ -2,3 +2,5 @@ CONFIG_IDF_TARGET="esp32c2" TEST_COMPONENTS=esp_pm CONFIG_PM_ENABLE=y CONFIG_FREERTOS_USE_TICKLESS_IDLE=y +# SMP FreeRTOS currently does not support power management IDF-4997 +CONFIG_FREERTOS_SMP=n diff --git a/tools/unit-test-app/configs/pm_c3 b/tools/unit-test-app/configs/pm_c3 index e1fd3d1da1..49abdde9de 100644 --- a/tools/unit-test-app/configs/pm_c3 +++ b/tools/unit-test-app/configs/pm_c3 @@ -2,3 +2,5 @@ CONFIG_IDF_TARGET="esp32c3" TEST_COMPONENTS=esp_pm CONFIG_PM_ENABLE=y CONFIG_FREERTOS_USE_TICKLESS_IDLE=y +# SMP FreeRTOS currently does not support power management IDF-4997 +CONFIG_FREERTOS_SMP=n diff --git a/tools/unit-test-app/configs/pm_s2 b/tools/unit-test-app/configs/pm_s2 index b2b82ba58f..a4d89f0c75 100644 --- a/tools/unit-test-app/configs/pm_s2 +++ b/tools/unit-test-app/configs/pm_s2 @@ -3,3 +3,5 @@ TEST_COMPONENTS=esp_pm CONFIG_PM_ENABLE=y CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_ULP_COPROC_TYPE_FSM=y +# SMP FreeRTOS currently does not support power management IDF-4997 +CONFIG_FREERTOS_SMP=n diff --git a/tools/unit-test-app/configs/pm_s3 b/tools/unit-test-app/configs/pm_s3 index 0d3a11b235..040e91451c 100644 --- a/tools/unit-test-app/configs/pm_s3 +++ b/tools/unit-test-app/configs/pm_s3 @@ -3,3 +3,5 @@ TEST_COMPONENTS=esp_pm CONFIG_PM_ENABLE=y CONFIG_FREERTOS_USE_TICKLESS_IDLE=y CONFIG_ULP_COPROC_TYPE_FSM=y +# SMP FreeRTOS currently does not support power management IDF-4997 +CONFIG_FREERTOS_SMP=n