优化开机nand驱动选择

diff --git a/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c b/code/sdk/bootloader/flashboot/brandy/nandflash/nandflash_config.c
index 1a452b0..5a4a301 100644 (file)
--- 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[] = {
 \r
 struct nand_driver_struct *get_nand_flash(void)\r
 {\r
+#if 1\r
     static struct nand_driver_struct *cached_driver = NULL;\r
     \r
     // 如果已经缓存了驱动，直接返回\r
@@ -75,18 +76,19 @@ struct nand_driver_struct *get_nand_flash(void)
     // 如果没有找到匹配的CHIP ID，使用默认驱动\r
     cached_driver = &g_ds35x1g_driver;\r
     return cached_driver;\r
-\r
-//     #if defined(NANDFLASH_DS35X) \r
-//     return &g_ds35x1g_driver;\r
-//     #elif defined(NANDFLASH_F35UQA)\r
-//         return &g_f35uqa001g_driver;\r
-//     #elif defined(NANDFLASH_GD5F2G)\r
-//         return &g_gd5f2gm7re_driver; \r
-//     #elif defined(NANDFLASH_XT26Q02D)\r
-//         return &g_xt26q02d_driver; \r
-//     #else\r
-//         return &g_ds35x1g_driver;    \r
-//     #endif\r
+#else\r
+    #if defined(NANDFLASH_DS35X) \r
+    return &g_ds35x1g_driver;\r
+    #elif defined(NANDFLASH_F35UQA)\r
+        return &g_f35uqa001g_driver;\r
+    #elif defined(NANDFLASH_GD5F2G)\r
+        return &g_gd5f2gm7re_driver; \r
+    #elif defined(NANDFLASH_XT26Q02D)\r
+        return &g_xt26q02d_driver; \r
+    #else\r
+        return &g_ds35x1g_driver;    \r
+    #endif\r
+#endif\r
 }\r
 \r
 void nandflash_qspi_init(void)\r

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 7ed601f..737f55c 100644 (file)
--- 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[] = {
 \r
 struct nand_driver_struct *get_nand_flash(void)\r
 {\r
+#if 1\r
     static struct nand_driver_struct *cached_driver = NULL;\r
     \r
     // 如果已经缓存了驱动，直接返回\r
@@ -109,18 +110,19 @@ struct nand_driver_struct *get_nand_flash(void)
     PRINT("未找到匹配的CHIP ID 0x%04X，使用默认驱动 DS35X1G\r\n", chip_id);\r
     cached_driver = &g_ds35x1g_driver;\r
     return cached_driver;\r
-\r
-//     #if defined(NANDFLASH_DS35X) \r
-//     return &g_ds35x1g_driver;\r
-//     #elif defined(NANDFLASH_F35UQA)\r
-//         return &g_f35uqa001g_driver;\r
-//     #elif defined(NANDFLASH_GD5F2G)\r
-//         return &g_gd5f2gm7re_driver; \r
-//     #elif defined(NANDFLASH_XT26Q02D)\r
-//         return &g_xt26q02d_driver; \r
-//     #else\r
-//         return &g_ds35x1g_driver;    \r
-//     #endif\r
+#else\r
+    #if defined(NANDFLASH_DS35X) \r
+    return &g_ds35x1g_driver;\r
+    #elif defined(NANDFLASH_F35UQA)\r
+        return &g_f35uqa001g_driver;\r
+    #elif defined(NANDFLASH_GD5F2G)\r
+        return &g_gd5f2gm7re_driver; \r
+    #elif defined(NANDFLASH_XT26Q02D)\r
+        return &g_xt26q02d_driver; \r
+    #else\r
+        return &g_ds35x1g_driver;    \r
+    #endif\r
+#endif\r
 }\r
 \r
 static int formate_filesystem(uint32_t total_block_num)\r