Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9889 commits 10 branches 75 tags 114 MiB
Commit graph

32 commits

Author SHA1 Message Date
Michael Balzer
0137aef471 Merge branch 'release/v3.3' of https://github.com/espressif/esp-idf.git into release/v3.3 
# Conflicts:
#	components/bt/include/esp_bt.h
 2020-07-15 12:08:17 +02:00
Roland Dobai
26c6583bab Kconfig: Load properly auto.conf before writing the results to build/include 
Partial revertion of 6cd6423092. The split
directory structure is still removed but auto.conf is properly loaded.
 2019-10-10 15:41:14 +02:00
Angus Gratton
6cd6423092 kconfig: Don't create "split" directory structures under build/include/config 
Reported in https://github.com/espressif/esp-idf/issues/3299

If a config item contains a reserved filename in Windows like _CON_ then an invalid
directory is created.

We don't rely on this feature all, so disable it.
 2019-09-10 05:52:29 +00:00
Angus Gratton
a3adc6c202 kconfig: Add -MP option so .d files include empty targets 
Prevents make-level errors when switching IDF versions, as headers may be removed.

Similar to some mentioned here:
https://github.com/espressif/esp-idf/issues/712
 2019-08-21 18:37:42 +10:00
Michael Balzer
e97f72ea24 Merge remote-tracking branch 'upstream/release/v3.3' 
# Conflicts:
#	.gitlab-ci.yml
#	components/bootloader/project_include.cmake
#	components/bootloader_support/include/bootloader_common.h
#	components/bootloader_support/src/bootloader_common.c
#	components/bt/Kconfig
#	components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
#	components/bt/bluedroid/stack/btm/btm_ble_gap.c
#	components/bt/bluedroid/stack/btm/btm_devctl.c
#	components/bt/bluedroid/stack/include/stack/hcidefs.h
#	components/bt/bluedroid/stack/smp/smp_act.c
#	components/bt/bt.c
#	components/bt/lib
#	components/driver/Kconfig
#	components/driver/include/driver/rmt.h
#	components/driver/test/test_spi_master.c
#	components/driver/uart.c
#	components/esp32/CMakeLists.txt
#	components/esp32/Kconfig
#	components/esp32/ld/esp32.project.ld.in
#	components/esp32/ld/esp32.spiram.rom-functions-dram.ld
#	components/esp32/ld/esp32.spiram.rom-functions-iram.ld
#	components/esp32/lib
#	components/esp32/spiram.c
#	components/esp32/spiram_psram.c
#	components/esp32/test/test_wifi.c
#	components/esp32/wifi_init.c
#	components/esp_http_server/include/esp_http_server.h
#	components/esp_http_server/src/esp_httpd_priv.h
#	components/esp_http_server/src/httpd_parse.c
#	components/esp_http_server/src/httpd_sess.c
#	components/esp_http_server/src/httpd_txrx.c
#	components/esp_http_server/src/httpd_uri.c
#	components/esp_http_server/test/test_http_server.c
#	components/esp_https_ota/src/esp_https_ota.c
#	components/ethernet/emac_main.c
#	components/freemodbus/Kconfig
#	components/idf_test/include/idf_performance.h
#	components/idf_test/integration_test/TC_IT_BLUEDROID_SMP.yml
#	components/lwip/Kconfig
#	components/newlib/test/test_time.c
#	components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
#	components/spi_flash/Kconfig
#	components/ulp/cmake/CMakeLists.txt
#	components/ulp/component_ulp_common.cmake
#	components/vfs/vfs.c
#	docs/conf_common.py
#	docs/en/api-reference/provisioning/wifi_provisioning.rst
#	examples/mesh/internal_communication/main/Kconfig.projbuild
#	examples/protocols/aws_iot/subscribe_publish/main/CMakeLists.txt
#	examples/protocols/aws_iot/thing_shadow/main/CMakeLists.txt
#	examples/protocols/coap_client/README.md
#	examples/protocols/coap_server/README.md
#	examples/protocols/modbus_slave/main/Kconfig.projbuild
#	examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
#	examples/protocols/mqtt/tcp/main/Kconfig.projbuild
#	examples/protocols/mqtt/ws/mqtt_ws_example_test.py
#	examples/protocols/mqtt/wss/mqtt_wss_example_test.py
#	examples/wifi/iperf/components/iperf/iperf.c
#	requirements.txt
#	tools/ci/build_examples.sh
#	tools/ci/test_build_system_cmake.sh
#	tools/cmake/idf_functions.cmake
#	tools/cmake/kconfig.cmake
#	tools/cmake/scripts/expand_requirements.cmake
#	tools/esp_prov/README.md
#	tools/esp_prov/esp_prov.py
#	tools/esp_prov/transport/ble_cli.py
#	tools/idf.py
#	tools/kconfig_new/confgen.py
#	tools/mass_mfg/docs/README.rst
#	tools/mass_mfg/samples/sample_config.csv
#	tools/tiny-test-fw/DUT.py
#	tools/tiny-test-fw/IDF/IDFApp.py
#	tools/tiny-test-fw/IDF/IDFDUT.py
#	tools/tiny-test-fw/TinyFW.py
#	tools/unit-test-app/tools/UnitTestParser.py
#	tools/unit-test-app/unit_test.py
 2019-07-20 22:11:10 +02:00
Michael Balzer
40f01ec30a Merge remote-tracking branch 'upstream/release/v3.2' 2019-07-20 15:22:14 +02:00
Ivan Grokhotkov
5dcdef0639 kconfig: fix compatibility with very old versions of flex 
See 4e762e4918

Closes https://github.com/espressif/esp-idf/issues/2703
 2019-02-28 20:38:31 +08:00
Ivan Grokhotkov
fed0f846a4 kconfig: fix compatibility with very old versions of flex 
See 4e762e4918

Closes https://github.com/espressif/esp-idf/issues/2703
 2019-02-14 11:17:48 +08:00
Roland Dobai
d1dd3ab0d3 tools: Recognize backslashes in Kconfigs with CR+LF line endings 2019-02-01 11:33:41 +01:00
Angus Gratton
7832db7bb3 gitignore: Add mconf-idf.exe and conf-idf.exe 
Problem since f6cd55d2ac

Closes https://github.com/espressif/esp-idf/issues/2751
 2019-01-04 10:09:35 +11:00
Angus Gratton
f7811671ae gitignore: Add mconf-idf.exe and conf-idf.exe 
Problem since f6cd55d2ac

Closes https://github.com/espressif/esp-idf/issues/2751
 2018-11-28 12:05:29 +11:00
Jakob Löw
f2fbfeca87 Merge branch 'master' of github.com:espressif/esp-idf 2018-10-20 23:32:01 +02:00
Angus Gratton
b355854d4d Merge branch 'master' into feature/cmake 2018-09-05 10:35:04 +08:00
Angus Gratton
ae4efeb3dc mconf: Don't include system headers in dependency files 
Fixes issue where build gets stuck because of .d files in the
tools/kconfig directory.

Closes https://github.com/espressif/esp-idf/issues/712
 2018-09-03 03:45:15 +00:00
Craig Leres
0c627b22f2 When building kconfig set -L and -I flags based on where libintl.a 
is found rather than keying off OS/OSNAME.
This unbreaks building on FreeBSD (but is untested for Windows).
 2018-07-28 09:19:41 -07:00
Angus Gratton
f6cd55d2ac config: Rename mconf to mconf-idf & conf to conf-idf 
These versions of conf/mconf are forked from the upstream, and the CMake system allows mconf-idf to
be installed externally on the path. So the best option is to rename.

Includes changes to Windows installer for v1.1
 2018-05-29 16:34:45 +10:00
Angus Gratton
61aff5162c mconf: Don't print a recommendation to use 'make' if CMake build system is in use 
Also add some cmake dependencies to rebuild mconf if its source files change.
 2018-05-29 16:34:45 +10:00
Angus Gratton
7eaf2f4bdb kconfig: Allow out of tree building, build under cmake build directory 2018-04-30 09:59:20 +10:00
krzychb
78aa1ec704 Resolves: Warning '-s option given but default rule can be matched'. Closes https://github.com/espressif/esp-idf/issues/1338 2017-12-11 22:53:39 +01:00
Angus Gratton
f41431022b windows: Allow "make menuconfig" to work if ming32 gcc is also installed 
Closes https://github.com/espressif/esp-idf/issues/1296
 2017-11-23 14:31:04 +11:00
Angus Gratton
a361a00405 build: make clean should remove all .d files in tools/kconfig 
Causes a problem that can't be fixed by "make clean" if the
host OS headers have moved around.

ie https://esp32.com/viewtopic.php?f=13&t=3098&p=14487
 2017-09-22 10:27:32 +10:00
Deomid Ryabkov
9903ea1c11 Add --warn-undefined-variables to MAKEFLAGS 
Fix warnings where undefined vars are used.

Make Kconfig emit "FOO=" for unset bool options
To ensure make variables are always defined, even if empty.

When writing auto.conf, include symbols disabled by dependency to make sure all make variables are always defined.

Fixes espressif/esp-idf#137

Cherry-picked from https://github.com/espressif/esp-idf/pull/138
 2017-09-05 16:10:46 +10:00
Angus Gratton
c0f155f6ff kconfig: Ignore Windows host-compiled executables 2017-02-22 11:59:37 +11:00
Angus Gratton
473f2cff51 kconfig: Remove gperf 3.1+ incompatible kconf_conf_id forward declaration 
Forward declaration was unused. gperf 3.1+ changed parameter type from
'unsigned int' to 'size_t'.
 2017-02-14 10:01:44 +11:00
Deomid Ryabkov
6380245d3d Create temp config in the same dir as target 
Fixes case where SDK and app are on different mounts
 2016-12-12 16:16:14 +00:00
Angus Gratton
341593f7d2 build system: Remove need for $(Q) macro in recipes, use --silent in MAKEFLAGS instead 2016-11-11 12:32:47 +11:00
Ivan Grokhotkov
b6dd8a55cd Fix build with macports/pkgconfig, silence format string warnings on OS X 
Extra space is needed in echo -n "-lncurses ", otherwise if pkg-config outputs a directory after that, it will result in "-lncurses-L/opt/local/lib" (without space).
-Wno-format-security flag is needed on macOS to silence warnings about printf(gettext("message")) constructs.
 2016-11-07 12:27:53 +08:00
Sandeep Mistry
e96d4a0a32 Allow OS X to build without libintl 2016-11-03 21:40:52 +08:00
Ivan Grokhotkov
f5f625ead5 kconfig: fix build on macOS 
macOS version of sed doesn't recognize \r as special character.
Replacing with \x0D substitution which works everywhere.
 2016-09-20 11:31:46 +08:00
Angus Gratton
cdd1b95b6e config system: Support Windows when CRLFs used for eol markers 
Includes a test in test_build_system.sh to prevent regressions w/
CRLFs in text files.

Fixes Github #10
 2016-09-16 18:07:58 +10:00
Angus Gratton
7c58c1e06b Build system: Allow components to add to the global CFLAGS via Makefile.projbuild 
Used by mbedTLS to set MBEDTLS_CONFIG_FILE in all components.

This change sets CFLAGS/etc at the project level and then exports those
variables for components, rather than setting them independently each time
a component Makefile is invoked.
 2016-09-09 11:08:19 +10:00
Ivan Grokhotkov
bd6ea4393c Initial public version 2016-08-17 23:08:22 +08:00