From: penglei <1624952103@qq.com>
Date: Thu, 25 Sep 2025 09:39:30 +0000 (+0800)
Subject: 优化开机nand驱动选择
X-Git-Tag: V1.0.9_20251128_194606_LN~319^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F2398%2Fhead;p=mirrors%2FFD230.git

优化开机nand驱动选择
---

diff --git a/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c b/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c
index 1a452b097..5a4a301ee 100644
--- a/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c
+++ b/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c
@@ -47,6 +47,7 @@ static const nand_chip_mapping_t nand_chip_mappings[] = {
 
 struct nand_driver_struct *get_nand_flash(void)
 {
+#if 1
     static struct nand_driver_struct *cached_driver = NULL;
     
     // 如果已经缓存了驱动，直接返回
@@ -75,18 +76,19 @@ struct nand_driver_struct *get_nand_flash(void)
     // 如果没有找到匹配的CHIP ID，使用默认驱动
     cached_driver = &g_ds35x1g_driver;
     return cached_driver;
-
-//     #if defined(NANDFLASH_DS35X) 
-//     return &g_ds35x1g_driver;
-//     #elif defined(NANDFLASH_F35UQA)
-//         return &g_f35uqa001g_driver;
-//     #elif defined(NANDFLASH_GD5F2G)
-//         return &g_gd5f2gm7re_driver; 
-//     #elif defined(NANDFLASH_XT26Q02D)
-//         return &g_xt26q02d_driver; 
-//     #else
-//         return &g_ds35x1g_driver;    
-//     #endif
+#else
+    #if defined(NANDFLASH_DS35X) 
+    return &g_ds35x1g_driver;
+    #elif defined(NANDFLASH_F35UQA)
+        return &g_f35uqa001g_driver;
+    #elif defined(NANDFLASH_GD5F2G)
+        return &g_gd5f2gm7re_driver; 
+    #elif defined(NANDFLASH_XT26Q02D)
+        return &g_xt26q02d_driver; 
+    #else
+        return &g_ds35x1g_driver;    
+    #endif
+#endif
 }
 
 void nandflash_qspi_init(void)
diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
index 7ed601f4f..737f55cb9 100644
--- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
+++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
@@ -77,6 +77,7 @@ static const nand_chip_mapping_t nand_chip_mappings[] = {
 
 struct nand_driver_struct *get_nand_flash(void)
 {
+#if 1
     static struct nand_driver_struct *cached_driver = NULL;
     
     // 如果已经缓存了驱动，直接返回
@@ -109,18 +110,19 @@ struct nand_driver_struct *get_nand_flash(void)
     PRINT("未找到匹配的CHIP ID 0x%04X，使用默认驱动 DS35X1G\r\n", chip_id);
     cached_driver = &g_ds35x1g_driver;
     return cached_driver;
-
-//     #if defined(NANDFLASH_DS35X) 
-//     return &g_ds35x1g_driver;
-//     #elif defined(NANDFLASH_F35UQA)
-//         return &g_f35uqa001g_driver;
-//     #elif defined(NANDFLASH_GD5F2G)
-//         return &g_gd5f2gm7re_driver; 
-//     #elif defined(NANDFLASH_XT26Q02D)
-//         return &g_xt26q02d_driver; 
-//     #else
-//         return &g_ds35x1g_driver;    
-//     #endif
+#else
+    #if defined(NANDFLASH_DS35X) 
+    return &g_ds35x1g_driver;
+    #elif defined(NANDFLASH_F35UQA)
+        return &g_f35uqa001g_driver;
+    #elif defined(NANDFLASH_GD5F2G)
+        return &g_gd5f2gm7re_driver; 
+    #elif defined(NANDFLASH_XT26Q02D)
+        return &g_xt26q02d_driver; 
+    #else
+        return &g_ds35x1g_driver;    
+    #endif
+#endif
 }
 
 static int formate_filesystem(uint32_t total_block_num)