From a92dc71ce42da2648a567895cab5c4fdf27aaebb Mon Sep 17 00:00:00 2001
From: wgzAIIT <820906721@qq.com>
Date: Tue, 21 Nov 2023 08:40:57 +0800
Subject: [PATCH] Modify the header file to include

---
 .../xidatong-arm32/third_party_driver/common/ymodem.c      | 2 +-
 .../xidatong-arm32/third_party_driver/include/flash.h      | 7 -------
 .../xidatong-arm32/third_party_driver/ota/boot_for_ota.c   | 2 +-
 .../xidatong-arm32/third_party_driver/ota/flash_for_ota.c  | 1 -
 Ubiquitous/XiZi_IIoT/tool/bootloader/flash/flash_ops.h     | 4 +---
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/ymodem.c b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/ymodem.c
index 5eb8b728a..bbbbe3790 100644
--- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/ymodem.c
+++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/ymodem.c
@@ -20,7 +20,7 @@
 #include <xs_base.h>
 #include "ymodem.h"
 #include "string.h"
-#include "flash.h"
+#include "flash_for_ota.h"
 
 uint8_t tab_1024[1024] ={0};
 uint8_t FileName[FILE_NAME_LENGTH];
diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/flash.h b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/flash.h
index a71feeceb..5c28bff17 100644
--- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/flash.h
+++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/flash.h
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include "fsl_romapi.h"
 
-#define USE_HIGHT_SPEED_TRANS  1
 #define SECTOR_SIZE 0x1000 
 #define FLASH_PAGE_SIZE 256
 
@@ -72,11 +71,5 @@ status_t Flash_Write(uint32_t WriteAddr, uint8_t *pBuffer, uint32_t NumByteToWri
 status_t Flash_Read(uint32_t addr, uint8_t *buf, uint32_t len);
 status_t Flash_Copy(uint32_t srcAddr,uint32_t dstAddr, uint32_t imageSize);
 
-#ifndef  USE_HIGHT_SPEED_TRANS
-status_t NOR_FLASH_Write(uint32_t* FlashAddress, uint8_t* Data ,uint16_t DataLength);
-#else
-status_t NOR_FLASH_Write(uint32_t* FlashAddress, uint8_t* Data ,uint16_t DataLength,uint8_t doneFlag);
-#endif
-
 #endif
 
diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/boot_for_ota.c b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/boot_for_ota.c
index 139e0645b..2d467453a 100644
--- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/boot_for_ota.c
+++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/boot_for_ota.c
@@ -22,7 +22,7 @@
 #include <xs_base.h>
 #include "common.h"
 #include "boot_for_ota.h"
-#include "flash.h"
+#include "flash_for_ota.h"
 
 #ifdef TOOL_USING_OTA
 
diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/flash_for_ota.c b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/flash_for_ota.c
index 01a28710b..8ab6be25d 100644
--- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/flash_for_ota.c
+++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/ota/flash_for_ota.c
@@ -19,7 +19,6 @@
 */
  
 #include <stdio.h>
-#include "flash.h"
 #include "flash_for_ota.h"
 #include "MIMXRT1052.h"
 
diff --git a/Ubiquitous/XiZi_IIoT/tool/bootloader/flash/flash_ops.h b/Ubiquitous/XiZi_IIoT/tool/bootloader/flash/flash_ops.h
index dfcc3ef97..a212f86aa 100644
--- a/Ubiquitous/XiZi_IIoT/tool/bootloader/flash/flash_ops.h
+++ b/Ubiquitous/XiZi_IIoT/tool/bootloader/flash/flash_ops.h
@@ -20,9 +20,7 @@
 #ifndef __FLASH_OPS_H__
 #define __FLASH_OPS_H__
 
-
-#include <flash.h>
-
+#include "flash_for_ota.h"
 typedef struct
 {
     /* board init function*/