feat(spi_flash): Add patch to fix TH25Q16HB page 0 hardware issue

donghengqaz · donghengqaz · commit e2f55cbccad4 · 2023-03-09T19:08:43.000+08:00
diff --git a/components/esp8266/source/startup.c b/components/esp8266/source/startup.c
@@ -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);
diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt
@@ -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()
 
diff --git a/components/spi_flash/Kconfig b/components/spi_flash/Kconfig
@@ -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
diff --git a/components/spi_flash/component.mk b/components/spi_flash/component.mk
@@ -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
diff --git a/components/spi_flash/include/spi_flash.h b/components/spi_flash/include/spi_flash.h
@@ -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
diff --git a/components/spi_flash/linker.lf b/components/spi_flash/linker.lf
@@ -2,3 +2,4 @@
 archive: libspi_flash.a
 entries:
     spi_flash_raw (noflash)
+    th25q16hb (noflash)
diff --git a/components/spi_flash/src/patch/th25q16hb.c b/components/spi_flash/src/patch/th25q16hb.c
