From a52817ac33ed40cbbfdcbfacd1a49fa40e928341 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 16:19:13 +0800
Subject: [PATCH] 兼容4g手环跟4g工卡两种硬件升级

---
 dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep b/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep
index ff39c71..e390bb5 100644
--- a/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep
+++ b/dualboots_Gai_youhua/keil/customboot/Objects/customboot_MK8000 Release.dep
@@ -140,7 +140,7 @@
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x5E0CC318)
 I (include\devices\MK800X\Include\system_MK800X.h)(0x67E26686)
 I (..\..\src\customboot\user_config.h)(0x67EB8682)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (include\drivers\mk_clock.h)(0x67E26686)
 I (include\drivers\mk_reset.h)(0x67E26686)
 I (include\drivers\mk_trace.h)(0x67E26686)
@@ -173,7 +173,7 @@
 I (include\drivers\mk_rtc.h)(0x67E26686)
 I (include\boards\board.h)(0x67E26686)
 I (include\drivers\mk_gpio.h)(0x67E26686)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 F (.\include\drivers\mk_wdt.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/mk_wdt.o -MD)
 I (include\drivers\mk_wdt.h)(0x67E26686)
 I (include\drivers\mk_common.h)(0x67E26686)
@@ -197,7 +197,7 @@
 I (include\drivers\mk_dma.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
 F (.\include\drivers\mk_io.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/mk_io.o -MD)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (include\drivers\mk_common.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)
@@ -257,7 +257,7 @@
 I (include\drivers\mk_dma.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
 I (include\drivers\mk_clock.h)(0x67E26686)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (include\drivers\mk_flash.h)(0x67E26686)
 I (include\drivers\mk_misc.h)(0x67E26686)
 I (include\drivers\mk_gpio.h)(0x67E26686)
@@ -306,7 +306,7 @@
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
 I (include\drivers\mk_clock.h)(0x67E26686)
 I (include\drivers\mk_power.h)(0x67E26686)
-F (.\include\drivers\menu.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/menu.o -MD)
+F (.\include\drivers\menu.c)(0x67FF55E1)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/menu.o -MD)
 I (include\drivers\menu.h)(0x67E26686)
 I (include\drivers\ymodem.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)
@@ -331,7 +331,8 @@
 I (..\customboot\HIDO_TypeDef.h)(0x67E26686)
 I (include\drivers\mk_trace.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
-F (.\include\drivers\ymodem.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/ymodem.o -MD)
+I (include\drivers\mk_wdt.h)(0x67E26686)
+F (.\include\drivers\ymodem.c)(0x67FF6A21)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/ymodem.o -MD)
 I (include\drivers\ymodem.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)
 I (C:\Keil_v5\ARM\ARMCLANG\include\string.h)(0x5DDFFD6C)
@@ -356,7 +357,7 @@
 I (include\drivers\mk_trace.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
 I (include\drivers\mk_wdt.h)(0x67E26686)
-F (..\..\src\customboot\customboot.c)(0x67ECE2BF)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/customboot.o -MD)
+F (..\..\src\customboot\customboot.c)(0x6800B689)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/customboot.o -MD)
 I (include\drivers\mk_flash.h)(0x67E26686)
 I (include\drivers\mk_common.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
@@ -386,10 +387,11 @@
 I (C:\Keil_v5\ARM\ARMCLANG\include\math.h)(0x5DDFFD6C)
 I (include\boards\board.h)(0x67E26686)
 I (include\drivers\mk_gpio.h)(0x67E26686)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (..\customboot\AppConfig.h)(0x67E3D31B)
 I (include\drivers\menu.h)(0x67E26686)
 I (include\drivers\aes.h)(0x67E26686)
+I (include\drivers\mk_sleep_timer.h)(0x67E26686)
 F (.\include\boards\board.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/board.o -MD)
 I (include\boards\board.h)(0x67E26686)
 I (include\drivers\mk_common.h)(0x67E26686)
@@ -411,7 +413,7 @@
 I (include\drivers\mk_dma.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdarg.h)(0x5DDFFD72)
 I (include\drivers\mk_gpio.h)(0x67E26686)
-I (include\drivers\mk_io.h)(0x67E26686)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (include\drivers\mk_power.h)(0x67E26686)
 I (include\drivers\mk_clock.h)(0x67E26686)
 I (include\drivers\mk_calib.h)(0x67E26686)
@@ -419,8 +421,8 @@
 I (include\drivers\mk_uwb.h)(0x67E26686)
 I (include\drivers\mk_mac.h)(0x67E26686)
 I (include\drivers\mk_phy.h)(0x67E26686)
-F (..\..\src\customboot\pin_config.c)(0x67E26686)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/pin_config.o -MD)
-I (include\drivers\mk_io.h)(0x67E26686)
+F (..\..\src\customboot\pin_config.c)(0x67FF67D5)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c

-fno-rtti -funsigned-char

-D__MICROLIB -gdwarf-3 -Oz -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I .. -I ../../.. -I ./include/CMSIS/Include -I ./include/devices/MK800X/Include -I ./include/components/libc -I ./include/drivers -I ../../src/customboot -I ../../../../../mk8000_evk -I ../customboot -I ./include/boards -Wno-declaration-after-statement -Wno-double-promotion -Wno-extra-semi-stmt -Wno-gnu-zero-variadic-macro-arguments -Wno-padded -Wno-unused-parameter

-I./RTE/_MK8000_Release

-IC:/Keil_v5/ARM/PACK/MKSEMI/MK800X_DFP/1.0.3/Device/Include

-IC:/Keil_v5/ARM/CMSIS/Include

-D__UVISION_VERSION="530" -D_RTE_ -DSTD_LIBC

-o ./objects/pin_config.o -MD)
+I (include\drivers\mk_io.h)(0x67FF26B0)
 I (include\drivers\mk_common.h)(0x67E26686)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x5DDFFD72)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x5DDFFD72)

--
Gitblit v1.9.3