Update the idf to a newer 4.3 commit

tannewt · tannewt · commit ca989c4357ba · 2021-08-27T10:49:57.000-07:00
Also, make all port-level CIRCUITPY_ settings overridable.
diff --git a/.gitmodules b/.gitmodules
@@ -152,8 +152,8 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/esp32s2/esp-idf"]
 	path = ports/esp32s2/esp-idf
-	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v4.3
+	url = https://github.com/espressif/esp-idf.git
+	branch = release/v4.3
 [submodule "ports/esp32s2/certificates/nina-fw"]
 	path = ports/esp32s2/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
diff --git a/lib/libc/string0.c b/lib/libc/string0.c
@@ -27,7 +27,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#ifndef likely
 #define likely(x) __builtin_expect((x), 1)
+#endif
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf
@@ -1 +1 @@
-Subproject commit d97b6863badec4643bf8d1d1058a65d723572882
+Subproject commit 48ae2309fd9cea600ff960b61a029892be1fdc1b
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
@@ -10,31 +10,31 @@ INTERNAL_LIBM = 1
 LONGINT_IMPL = MPZ
 
 # These modules are implemented in ports/<port>/common-hal:
-CIRCUITPY_FULL_BUILD = 1
-CIRCUITPY_ALARM = 1
-CIRCUITPY_AUDIOCORE = 1
-CIRCUITPY_AUDIOMP3 = 0
-CIRCUITPY_AUDIOBUSIO = 1
-CIRCUITPY_AUDIOBUSIO_PDMIN = 0
-CIRCUITPY_AUDIOBUSIO_I2SOUT = 1
-CIRCUITPY_AUDIOIO = 0
-CIRCUITPY_AUDIOMIXER = 1
-CIRCUITPY_CANIO = 1
-CIRCUITPY_COUNTIO = 1
-CIRCUITPY_DUALBANK = 1
-CIRCUITPY_FRAMEBUFFERIO = 1
-CIRCUITPY_FREQUENCYIO = 1
+CIRCUITPY_FULL_BUILD ?= 1
+CIRCUITPY_ALARM ?= 1
+CIRCUITPY_AUDIOCORE ?= 1
+CIRCUITPY_AUDIOMP3 ?= 0
+CIRCUITPY_AUDIOBUSIO ?= 1
+CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
+CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
+CIRCUITPY_AUDIOIO ?= 0
+CIRCUITPY_AUDIOMIXER ?= 1
+CIRCUITPY_CANIO ?= 1
+CIRCUITPY_COUNTIO ?= 1
+CIRCUITPY_DUALBANK ?= 1
+CIRCUITPY_FRAMEBUFFERIO ?= 1
+CIRCUITPY_FREQUENCYIO ?= 1
 CIRCUITPY_IMAGECAPTURE ?= 1
-CIRCUITPY_I2CPERIPHERAL = 0
-CIRCUITPY_RGBMATRIX = 1
-CIRCUITPY_ROTARYIO = 1
-CIRCUITPY_NVM = 1
+CIRCUITPY_I2CPERIPHERAL ?= 0
+CIRCUITPY_RGBMATRIX ?= 1
+CIRCUITPY_ROTARYIO ?= 1
+CIRCUITPY_NVM ?= 1
 CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1
 CIRCUITPY_WIFI ?= 1
 CIRCUITPY_WATCHDOG ?= 1
 
-CIRCUITPY_ESPIDF = 1
+CIRCUITPY_ESPIDF ?= 1
 
 CIRCUITPY_MODULE ?= none
 
