From e0f29d5815a7dd4d45733ce1d661f1df263913d4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 09 十月 2025 15:23:10 +0800
Subject: [PATCH] 第一轮测试OK版提交

---
 system/startup_ldf/app_startup.s |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/startup_ldf/app_startup.s b/system/startup_ldf/app_startup.s
index 5fc99aa..f75894b 100644
--- a/system/startup_ldf/app_startup.s
+++ b/system/startup_ldf/app_startup.s
@@ -1,8 +1,12 @@
 /*
+<<<<<<< HEAD
+** ADSP-21569 startup code generated on Sep 05, 2025 at 15:48:19.
+=======
 ** ADSP-21569 startup code generated on Jul 24, 2025 at 14:17:29.
+>>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
 */
 /*
-** Copyright (C) 2000-2022 Analog Devices Inc., All Rights Reserved.
+** Copyright (C) 2000-2023 Analog Devices Inc., All Rights Reserved.
 **
 ** This file is generated automatically based upon the options selected
 ** in the System Configuration utility. Changes to the Startup Code configuration
@@ -15,7 +19,7 @@
 ** placed within these sections are preserved when this file is re-generated.
 **
 ** Product      : CrossCore Embedded Studio
-** Tool Version : 6.2.3.3
+** Tool Version : 6.2.5.2
 */
 
 .FILE_ATTR libGroup="startup";

--
Gitblit v1.9.3