cmake: Post-merge fixups

components/esptool_py/flasher_args.json.in

@@ -15,6 +15,6 @@
                           "file" : "partition_table/partition-table.bin" },
     "otadata" : { "offset" : "${OTADATA_PARTITION_OFFSET}",
                   "file" : "${BLANK_OTADATA_FILE}" },
-    "app" :             { "offset" : "${APP_PARTITION.py_OFFSET}",
+    "app" :             { "offset" : "${APP_PARTITION_OFFSET}",
                           "file" : "${PROJECT_NAME}.bin" }
 }

docs/conf_common.py

@@ -53,14 +53,16 @@ kconfig_inc_path = '{}/inc/kconfig.inc'.format(builddir)
 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()
-call_with_python(" ".join(
+confgen_args = [sys.executable,
                 "../../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'))
+                "--output", "docs", kconfig_inc_path + '.in'
+]
+subprocess.check_call(confgen_args)
 copy_if_modified(kconfig_inc_path + '.in', kconfig_inc_path)
 
 # Generate 'esp_err_defs.inc' file with ESP_ERR_ error code definitions

examples/get-started/hello_world/partitions.csv

@@ -1,5 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     ,        0x6000,
-phy_init, data, phy,     ,        0x1000,
-factory,  app,  factory, ,        1M,