Merge branch 'release/v3.4' into dwss_support

Author: rechrtb

components/esp8266/lib/VERSION

@@ -1,6 +1,6 @@
 gwen:
     core:       db51cd0
-    net80211:   4357636
+    net80211:   58ed843
     pp:         44c6f29
     espnow:     db51cd0
 

components/esp8266/lib/libnet80211.a

@@ -93,6 +93,10 @@ static void user_init_entry(void *param)
     esp_set_cpu_freq(ESP_CPU_FREQ_160M);
 #endif
 
+#ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+    assert(th25q16hb_apply_patch_0() == 0);
+#endif
+
     app_main();
 
     vTaskDelete(NULL);

components/esp8266/lib/libnet80211_dbg.a

@@ -262,6 +262,16 @@ static esp_err_t httpd_server_init(struct httpd_data *hd)
         .sin_port     = htons(hd->config.server_port)
     };
 #endif /* CONFIG_LWIP_IPV6 */
+
+    /* Enable SO_REUSEADDR to allow binding to the same
+     * address and port when restarting the server */
+    int enable = 1;
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) < 0) {
+        /* This will fail if CONFIG_LWIP_SO_REUSE is not enabled. But
+         * it does not affect the normal working of the HTTP Server */
+        ESP_LOGW(TAG, LOG_FMT("error in setsockopt SO_REUSEADDR (%d)"), errno);
+    }
+
     int ret = bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
     if (ret < 0) {
         ESP_LOGE(TAG, LOG_FMT("error in bind (%d)"), errno);

components/esp8266/source/startup.c

@@ -5,6 +5,10 @@ if(BOOTLOADER_BUILD)
     set(srcs "${srcs}" "port/port.c")
     set(priv_requires "bootloader_support")
 else()
+    if(CONFIG_ENABLE_TH25Q16HB_PATCH_0)
+        list(APPEND srcs "src/patch/th25q16hb.c")
+    endif()
+
     set(priv_requires "esp8266" "freertos" "bootloader_support")
 endif()
 

components/esp_http_server/src/httpd_main.c

@@ -0,0 +1,12 @@
+menu "SPI Flash"
+
+    menu "Patch"
+        config ENABLE_TH25Q16HB_PATCH_0
+            bool "Enable TH25Q16HB Patch 0"
+            default n
+            help
+                WARNING: If you don't use TH25Q16HB, you must not enable this option.
+                         Although you use TH25Q16HB, you should ask your flash manufacturer
+                         if your flash need use this patch.
+    endmenu
+endmenu

components/spi_flash/CMakeLists.txt

@@ -15,4 +15,8 @@ CFLAGS += -DPARTITION_QUEUE_HEADER=\"sys/queue.h\"
 ifdef IS_BOOTLOADER_BUILD
 COMPONENT_SRCDIRS += port
 COMPONENT_OBJS += port/port.o
+else
+ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+COMPONENT_SRCDIRS += src/patch
+endif
 endif

components/spi_flash/Kconfig

@@ -204,6 +204,15 @@ int esp_patition_table_init_data(void *partition_info);
 int esp_patition_copy_ota1_to_ota0(const void *partition_info);
 #endif
 
+#ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+/**
+ * @brief Apply TH25Q16HB patch 0 to avoid some hardware issues.
+ *
+ * @return 0 if success or others if failed
+ */
+int th25q16hb_apply_patch_0(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif

components/spi_flash/component.mk

@@ -2,3 +2,4 @@
 archive: libspi_flash.a
 entries:
     spi_flash_raw (noflash)
+    th25q16hb (noflash)