Преглед на файлове

Merge branch 'ci/build_bootloader_configs' into 'master'

ci: Fix CI testing of bootloader configs

See merge request espressif/esp-idf!7911
Anton Maklakov преди 5 години
родител
ревизия
96ecd5bb53

+ 4 - 0
tools/ci/config/pre_check.yml

@@ -141,18 +141,22 @@ build_template_app:
 
     # CONFIG_COMPILER_OPTIMIZATION_DEFAULT with flag -Og
     - echo "CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_NONE with flag -O0
     - echo "CONFIG_COMPILER_OPTIMIZATION_NONE=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_SIZE with flag -Os
     - echo "CONFIG_COMPILER_OPTIMIZATION_SIZE=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # CONFIG_COMPILER_OPTIMIZATION_PERF with flag -O2
     - echo "CONFIG_COMPILER_OPTIMIZATION_PERF=y" > sdkconfig.defaults
+    - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF=y" >> sdkconfig.defaults
     - *build_with_make_and_cmake
 
     # Same as above, but also disable assertions.

+ 2 - 1
tools/unit-test-app/configs/release

@@ -1,3 +1,4 @@
 TEST_COMPONENTS=freertos esp32 esp_timer driver heap pthread soc spi_flash vfs
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y

+ 2 - 1
tools/unit-test-app/configs/release_2

@@ -1,3 +1,4 @@
 TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 esp_timer driver heap pthread soc spi_flash vfs test_utils
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y

+ 2 - 1
tools/unit-test-app/configs/release_2_s2

@@ -1,4 +1,5 @@
 TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs test_utils
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_IDF_TARGET="esp32s2"

+ 2 - 1
tools/unit-test-app/configs/release_s2

@@ -1,4 +1,5 @@
 TEST_COMPONENTS=freertos esp32s2 esp_timer driver heap pthread soc spi_flash vfs
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 CONFIG_IDF_TARGET="esp32s2"