修改冲突

source/System/init.c

@@ -49,6 +49,8 @@
 #include "r_fdl_types.h"
 #include "fdl_descriptor.h"
 
+#include "Seg_Ref.h"
+
 #define WITHOUT_BOOT 0
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
@@ -136,7 +138,7 @@ void Sys_Startup_Init(void)
     DelayUs(50001);
 
     Int_Flash_Init();
-
+    SEG_BUFF_Init();
     BU98R10_Init();
 
     d_printf("Init complete!\n");