Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ESP32: move generated sdkconfig to build folder 

Ensures it gets cleaned with `./waf clean`. Users will hopefully delete
and not be confused by the old one as it will now show up as an
untracked file.
This commit is contained in:
Thomas Watson 2024-12-07 17:20:57 -06:00 committed by Andrew Tridgell
parent 1b51d6ace3
commit 535f6875a8
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -171,7 +171,3 @@ ENV/
env.bak/ env.bak/
venv.bak/ venv.bak/
autotest_result_*_junit.xml autotest_result_*_junit.xml
# Ignore ESP-IDF SDK defines
/libraries/AP_HAL_ESP32/targets/esp32/esp-idf/sdkconfig
/libraries/AP_HAL_ESP32/targets/esp32s3/esp-idf/sdkconfig

2
libraries/AP_HAL_ESP32/README.md
View File

@ -86,7 +86,7 @@ press [tab] then enter on the [exit] box to exit the app
done. the 'sdkconfig' file in this folder should have been updated done. the 'sdkconfig' file in this folder should have been updated
cd ../../../.. cd ../../../..
If you want to make changes to sdkconfig (sdkconfig is in git ignore list) permanent and to commit them back in git, you should edit sdkconfig.defaults manually or to use ninja save-defconfig tool after menuconfig. If you want to make changes to sdkconfig (sdkconfig is in the build dir) permanent and to commit them back in git, you should edit sdkconfig.defaults manually or use ninja save-defconfig tool after menuconfig and replace sdkconfig.defaults with defconfig.
5. Recommanded way to flash the firmware : 5. Recommanded way to flash the firmware :
``` ```

2
libraries/AP_HAL_ESP32/targets/esp32/.gitignore vendored
View File

@ -1,2 +0,0 @@
/sdkconfig.old
/board.txt

5
libraries/AP_HAL_ESP32/targets/esp32/esp-idf/CMakeLists.txt
View File

@ -28,8 +28,9 @@ idf_build_process(esp32
esp_system esp_system
esp_rom esp_rom
esp_timer esp_timer
SDKCONFIG ${CMAKE_CURRENT_LIST_DIR}/sdkconfig # treat sdkconfig as build product generated by the defaults
SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig
SDKCONFIG_DEFAULTS ${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults SDKCONFIG_DEFAULTS ${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults
BUILD_DIR ${CMAKE_BINARY_DIR}) BUILD_DIR ${CMAKE_BINARY_DIR})

2
libraries/AP_HAL_ESP32/targets/esp32s3/.gitignore vendored
View File

@ -1,2 +0,0 @@
/sdkconfig.old
/board.txt

3
libraries/AP_HAL_ESP32/targets/esp32s3/esp-idf/CMakeLists.txt
View File

@ -29,7 +29,8 @@ idf_build_process(esp32s3
esp_rom esp_rom
esp_timer esp_timer
SDKCONFIG ${CMAKE_CURRENT_LIST_DIR}/sdkconfig # treat sdkconfig as build product generated by the defaults
SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig
SDKCONFIG_DEFAULTS ${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults SDKCONFIG_DEFAULTS ${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults
BUILD_DIR ${CMAKE_BINARY_DIR} BUILD_DIR ${CMAKE_BINARY_DIR}
) )