alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

core-system: changed CONFIG_COMPILER_OPTIMIZATION_DEFAULT to CONFIG_COMPILER_OPTIMIZATION_DEBUG

Browse Source 
DEBUG is more descriptive and is consistent with the name used in the bootloader:
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG

Closes https://github.com/espressif/esp-idf/issues/8404
This commit is contained in:
Marius Vikhammer 2023-06-02 15:16:50 +08:00
parent f6452f0819
commit bd4c0fca3c
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -20,7 +20,7 @@ if(NOT BOOTLOADER_BUILD)
if(CMAKE_C_COMPILER_ID MATCHES "GNU") if(CMAKE_C_COMPILER_ID MATCHES "GNU")
list(APPEND compile_options "-freorder-blocks") list(APPEND compile_options "-freorder-blocks")
endif() endif()
elseif(CONFIG_COMPILER_OPTIMIZATION_DEFAULT) elseif(CONFIG_COMPILER_OPTIMIZATION_DEBUG)
list(APPEND compile_options "-Og") list(APPEND compile_options "-Og")
elseif(CONFIG_COMPILER_OPTIMIZATION_NONE) elseif(CONFIG_COMPILER_OPTIMIZATION_NONE)
list(APPEND compile_options "-O0") list(APPEND compile_options "-O0")

6
Kconfig
View File

@ -264,11 +264,11 @@ mainmenu "Espressif IoT Development Framework Configuration"
choice COMPILER_OPTIMIZATION choice COMPILER_OPTIMIZATION
prompt "Optimization Level" prompt "Optimization Level"
default COMPILER_OPTIMIZATION_DEFAULT default COMPILER_OPTIMIZATION_DEBUG
help help
This option sets compiler optimization level (gcc -O argument) for the app. This option sets compiler optimization level (gcc -O argument) for the app.
- The "Default" setting will add the -0g flag to CFLAGS. - The "Debug" setting will add the -0g flag to CFLAGS.
- The "Size" setting will add the -0s flag to CFLAGS. - The "Size" setting will add the -0s flag to CFLAGS.
- The "Performance" setting will add the -O2 flag to CFLAGS. - The "Performance" setting will add the -O2 flag to CFLAGS.
- The "None" setting will add the -O0 flag to CFLAGS. - The "None" setting will add the -O0 flag to CFLAGS.
@ -287,7 +287,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
Compiler optimization for the IDF bootloader is set separately, Compiler optimization for the IDF bootloader is set separately,
see the BOOTLOADER_COMPILER_OPTIMIZATION setting. see the BOOTLOADER_COMPILER_OPTIMIZATION setting.
config COMPILER_OPTIMIZATION_DEFAULT config COMPILER_OPTIMIZATION_DEBUG
bool "Debug (-Og)" bool "Debug (-Og)"
config COMPILER_OPTIMIZATION_SIZE config COMPILER_OPTIMIZATION_SIZE
bool "Optimize for size (-Os)" bool "Optimize for size (-Os)"

2
components/freertos/Kconfig
View File

@ -282,7 +282,7 @@ menu "FreeRTOS"
config FREERTOS_TASK_FUNCTION_WRAPPER config FREERTOS_TASK_FUNCTION_WRAPPER
bool "Wrap task functions" bool "Wrap task functions"
depends on COMPILER_OPTIMIZATION_DEFAULT || ESP_COREDUMP_ENABLE || ESP_GDBSTUB_ENABLED depends on COMPILER_OPTIMIZATION_DEBUG || ESP_COREDUMP_ENABLE || ESP_GDBSTUB_ENABLED
default y default y
help help
If enabled, all FreeRTOS task functions will be enclosed in a wrapper function. If a task function If enabled, all FreeRTOS task functions will be enclosed in a wrapper function. If a task function

4
components/hal/linker.lf
View File

@ -36,7 +36,7 @@ entries:
lcd_hal: lcd_hal_cal_pclk_freq (noflash) lcd_hal: lcd_hal_cal_pclk_freq (noflash)
if ADC_ONESHOT_CTRL_FUNC_IN_IRAM = y: if ADC_ONESHOT_CTRL_FUNC_IN_IRAM = y:
adc_oneshot_hal (noflash) adc_oneshot_hal (noflash)
if COMPILER_OPTIMIZATION_DEFAULT = y: if COMPILER_OPTIMIZATION_DEBUG = y:
adc_hal_common: get_controller (noflash) adc_hal_common: get_controller (noflash)
adc_hal_common: adc_hal_set_controller (noflash) adc_hal_common: adc_hal_set_controller (noflash)
if SOC_ADC_ARBITER_SUPPORTED = y: if SOC_ADC_ARBITER_SUPPORTED = y:
@ -47,7 +47,7 @@ entries:
if ADC_CONTINUOUS_ISR_IRAM_SAFE = y: if ADC_CONTINUOUS_ISR_IRAM_SAFE = y:
adc_hal: adc_hal_get_reading_result (noflash) adc_hal: adc_hal_get_reading_result (noflash)
adc_hal: adc_hal_digi_start (noflash) adc_hal: adc_hal_digi_start (noflash)
if COMPILER_OPTIMIZATION_DEFAULT = y: if COMPILER_OPTIMIZATION_DEBUG = y:
adc_hal: adc_hal_digi_dma_link_descriptors (noflash) adc_hal: adc_hal_digi_dma_link_descriptors (noflash)
adc_hal: adc_hal_digi_stop (noflash) adc_hal: adc_hal_digi_stop (noflash)
if IDF_TARGET_ESP32 = y || IDF_TARGET_ESP32S2 = y: if IDF_TARGET_ESP32 = y || IDF_TARGET_ESP32S2 = y:

5
sdkconfig.rename
View File

@ -3,9 +3,10 @@
# Compiler options # Compiler options
CONFIG_OPTIMIZATION_COMPILER CONFIG_COMPILER_OPTIMIZATION CONFIG_OPTIMIZATION_COMPILER CONFIG_COMPILER_OPTIMIZATION
CONFIG_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEFAULT CONFIG_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEBUG
CONFIG_OPTIMIZATION_LEVEL_RELEASE CONFIG_COMPILER_OPTIMIZATION_SIZE CONFIG_OPTIMIZATION_LEVEL_RELEASE CONFIG_COMPILER_OPTIMIZATION_SIZE
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEFAULT CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEBUG
CONFIG_COMPILER_OPTIMIZATION_DEFAULT CONFIG_COMPILER_OPTIMIZATION_DEBUG
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE CONFIG_COMPILER_OPTIMIZATION_SIZE CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE CONFIG_COMPILER_OPTIMIZATION_SIZE
CONFIG_OPTIMIZATION_ASSERTION_LEVEL CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL CONFIG_OPTIMIZATION_ASSERTION_LEVEL CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE

4
tools/ci/build_template_app.sh
View File

@ -27,8 +27,8 @@ gen_configs() {
echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> esp-idf-template/sdkconfig.ci.O2 echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> esp-idf-template/sdkconfig.ci.O2
# This part will be built in earlier stage (pre_build job) with only cmake. Built with make in later stage # This part will be built in earlier stage (pre_build job) with only cmake. Built with make in later stage
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT with flag -Og # CONFIG_COMPILER_OPTIMIZATION_DEBUG with flag -Og
echo "CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y" > esp-idf-template/sdkconfig.ci2.Og echo "CONFIG_COMPILER_OPTIMIZATION_DEBUG=y" > esp-idf-template/sdkconfig.ci2.Og
echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y" >> esp-idf-template/sdkconfig.ci2.Og echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y" >> esp-idf-template/sdkconfig.ci2.Og
# -Og makes the bootloader too large to fit in the default space, otherwise(!) # -Og makes the bootloader too large to fit in the default space, otherwise(!)
echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> esp-idf-template/sdkconfig.ci2.Og echo "CONFIG_PARTITION_TABLE_OFFSET=0x10000" >> esp-idf-template/sdkconfig.ci2.Og

2
tools/ldgen/samples/sdkconfig
View File

@ -71,7 +71,7 @@ CONFIG_PARTITION_TABLE_MD5=y
# #
# Compiler options # Compiler options
# #
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y CONFIG_COMPILER_OPTIMIZATION_DEBUG=y
CONFIG_COMPILER_OPTIMIZATION_SIZE= CONFIG_COMPILER_OPTIMIZATION_SIZE=
CONFIG_COMPILER_OPTIMIZATION_NONE= CONFIG_COMPILER_OPTIMIZATION_NONE=
CONFIG_COMPILER_OPTIMIZATION_PERF= CONFIG_COMPILER_OPTIMIZATION_PERF=