From 6a75fe5912417f2940e822cf35f6be7e247adb06 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Fri, 4 Nov 2022 11:47:47 +0530 Subject: [PATCH] esp_hw_support: Update build system support for mergin esp_ds.c files into one --- components/esp_hw_support/CMakeLists.txt | 4 ++++ components/esp_hw_support/port/esp32c3/CMakeLists.txt | 4 ++-- components/esp_hw_support/port/esp32h4/CMakeLists.txt | 4 ++-- components/esp_hw_support/port/esp32s2/CMakeLists.txt | 1 - components/esp_hw_support/port/esp32s3/CMakeLists.txt | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt index 8bf80f7fa0..3de2a18299 100644 --- a/components/esp_hw_support/CMakeLists.txt +++ b/components/esp_hw_support/CMakeLists.txt @@ -57,6 +57,10 @@ if(NOT BOOTLOADER_BUILD) list(APPEND srcs "esp_etm.c") endif() + if(CONFIG_SOC_DIG_SIGN_SUPPORTED) + list(APPEND srcs "esp_ds.c") + endif() + # ESP32C6-TODO if(CONFIG_IDF_TARGET_ESP32C6) list(REMOVE_ITEM srcs diff --git a/components/esp_hw_support/port/esp32c3/CMakeLists.txt b/components/esp_hw_support/port/esp32c3/CMakeLists.txt index ab7b6676a6..6f5037848f 100644 --- a/components/esp_hw_support/port/esp32c3/CMakeLists.txt +++ b/components/esp_hw_support/port/esp32c3/CMakeLists.txt @@ -4,11 +4,11 @@ set(srcs "rtc_clk_init.c" "rtc_pm.c" "rtc_sleep.c" "rtc_time.c" - "chip_info.c") + "chip_info.c" + ) if(NOT BOOTLOADER_BUILD) list(APPEND srcs "esp_crypto_lock.c" - "esp_ds.c" "sar_periph_ctrl.c") # init constructor for wifi diff --git a/components/esp_hw_support/port/esp32h4/CMakeLists.txt b/components/esp_hw_support/port/esp32h4/CMakeLists.txt index 4d50f8cf38..640f39022d 100644 --- a/components/esp_hw_support/port/esp32h4/CMakeLists.txt +++ b/components/esp_hw_support/port/esp32h4/CMakeLists.txt @@ -4,11 +4,11 @@ set(srcs "rtc_clk_init.c" "rtc_pm.c" "rtc_sleep.c" "rtc_time.c" - "chip_info.c") + "chip_info.c" + ) if(NOT BOOTLOADER_BUILD) list(APPEND srcs "esp_crypto_lock.c" - "esp_ds.c" "sar_periph_ctrl.c") if(CONFIG_ESP_SYSTEM_MEMPROT_FEATURE) diff --git a/components/esp_hw_support/port/esp32s2/CMakeLists.txt b/components/esp_hw_support/port/esp32s2/CMakeLists.txt index cd16ce998b..15079598f9 100644 --- a/components/esp_hw_support/port/esp32s2/CMakeLists.txt +++ b/components/esp_hw_support/port/esp32s2/CMakeLists.txt @@ -13,7 +13,6 @@ set(srcs if(NOT BOOTLOADER_BUILD) list(APPEND srcs "memprot.c" "esp_crypto_lock.c" - "esp_ds.c" "sar_periph_ctrl.c") # init constructor for wifi diff --git a/components/esp_hw_support/port/esp32s3/CMakeLists.txt b/components/esp_hw_support/port/esp32s3/CMakeLists.txt index 378b7915d5..b41200f13e 100644 --- a/components/esp_hw_support/port/esp32s3/CMakeLists.txt +++ b/components/esp_hw_support/port/esp32s3/CMakeLists.txt @@ -8,11 +8,11 @@ set(srcs "rtc_pm.c" "rtc_sleep.c" "rtc_time.c" - "chip_info.c") + "chip_info.c" + ) if(NOT BOOTLOADER_BUILD) - list(APPEND srcs "esp_ds.c" - "esp_crypto_lock.c" + list(APPEND srcs "esp_crypto_lock.c" "sar_periph_ctrl.c") if(CONFIG_ESP_SYSTEM_MEMPROT_FEATURE)