Angus Gratton
7ce75a42c7
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-25 15:13:52 +11:00
Angus Gratton
5bec9fb010
Merge branch 'bugfix/random_en_dis_for_app' into 'master'
...
bootloader_support: Fix using shared CLK_EN and RST_EN regs for random
See merge request espressif/esp-idf!6198
2019-10-23 13:18:01 +08:00
Angus Gratton
496ede9bcd
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-15 14:59:27 +11:00
Mahavir Jain
99659091fb
bootloader_support: fix logging prints around chip revision
2019-10-11 14:35:22 +05:30
KonstantinKondrashov
807826f796
bootloader_support: Fix using shared CLK_EN and RST_EN regs for random
...
bootloader_random_enable() and bootloader_random_disable() functions
can be used in app.
This MR added the protection for shared CLK_EN and RST_EN registers.
2019-10-07 06:47:00 +00:00
Ivan Grokhotkov
6bddcdac67
bootloader: move esp32 specific code from bootloader_common
...
Also implements bootloader_clock_get_rated_freq_mhz for esp32s2beta.
Closes IDF-758
2019-10-03 09:38:13 +02:00
Ivan Grokhotkov
5830f529d8
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-02 19:01:39 +02:00
suda-morris
cbab3c34f8
bootloader: shrink bin size
...
1. write a bootloader version of "getting chip revision" function.
2. reduce wordy log.
2019-09-27 10:58:30 +08:00
KonstantinKondrashov
6f102125b4
bootloader: Add support esp32s2beta
2019-09-20 16:57:33 +10:00
Angus Gratton
adfc06a530
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-20 10:28:37 +10:00
Angus Gratton
83680bd96b
Merge branch 'feature/esp32s2beta' into feature/esp32s2beta_merge
2019-09-19 21:08:20 +10:00
Jiang Jiang Jian
d78831ab2b
Merge branch 'bugfix/remove_v40_deprecations' into 'master'
...
Remove features deprecated before ESP-IDF V4.0
Closes IDF-507
See merge request espressif/esp-idf!5841
2019-09-19 16:07:01 +08:00
suda-morris
dd248ffc32
Add chip revision into image header
...
Check chip id and chip revision before boot app image
Closes https://github.com/espressif/esp-idf/issues/4000
2019-09-16 18:13:53 +08:00
Angus Gratton
438d513a95
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-16 16:18:48 +10:00
Angus Gratton
62c06047da
bootloader_support: Remove deprecated partition load/verify functions
...
Deprecated since v3.2
2019-09-13 09:44:07 +10:00
KonstantinKondrashov
d3637cd06b
rtc_wdt: re-enable RTC_WDT
2019-09-13 00:03:52 +08:00
Angus Gratton
b547aef2a0
flash encryption: Ensure flash encryption can't be disabled if Secure Boot is on
2019-09-10 11:28:11 +10:00
Angus Gratton
35147119f1
Merge branch 'feature/support_ut_esp32s2beta' into 'feature/esp32s2beta'
...
ci: support build and run UT for esp32s2beta
See merge request espressif/esp-idf!5702
2019-09-09 08:34:16 +08:00
Li Shuai
bd29202520
1. Fix backtrace is incomplete
...
2. Optimization code style
2019-09-05 18:40:33 +08:00
Michael (XIAO Xufeng)
76a3a5fb48
ci: disable unavailable tests for esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
55859f59cb
support for esp32s2beta
2019-09-04 10:53:25 +10:00
Michael (XIAO Xufeng)
9baa7826be
fix unit test and examples for s2beta
2019-09-04 10:53:25 +10:00
Angus Gratton
abd6d40796
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
...
and all ECDSA to be disabled if secure boot is not enabled
Previously if ECDSA disabled in config then secure_boot_signatures.c would
fail to build (whether or not secure boot was enabled).
To avoid breaking apps that might be using the signature scheme with custom OTA
without enabling secure boot signatures in config, this change just disables
this functionality if unavailable in mbedTLS config.
Possible fix for root cause of https://github.com/espressif/esp-idf/pull/3703
2019-08-30 14:56:11 +10:00
Angus Gratton
06898325e6
Merge branch 'bugfix/bootloader_efuse_build_regression' into 'master'
...
bootloader: add definition of esp_clk_apb_freq
Closes IDFGH-1734
See merge request espressif/esp-idf!5913
2019-08-29 08:35:48 +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
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
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
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
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
Angus Gratton
6990a7cd54
Merge branch 'master' into feature/esp32s2beta_update
2019-08-19 15:03:43 +10:00
Angus Gratton
18c5cfadae
Fix function prototypes
2019-08-13 17:14:16 +10:00
Angus Gratton
eb7ad6ca17
bootloader: Fix SPI dummy clock settings for ESP32S2-beta
2019-08-13 17:14:16 +10:00
Angus Gratton
d5f5fadbee
bootloader: Include FreeRTOS component for the FREERTOS_UNICORE header, only
2019-08-13 17:14:16 +10:00
Angus Gratton
309376f51a
spi_flash: Force legacy mode for ESP32-S2
...
Can be removed once IDF-763 is merged
2019-08-13 17:14:16 +10:00
Angus Gratton
8f74271d5d
esp_rom: Fail immediately if the wrong SoC's header file is included
2019-08-12 16:57:40 +10:00
Angus Gratton
2f56116db2
Cleanup of previous merge commit
2019-08-12 16:57:40 +10:00
Michael (XIAO Xufeng)
264ffbeb14
timer_group: use the LL
2019-08-09 13:46:31 +08:00
Angus Gratton
04ae56806c
Merge branch 'master' into feature/esp32s2beta_update
2019-08-08 15:26:58 +10:00
Angus Gratton
24d26fccde
Merge branch 'master' into feature/esp32s2beta_update
2019-08-08 13:44:24 +10:00
fuzhibo
572084821b
add Comment for touchpad
2019-08-07 11:39:17 +08:00
fuzhibo
b055bff580
1.update touch driver; 2.update adc/dac driver; 3.add temp sensor driver;
2019-08-05 16:21:18 +08:00
Michael Zimmermann
74a459dd3d
make code conform to Wstrict-prototypes
...
Merges https://github.com/espressif/esp-idf/pull/2937
2019-08-01 16:28:56 +07:00
Anton Maklakov
afbaf74007
tools: Mass fixing of empty prototypes (for -Wstrict-prototypes)
2019-08-01 16:28:56 +07:00
chenjianqiang
d77c74770a
bugfix(flash): add flash config in app startup
...
We fixed some flash bugs in bootloader, but for the users used the old
vrsion bootloader, they can not fix these bugs via OTA, the solution is
add these updates in app startup.
These updates include:
1. SPI flash gpio matrix and drive strength configuration
2. SPI flash clock configuration
3. SPI flash read dummy configuration
4. SPI flash cs timing configuration
5. Update flash id of g_rom_flashchip
2019-07-18 14:40:59 +08:00
Angus Gratton
409181361f
Merge branch 'bugfix/fix_flash_read_error_in_dio_26MHz_mode' into 'master'
...
bugfix(flash): fix flash read error in DIO/26MHz mode
See merge request espressif/esp-idf!5381
2019-07-10 08:13:35 +08:00
chenjianqiang
266baa8839
bugfix(flash): fix flash read error in DIO/26MHz mode
2019-07-08 01:50:07 +00:00
Michael (XIAO Xufeng)
25ab8380c8
ci: support to build esp32s2beta simple examples
2019-07-08 09:16:06 +08:00
chenjianqiang
d6c40c7c1d
bugfix(flash): improve spi cs timing settings for flash
...
cs setup time is recomemded to be 1.5T, and cs hold time is recommended to be 2.5T.
(cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1)
2019-07-05 21:21:17 +08:00