Merge branch 'master' into feature/esp32s2beta_update

2019-08-08 14:00:45 +10:00
parent 24d26fccde 51d811a71c
commit 04ae56806c
657 changed files with 6814 additions and 7534 deletions
--- a/components/bootloader_support/src/bootloader_clock.c
+++ b/components/bootloader_support/src/bootloader_clock.c
@@ -18,7 +18,7 @@
 #include "soc/dport_reg.h"
 #include "soc/efuse_periph.h"

-void bootloader_clock_configure()
+void bootloader_clock_configure(void)
 {
    // ROM bootloader may have put a lot of text into UART0 FIFO.
    // Wait for it to be printed.