Merge branch 'bugfix/xtal_freq_40' into 'master'

esp32: by default, set 40MHz crystal frequency

See merge request !1140

diff --combined components/esp32/Kconfig
index d7c2970242bb021d68bfd14c3175b597d71ce06c,75bf7da6376c67a7ced51bcdb93c8ff884beaa67..ca3a65939434b49f1e434ccff0d90ccde6c94c86
--- 1/components/esp32/Kconfig
--- 2/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@@ -562,7 -562,7 +562,7 @@@ config ESP32_DEEP_SLEEP_WAKEUP_DELA
  
  choice ESP32_XTAL_FREQ_SEL
      prompt "Main XTAL frequency"
-     default ESP32_XTAL_FREQ_AUTO
+     default ESP32_XTAL_FREQ_40
      help
          ESP32 currently supports the following XTAL frequencies:
  
@@@ -722,9 -722,7 +722,9 @@@ config ESP32_WIFI_NVS_ENABLE
      help
          Select this option to enable WiFi NVS flash
  
 -menu PHY
 +endmenu
 +
 +menu Phy
        
  config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
      bool "Do phy calibration and store calibration data in NVS"
@@@ -765,3 -763,4 +765,3 @@@ config ESP32_PHY_MAX_TX_POWE
        default ESP32_PHY_MAX_WIFI_TX_POWER
  
  endmenu
 -endmenu