Merge pull request micropython#8686 from tannewt/idf5.1.2

dhalbert · web-flow · commit 1f5e69243e6f · 2023-12-02T23:20:28.000-05:00
Update to ESP IDF v5.1.2
diff --git a/.gitmodules b/.gitmodules
@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.1
+	branch = circuitpython-v5.1.2
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/espressif/esp-protocols.git
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit fb07ab7f0007549d38081cfc6d83348780526a28
+Subproject commit 60ff95f5bf8a8bfd676dcfb9204fa82263bf3d60
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -37,7 +37,7 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384
 
 #
 # Wi-Fi
-
+#
 # CONFIG_ESP_WIFI_NVS_ENABLED is not set
 # end of Wi-Fi
 
@@ -99,6 +99,7 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 # CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set
 # CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set
 # CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set
+# CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM is not set
 # end of mbedTLS
 
 #

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384`
`37`	`37`
`38`	`38`	`#`
`39`	`39`	`# Wi-Fi`
`40`		`-`
	`40`	`+#`
`41`	`41`	`# CONFIG_ESP_WIFI_NVS_ENABLED is not set`
`42`	`42`	`# end of Wi-Fi`
`43`	`43`
`@@ -99,6 +99,7 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y`
`99`	`99`	`# CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED is not set`
`100`	`100`	`# CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED is not set`
`101`	`101`	`# CONFIG_MBEDTLS_ECP_NIST_OPTIM is not set`
	`102`	`+# CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM is not set`
`102`	`103`	`# end of mbedTLS`
`103`	`104`
`104`	`105`	`#`