From 760d711491db1a7e4fc76c12febf3a64036c6e19 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Wed, 10 Jan 2024 12:03:37 +0800 Subject: [PATCH] fix(build): remove CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE option from c6, h2 and p4 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE doesnt really have many use cases, but it will force us to keep increasing bootloader segment sizes just to allow for building this options. Deprecate this config for new chips. --- components/bootloader/Kconfig.projbuild | 5 +++-- tools/ci/build_template_app.sh | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild index 17095050fe..99f16e9152 100644 --- a/components/bootloader/Kconfig.projbuild +++ b/components/bootloader/Kconfig.projbuild @@ -23,7 +23,6 @@ menu "Bootloader config" - The default "Size" setting will add the -0s flag to CFLAGS. - The "Debug" setting will add the -Og flag to CFLAGS. - The "Performance" setting will add the -O2 flag to CFLAGS. - - The "None" setting will add the -O0 flag to CFLAGS. Note that custom optimization levels may be unsupported. @@ -34,7 +33,9 @@ menu "Bootloader config" config BOOTLOADER_COMPILER_OPTIMIZATION_PERF bool "Optimize for performance (-O2)" config BOOTLOADER_COMPILER_OPTIMIZATION_NONE - bool "Debug without optimization (-O0)" + bool "Debug without optimization (-O0) (Deprecated, will be removed in IDF v6.0)" + depends on IDF_TARGET_ARCH_XTENSA || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + endchoice choice BOOTLOADER_LOG_LEVEL diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh index 3d3994fb51..9751888cb9 100755 --- a/tools/ci/build_template_app.sh +++ b/tools/ci/build_template_app.sh @@ -12,9 +12,6 @@ set -euo pipefail gen_configs() { # CONFIG_COMPILER_OPTIMIZATION_NONE with flag -O0 echo "CONFIG_COMPILER_OPTIMIZATION_NONE=y" > esp-idf-template/sdkconfig.ci.O0 - echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE=y" >> esp-idf-template/sdkconfig.ci.O0 - # -O0 makes the bootloader too large to fit in the default space, otherwise(!) - echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> esp-idf-template/sdkconfig.ci.O0 # CONFIG_COMPILER_OPTIMIZATION_SIZE with flag -Os echo "CONFIG_COMPILER_OPTIMIZATION_SIZE=y" > esp-idf-template/sdkconfig.ci.Os