Merge branch 'master' into feature/cmake

diff --cc .gitlab-ci.yml
index 9532a662f34820b1b5dd8026500aaac6d89b6a67,8fef09d06da7bc898e07f13e72520c99dd35fc14..0f735b1f5a31bfe6f18b6db1e75fa08b8092d7d8
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -578,22 -546,8 +573,22 @@@ check_permissions
    script:
      - tools/ci/check-executable.sh
  
 +check_examples_cmake_make:
 +  stage: deploy
 +  image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
 +  tags:
 +    - build
 +  except:
 +    - master
 +    - /^release\/v/
 +    - /^v\d+\.\d+(\.\d+)?($|-)/
 +  dependencies: []
 +  before_script: *do_nothing_before
 +  script:
 +    - tools/ci/check_examples_cmake_make.sh
 +
  check_submodule_sync:
-   stage: deploy
+   stage: check
    image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
    tags:
      - build

diff --cc components/app_update/esp_ota_ops.c
Simple merge

diff --cc components/bootloader/subproject/main/esp32.bootloader.ld
index d44295115e7b8d9b71e2f37375a1a29b7cd2c685,384488125be5dfe762cd879b99ff0ae945022141..1a182acb5e760ec9bc346070274dc694b18f97c1
--- 1/components/bootloader/subproject/main/esp32.bootloader.ld
--- 2/components/bootloader/subproject/main/esp32.bootloader.ld
+++ b/components/bootloader/subproject/main/esp32.bootloader.ld
@@@ -41,18 -41,19 +41,19 @@@ SECTION
       *(.iram1 .iram1.*) /* catch stray IRAM_ATTR */
      *liblog.a:(.literal .text .literal.* .text.*)
      *libgcc.a:(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:bootloader_common.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:bootloader_flash.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:bootloader_random.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:bootloader_utility.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:bootloader_sha.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:efuse.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:esp_image_format.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:flash_encrypt.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:flash_partitions.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:secure_boot.o(.literal .text .literal.* .text.*)
 -    *libbootloader_support.a:secure_boot_signatures.o(.literal .text .literal.* .text.*)
 -    *libmicro-ecc.a:*.o(.literal .text .literal.* .text.*)
 -    *libspi_flash.a:*.o(.literal .text .literal.* .text.*)
++    *libbootloader_support.a:bootloader_common.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:bootloader_flash.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:bootloader_random.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:bootloader_utility.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:bootloader_sha.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:efuse.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:esp_image_format.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:flash_encrypt.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:flash_partitions.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:secure_boot.*(.literal .text .literal.* .text.*)
 +    *libbootloader_support.a:secure_boot_signatures.*(.literal .text .literal.* .text.*)
 +    *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*)
 +    *libspi_flash.a:*.*(.literal .text .literal.* .text.*)
      *(.fini.literal)
      *(.fini)
      *(.gnu.version)

diff --cc components/bootloader_support/include/esp_flash_encrypt.h
Simple merge

diff --cc components/esp32/phy_init_data.h
Simple merge

diff --cc docs/conf_common.py
index 86073c6cfa647d4626fabbb7c8443c948bf42a79,4ac06b7f78c0c4599502ce9b7188c8e190fd7bba..25f048adf2146744925e000ca4b987f213dee630
--- 1/docs/conf_common.py
--- 2/docs/conf_common.py
+++ b/docs/conf_common.py
@@@ -40,25 -45,12 +45,22 @@@ if os.system("doxygen ../Doxyfile") != 
  copy_if_modified('xml/', 'xml_in/')
  
  # Generate 'api_name.inc' files using the XML files by Doxygen
- if os.system('python ../gen-dxd.py') != 0:
-     raise RuntimeError('gen-dxd.py failed')
+ call_with_python('../gen-dxd.py')
  
  # Generate 'kconfig.inc' file from components' Kconfig files
 +print("Generating kconfig.inc from kconfig contents")
  kconfig_inc_path = '{}/inc/kconfig.inc'.format(builddir)
 -call_with_python('../gen-kconfig-doc.py > ' + kconfig_inc_path + '.in')
 -
 +temp_sdkconfig_path = '{}/sdkconfig.tmp'.format(builddir)
 +kconfigs = subprocess.check_output(["find", "../../components", "-name", "Kconfig"]).decode()
 +kconfig_projbuilds = subprocess.check_output(["find", "../../components", "-name", "Kconfig.projbuild"]).decode()
- confgen_args = ["python",
++call_with_python(" ".join(
 +                "../../tools/kconfig_new/confgen.py",
 +                "--kconfig", "../../Kconfig",
 +                "--config", temp_sdkconfig_path,
 +                "--create-config-if-missing",
 +                "--env", "COMPONENT_KCONFIGS={}".format(kconfigs),
 +                "--env", "COMPONENT_KCONFIGS_PROJBUILD={}".format(kconfig_projbuilds),
-                 "--output", "docs", kconfig_inc_path + '.in'
- ]
- subprocess.check_call(confgen_args)
++                "--output", "docs", kconfig_inc_path + '.in'))
  copy_if_modified(kconfig_inc_path + '.in', kconfig_inc_path)
  
  # Generate 'esp_err_defs.inc' file with ESP_ERR_ error code definitions

diff --cc docs/en/api-guides/index.rst
Simple merge

diff --cc docs/zh_CN/api-guides/index.rst
Simple merge

diff --cc examples/wifi/getting_started/softAP/CMakeLists.txt
index 57158b16b847d63cf60eadd5cb6021257a7ee074,0000000000000000000000000000000000000000..57158b16b847d63cf60eadd5cb6021257a7ee074
mode 100644,000000..100644
--- 1/examples/wifi/simple_wifi/CMakeLists.txt
--- /dev/null
+++ b/examples/wifi/getting_started/softAP/CMakeLists.txt

diff --cc tools/ci/executable-list.txt
index 3579a6e9dc5dfcede280826c1b2bbf561071ca9e,0ad9b5e6a9f11c5495b975a6807cf89bfc8821e4..e240013c05b59677a833a5cac0372ebfd20d1270
--- 1/tools/ci/executable-list.txt
--- 2/tools/ci/executable-list.txt
+++ b/tools/ci/executable-list.txt
@@@ -37,27 -31,15 +37,29 @@@ tools/idf.p
  tools/idf_monitor.py
  tools/idf_size.py
  tools/kconfig/check.sh
 +tools/kconfig/conf
  tools/kconfig/lxdialog/check-lxdialog.sh
 +tools/kconfig/mconf
  tools/kconfig/merge_config.sh
  tools/kconfig/streamline_config.pl
 -tools/kconfig/conf
 -tools/kconfig/mconf
 -tools/windows/eclipse_make.sh
 -tools/test_idf_monitor/run_test_idf_monitor.py
 +tools/kconfig_new/confgen.py
 +tools/kconfig_new/confserver.py
 +tools/kconfig_new/test/test_confserver.py
  tools/mass_mfg/mfg_gen.py
 +tools/test_idf_monitor/run_test_idf_monitor.py
  tools/unit-test-app/unit_test.py
 +tools/windows/eclipse_make.sh
 +tools/ci/build_examples_cmake.sh
 +tools/ci/test_build_system_cmake.sh
 +tools/ci/check_examples_cmake_make.sh
 +tools/cmake/convert_to_cmake.py
 +tools/cmake/run_cmake_lint.sh
 +tools/idf.py
 +tools/kconfig_new/confgen.py
 +tools/kconfig_new/confserver.py
 +tools/kconfig_new/test/test_confserver.py
 +tools/windows/tool_setup/build_installer.sh
  tools/test_idf_size/test.sh
+ tools/check_python_dependencies.py
+ docs/gen-dxd.py
 +

diff --cc tools/idf_monitor.py
Simple merge

diff --cc tools/kconfig/Makefile
index c8f8ba01416a7cd928af84bb02bb5d7e162975db,68029f257d4a7bc2515c63c26f725fdab78f4b88..cd00640430c2603bfb556e27b082de284123e9da
--- 1/tools/kconfig/Makefile
--- 2/tools/kconfig/Makefile
+++ b/tools/kconfig/Makefile
@@@ -165,23 -161,14 +165,23 @@@ check-lxdialog  := $(SRCDIR)/lxdialog/c
  # Use recursively expanded variables so we do not call gcc unless
  # we really need to do so. (Do not call gcc as part of make mrproper)
  CFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-                     -DLOCALE -MD
+                     -DLOCALE -MMD
  
 +%.o: $(SRCDIR)/%.c
 +      $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 +
 +lxdialog/%.o: $(SRCDIR)/lxdialog/%.c
 +      $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 +
 +%.o: %.c
 +      $(CC) -I $(SRCDIR) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 +
  # ===========================================================================
  # Shared Makefile for the various kconfig executables:
 -# conf:         Used for defconfig, oldconfig and related targets
 +# conf-idf:     Used for defconfig, oldconfig and related targets
  # nconf:  Used for the nconfig target.
  #         Utilizes ncurses
 -# mconf:  Used for the menuconfig target
 +# mconf-idf:  Used for the menuconfig target
  #         Utilizes the lxdialog package
  # qconf:  Used for the xconfig target
  #         Based on Qt which needs to be installed to compile it