From 52dcf1c1806836f689c7b9c1de3d3ae34e7105dd Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 9 Mar 2020 11:55:22 +1100 Subject: [PATCH 1/2] ci: Build all bootloader configs when building the bootloader app CI regression in 26efc5a6d005da33ecf64d255a7e9a722f74fe02 --- tools/ci/config/pre_check.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml index 881cc2c2ef..6f4baca8fa 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -123,18 +123,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. From 51b7247033979ccc74ae37febd198f5427e676eb Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Mon, 9 Mar 2020 11:55:52 +1100 Subject: [PATCH 2/2] unit test app: Use the new config names for DEBUG/RELEASE configs Also build the bootloader to the same config level as the app --- tools/unit-test-app/configs/release | 3 ++- tools/unit-test-app/configs/release_2 | 3 ++- tools/unit-test-app/configs/release_2_s2 | 3 ++- tools/unit-test-app/configs/release_s2 | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/unit-test-app/configs/release b/tools/unit-test-app/configs/release index 75da1aa803..a7f1c0c7f4 100644 --- a/tools/unit-test-app/configs/release +++ b/tools/unit-test-app/configs/release @@ -1,3 +1,4 @@ TEST_COMPONENTS=freertos esp32 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 diff --git a/tools/unit-test-app/configs/release_2 b/tools/unit-test-app/configs/release_2 index d683fe7b31..aaa8260807 100644 --- a/tools/unit-test-app/configs/release_2 +++ b/tools/unit-test-app/configs/release_2 @@ -1,3 +1,4 @@ TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32 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 diff --git a/tools/unit-test-app/configs/release_2_s2 b/tools/unit-test-app/configs/release_2_s2 index d6e2bbfca2..e385a715f6 100644 --- a/tools/unit-test-app/configs/release_2_s2 +++ b/tools/unit-test-app/configs/release_2_s2 @@ -1,4 +1,5 @@ TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s2beta 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="esp32s2beta" diff --git a/tools/unit-test-app/configs/release_s2 b/tools/unit-test-app/configs/release_s2 index aaa50b0ce4..f9268fe936 100644 --- a/tools/unit-test-app/configs/release_s2 +++ b/tools/unit-test-app/configs/release_s2 @@ -1,4 +1,5 @@ TEST_COMPONENTS=freertos esp32s2beta 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="esp32s2beta"