diff --git a/components/bootloader_support/CMakeLists.txt b/components/bootloader_support/CMakeLists.txt
index f9ed448ab5..c66b4207be 100644
--- a/components/bootloader_support/CMakeLists.txt
+++ b/components/bootloader_support/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(srcs 
+set(srcs
     "src/bootloader_clock.c"
     "src/bootloader_common.c"
     "src/bootloader_flash.c"
@@ -10,7 +10,7 @@ set(srcs
     "src/bootloader_flash_config_${IDF_TARGET}.c"
     )
 
-if(CONFIG_IDF_TARGET_ESP32)
+if(IDF_TARGET STREQUAL "esp32")
     # Not supported on ESP32S2Beta yet
     list(APPEND srcs "src/flash_encrypt.c")
 endif()
diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 2965d8a9ee..83c0dbb931 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND srcs
     )
 
 # TODO: SPI Flash HAL for ESP32S2Beta also
-if(CONFIG_IDF_TARGET_ESP32)
+if(IDF_TARGET STREQUAL "esp32")
     list(APPEND srcs "src/hal/spi_flash_hal.c"
                      "src/hal/spi_flash_hal_iram.c"
                      )