Bläddra i källkod

Merge branch 'bugfix/remove_psram_dependency_in_idf_as_lib_example' into 'master'

idf_as_lib: remove dependency to esp_psram

Closes IDF-5238

See merge request espressif/esp-idf!18992
Armando (Dou Yiwen) 3 år sedan
förälder
incheckning
1fc4d2b598

+ 2 - 2
examples/build_system/cmake/idf_as_lib/CMakeLists.txt

@@ -15,7 +15,7 @@ if("${TARGET}" IN_LIST targets)
                     # although esptool_py does not generate static library,
                     # processing the component is needed for flashing related
                     # targets and file generation
-                    COMPONENTS freertos esptool_py esp_psram
+                    COMPONENTS freertos esptool_py
                     SDKCONFIG ${CMAKE_CURRENT_LIST_DIR}/sdkconfig
                     BUILD_DIR ${CMAKE_BINARY_DIR})
 else()
@@ -33,7 +33,7 @@ add_executable(${elf_file} main.c)
 
 # Link the static libraries to the executable
 if("${TARGET}" IN_LIST targets)
-    target_link_libraries(${elf_file} idf::freertos idf::spi_flash idf::esp_psram)
+    target_link_libraries(${elf_file} idf::freertos idf::spi_flash)
     # Attach additional targets to the executable file for flashing,
     # linker script generation, partition_table generation, etc.
     idf_build_executable(${elf_file})

+ 0 - 3
tools/ci/test_build_system_cmake.sh

@@ -537,12 +537,9 @@ function run_tests()
     print_status "Test for external libraries in custom CMake projects with ESP-IDF components linked"
     mkdir build
     IDF_AS_LIB=$IDF_PATH/examples/build_system/cmake/idf_as_lib
-    echo "CONFIG_SPIRAM=y" > $IDF_AS_LIB/sdkconfig
-    echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> $IDF_AS_LIB/sdkconfig
     # note: we just need to run cmake
     (cd build && cmake $IDF_AS_LIB -DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-esp32.cmake -DTARGET=esp32)
     grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
-    (grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
 
     for strat in MEMW NOPS DUPLDST; do
         print_status "Test for external libraries in custom CMake projects with PSRAM strategy $strat"