Per Malmberg
31cdd38744
Make sure ESP_PLATFORM is defined when processing CMake files.
2019-08-28 09:44:06 +08:00
Angus Gratton
61442cdcbb
Merge branch 'bugfix/tools_shebang' into 'master'
...
Tools: Fix shebang for MacOs
See merge request espressif/esp-idf!5906
2019-08-28 09:07:52 +08:00
Angus Gratton
a21ca2270a
Merge branch 'feature/deep_sleep_fast_wake' into 'master'
...
bootloader: Reduce the time spent in image validation when waking from deep sleep
See merge request espressif/esp-idf!5140
2019-08-28 08:54:28 +08:00
Jiang Jiang Jian
039f9d0a20
Merge branch 'bugfix/btdm_fix_ble_data_loss_and_send_same_pkt_twice' into 'master'
...
Component/bt: fix some BLE bugs
See merge request espressif/esp-idf!5896
2019-08-27 18:48:45 +08:00
Ivan Grokhotkov
fb72a6f629
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
2019-08-27 12:01:11 +02:00
Roland Dobai
474f6d9d98
Fix path in the Efuse table test
2019-08-27 11:58:45 +02:00
Renz Christian Bagaporo
c50a67567a
ldgen: fix build issue on make when build dir is a symlink
...
Fixes an issue where build fails if the build directory is a symlink.
The issue is caused by the rule target and the final executable dependency
not matching.
Closes https://github.com/espressif/esp-idf/issues/3626
2019-08-27 13:53:31 +08:00
Ivan Grokhotkov
5643f627cd
Merge branch 'feature/bat_scripts_to_ps1' into 'master'
...
Create Powershell versions of "install.bat" and "export.bat"
See merge request espressif/esp-idf!5816
2019-08-27 13:45:50 +08:00
Andrei Gramakov
79dd142ab8
tools: add install.ps1, export.ps1
...
Closes IDF-855
2019-08-27 13:45:50 +08:00
Roland Dobai
f2a4131c24
Tools: Fix shebang for MacOs
...
Revert a change introduced in d296aad2a9
for intended compatibility with BSD which breaks the build on MacOs:
"clang: error: unknown argument: '-n'" for "echo".
BSD users will have to use some workaround since MacOs is a supported
OS of IDF and BSD is not.
2019-08-26 13:53:52 +02:00
Ivan Grokhotkov
aa087667df
Merge branch 'bugfix/add_openocd_arm' into 'master'
...
Tools: Add OpenOCD for the ARM architecture
See merge request espressif/esp-idf!5878
2019-08-26 19:36:22 +08:00
Angus Gratton
8d8d4a57e1
Merge branch 'bugfix/reset_periph_modules' into 'master'
...
driver: Add a reset before enabling if a module is off
Closes IDF-188
See merge request espressif/esp-idf!4843
2019-08-26 16:38:23 +08:00
zhiweijian
f002d1c6aa
Component/bt: fix dome BLE bugs
...
- fix data loss and send same pkt twice sometimes
- fix adv data error in air sometimes
- fix adv start/stop crash sometimes
2019-08-26 14:17:46 +08:00
Jiang Jiang Jian
f68cd62abd
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size' into 'master'
...
bugfix/btdm_security_vulnerability_on_encryption_key_size
See merge request espressif/esp-idf!5868
2019-08-26 14:08:22 +08:00
Angus Gratton
7ef58dbeb0
Merge branch 'bugfix/confgen_msys_path' into 'master'
...
Fix sdkconfig.rename paths for confgen.py in MSYS
Closes IDFGH-1712
See merge request espressif/esp-idf!5864
2019-08-26 09:35:33 +08:00
He Yin Ling
954a23be37
test: fix nvs compatible case error:
...
nvs compatible test case uses new test env and app. update test config
file.
2019-08-25 20:35:49 +08:00
KonstantinKondrashov
30953ba9c4
app_update: Fix UTs for FACTORY_RESET and APP_TEST
2019-08-23 10:21:06 +00:00
KonstantinKondrashov
69f45c3674
bootloader: Factory reset not for deep sleep
...
Closes: https://github.com/espressif/esp-idf/issues/3800
Closes: IDFGH-1536
2019-08-23 10:21:06 +00:00
Jiang Jiang Jian
8db44f67d7
Merge branch 'bugfix/wps_workaround_for_Telstra_AP' into 'master'
...
wps: Relax the check on older config methods in case of WPS2.0
See merge request espressif/esp-idf!5781
2019-08-23 17:32:46 +08:00
Angus Gratton
99a58e5839
Merge branch 'doc/cbor_copyright' into 'master'
...
docs: Add TinyCBOR copyright line
See merge request espressif/esp-idf!5880
2019-08-23 15:49:10 +08:00
zhangyanjiao
ff96965a91
wifi: fix the bug for softAP set authmode
2019-08-23 14:37:08 +08:00
Mahavir Jain
141a287c8a
Merge branch 'bugfix/fix_code_snippet_in_http_server_docs' into 'master'
...
Fixed syntax error in esp_http_server.rst
See merge request espressif/esp-idf!5844
2019-08-23 14:26:03 +08:00
Mahavir Jain
8e7c71a1a0
Merge branch 'bugfix/cmake_src_exclude_issue' into 'master'
...
cmake: fix issue with handling of EXCLUDE_SRCS
See merge request espressif/esp-idf!5869
2019-08-23 14:21:16 +08:00
Angus Gratton
ba647b9710
Merge branch 'bugfix/flash_encryption_regressions' into 'master'
...
fix flash encryption regressions, add tests
Closes IDFGH-1538, IDFGH-1661, and IDF-770
See merge request espressif/esp-idf!5634
2019-08-23 12:37:55 +08:00
Ivan Grokhotkov
12c9d9a564
spi_flash: remove duplicate definition of spi_flash_unlock
...
The other (static) definition is in flash_ops.c, all references are
also in flash_ops.c.
2019-08-23 12:37:55 +08:00
Angus Gratton
2f557d1a59
Merge branch 'bugfix/openocd_ulp_install_instructions' into 'master'
...
docs: ulp: update for IDF Tools installation method
Closes IDF-825
See merge request espressif/esp-idf!5860
2019-08-23 09:38:47 +08:00
wangmengyang
76b6902e96
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:26:15 +08:00
Angus Gratton
e28b6e59b6
docs: Add TinyCBOR copyright line
2019-08-23 09:20:08 +10:00
Angus Gratton
f4d03fe965
Merge branch 'feature/add_tinycbor_library' into 'master'
...
add tinycbor library and example
See merge request espressif/esp-idf!5794
2019-08-23 07:14:19 +08:00
Roland Dobai
8bf1ef2bfe
Tools: Add OpenOCD for the ARM architecture
2019-08-22 16:51:04 +02:00
Ivan Grokhotkov
0d188c8917
Merge branch 'doc/update_ulp_install_translation' into 'bugfix/openocd_ulp_install_instructions'
...
update translation of ulp install instuctions
See merge request espressif/esp-idf!5862
2019-08-22 19:45:02 +08:00
Roland Dobai
8b8b2f12e4
Fix sdkconfig.rename paths for confgen.py in MSYS
...
Closes https://github.com/espressif/esp-idf/issues/3950
2019-08-22 11:48:19 +02:00
suda-morris
5a09de8245
cbor: add tinycbor library and example
2019-08-22 17:44:29 +08:00
Mahavir Jain
1248f17749
cmake: fix issue with handling of EXCLUDE_SRCS
2019-08-22 13:17:44 +05:30
Angus Gratton
f85ba3516f
Merge branch 'bugfix/fix_project_ver_issue' into 'master'
...
CMake: fix retrieving PROJECT_VER
See merge request espressif/esp-idf!5842
2019-08-22 10:47:06 +08:00
Renz Christian Bagaporo
72ddc940e0
cmake: hide internal targets
...
Use imported library, which does not create additional rules, but still
allows attaching arbitraty properties instead of custom targets. This
allows the targets to not appear in the target list of IDEs such as
CLion.
2019-08-22 09:39:24 +08:00
suda-morris
43b29e4f4d
doc: update translation of ulp install instuctions
2019-08-21 21:52:48 +08:00
Jiang Jiang Jian
0a30468945
Merge branch 'feature/wifi_use_new_event_api' into 'master'
...
esp_wifi/event: wifi use new event api
Closes WIFI-696
See merge request espressif/esp-idf!5454
2019-08-21 21:12:28 +08:00
Ivan Grokhotkov
5ba9be9c2e
docs: ulp: update for IDF Tools installation method
...
binutils-esp32ulp is installed automatically by install.sh/install.bat
or the IDF Tools Installer for Windows.
2019-08-21 14:45:33 +02:00
KonstantinKondrashov
c543aac91e
bootloader: API for the fast wakeup and custom using RTC mem
...
Added "Reserve RTC FAST memory for custom purposes" option.
Added a boot counter.
2019-08-21 11:44:37 +00:00
KonstantinKondrashov
abffc3b11d
docs: Add a description of the fast wakeup
2019-08-21 11:44:37 +00:00
KonstantinKondrashov
83db8d402b
examples: Add the fast wakeup option for deep sleep examples
...
The CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is enabled
by default for the following examples:
- system/deep_sleep,
- system/ulp,
- system/ulp_adc.
2019-08-21 11:44:37 +00:00
Tim Nordell
43393cf4d1
bootloader: Support for skipping validation upon wake from deep sleep
...
This saves time when waking up from deep sleep, but potentially decreases
the security of the system. If the application able to modify itself
(especially areas that are loaded into RAM) in flash while running
without crashing or is modifies the cached bits of information about
what was last booted from the bootloader, this could cause security
issues if the user does a "deep sleep reset" since the full validation
is skipped.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
82984f0539
bootloader: Do not obfuscate RAM if we are not doing image validation
...
No need to take this step if we are not doing image validation. The
obfuscation only buys us a tiny bit of "security" anyways since the
main parts of flash are memory mapped, too. This saves a little bit of
wake-up time when waking up from deep sleep when the
BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP option is set.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Tim Nordell
1e32fa2cf7
bootloader: Remove extraneous newlines from some debug statements
...
ESP_LOGD(...) provides its own new lines so remove these from these
debug strings.
Signed-off-by: Tim Nordell <tim.nordell@nimbelink.com>
2019-08-21 11:44:37 +00:00
Mahavir Jain
d9c02bc36c
Merge branch 'nimble/misc_menuconfig_options' into 'master'
...
NimBLE: Add misc menuconfig options
See merge request espressif/esp-idf!5843
2019-08-21 19:28:47 +08:00
Prasad Alatkar
393eb1700d
NimBLE: Add misc menuconfig options
...
- Add option to configure stack size of NimBLE host task, update NimBLE
submodule for the same.
- Change max concurrent connections supported to 9 inline with controller.
2019-08-21 19:28:47 +08:00
Jiang Jiang Jian
14608cc0fb
Merge branch 'Bugfix/nonblocking_udp_is_zero' into 'master'
...
fix bug for nonblocking udp is zero
Closes WIFI-756
See merge request espressif/esp-idf!5792
2019-08-21 16:44:11 +08:00
Angus Gratton
3aef62527a
Merge branch 'update/cjson_v1_7_12' into 'master'
...
Update cJSON to v1.7.12
See merge request espressif/esp-idf!5776
2019-08-21 16:40:35 +08:00
Angus Gratton
fe376f9f04
Merge branch 'bugfix_kconfig_deps_missing' into 'master'
...
kconfig: Add -MP option so .d files include empty targets
See merge request espressif/esp-idf!5820
2019-08-21 16:19:59 +08:00