From 9588134f2c92b4ac48fd6d8cb2cde275106af222 Mon Sep 17 00:00:00 2001
From: andy <1414772332@qq.com>
Date: Mon, 16 Dec 2024 10:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8D=A2wtz=20=E5=92=8Cdt=20=E7=9A=84?=
 =?UTF-8?q?chip=20id=20ram.bin=E4=B8=8D=E6=A0=A1=E9=AA=8Csubid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b6d3ada027e35a86598313ee42b2de3e014e2b29)
---
 inc/driver/iot_system.h | 16 ++++++++--------
 mfgtool/ram/src/ram.c   | 36 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/inc/driver/iot_system.h b/inc/driver/iot_system.h
index cd9d82f..2ae664b 100644
--- a/inc/driver/iot_system.h
+++ b/inc/driver/iot_system.h
@@ -112,18 +112,18 @@ extern "C" {
 #define CHIP_ID_GX2011_V1A    0x1041    //GX2011
 /* HZ5202, k76, QFN9*9 */
 #define CHIP_ID_HZ5202_V1A    0x1057    //HZ5202
-/* DT0530, k76, QFN9*9 */
-#define CHIP_ID_DT0530_V1A    0x1063    //DT0530
-/* DT0531, k76, QFN9*9 */
-#define CHIP_ID_DT0531_V1A    0x1061    //DT0531
+/* WTZ31C, k76, QFN9*9 */
+#define CHIP_ID_WTZ31C_V1A    0x1063    //WTZ31C
+/* WTZ31S, k76, QFN9*9 */
+#define CHIP_ID_WTZ31S_V1A    0x1061    //WTZ31S
 /* YP8801, k76, QFN9*9 */
 #define CHIP_ID_YP8801_V1A    0x1073    //YP8801
 /* YP8811, k76, QFN9*9 */
 #define CHIP_ID_YP8811_V1A    0x1071    //YP8811
-/* WTZ31C, k76, QFN9*9 */
-#define CHIP_ID_WTZ31C_V1A    0x1083    //WTZ31C
-/* WTZ31S, k76, QFN9*9 */
-#define CHIP_ID_WTZ31S_V1A    0x1081    //WTZ31S
+/* DT0530, k76, QFN9*9 */
+#define CHIP_ID_DT0530_V1A    0x1083    //DT0530
+/* DT0531, k76, QFN9*9 */
+#define CHIP_ID_DT0531_V1A    0x1081    //DT0531
 /* TCE3202, k76, QFN9*9 */
 #define CHIP_ID_TCE3202_V1A   0x1093    //TCE3202
 /* TCE3201, k76, QFN9*9 */
diff --git a/mfgtool/ram/src/ram.c b/mfgtool/ram/src/ram.c
index ab172f8..2c2dfac 100644
--- a/mfgtool/ram/src/ram.c
+++ b/mfgtool/ram/src/ram.c
@@ -1951,25 +1951,25 @@ static void ramModuleInfoPrint()
         }
     }
 #ifndef RAM_FOR_BOARDBURN
-    {
-        /* chipburn */
-        uint32_t subid;
-        ram_encrypt_t *p_encrypt = &encrypt_array[MANUFACTURER_INDEX];
+    // {
+    //     /* chipburn */
+    //     uint32_t subid;
+    //     ram_encrypt_t *p_encrypt = &encrypt_array[MANUFACTURER_INDEX];
 
-        if (0 == g_chip_subid) {
-            /* chipburn, when no subid */
-            subid = ram_lookup_chip_subid(g_chip_id, p_encrypt->manu);
-            if (0xFFFF == subid) {
-                ram_error_no |= RAM_LOOKUP_CHIP_SUBID_ERR;
-            } else {
-                ram_set_chip_subid(subid);
-                g_chip_subid = ram_get_chip_subid();
-                if (subid != g_chip_subid) {
-                    ram_error_no |= RAM_WRITE_CHIP_SUBID_ERR;
-                }
-            }
-        }
-    }
+    //     if (0 == g_chip_subid) {
+    //         /* chipburn, when no subid */
+    //         subid = ram_lookup_chip_subid(g_chip_id, p_encrypt->manu);
+    //         if (0xFFFF == subid) {
+    //             ram_error_no |= RAM_LOOKUP_CHIP_SUBID_ERR;
+    //         } else {
+    //             ram_set_chip_subid(subid);
+    //             g_chip_subid = ram_get_chip_subid();
+    //             if (subid != g_chip_subid) {
+    //                 ram_error_no |= RAM_WRITE_CHIP_SUBID_ERR;
+    //             }
+    //         }
+    //     }
+    // }
 #endif
 
     gPsramSize = ram_get_psram_size();