Browse Source

libcpu: MIPS: 清理代码/Clean up code.

清理内容重复的头文件。

Clean up duplicate header files.

Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
Zhou Yanjie 6 years ago
parent
commit
d6b2f56f15

+ 1 - 1
bsp/pic32ethernet/project.cbp

@@ -376,7 +376,7 @@
 		</Unit>
 		<Unit filename="..\..\libcpu\mips\common\cache.h" />
 		<Unit filename="..\..\libcpu\mips\common\exception.h" />
-		<Unit filename="..\..\libcpu\mips\common\mips.inc" />
+		<Unit filename="..\..\libcpu\mips\common\mips_def.h" />
 		<Unit filename="..\..\libcpu\mips\common\mipscfg.h" />
 		<Unit filename="..\..\libcpu\mips\common\mipsregs.h" />
 		<Unit filename="..\..\libcpu\mips\common\stackframe.h" />

+ 6 - 1
libcpu/mips/loongson_1b/cache_gcc.S

@@ -13,8 +13,13 @@
  * 2010-09-11     bernard      port to Loongson SoC3210
  * 2011-08-08     lgnq         port to Loongson LS1B
  */
+
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
 #include "../common/mipsregs.h"
-#include "../common/mips.inc"
+#include "../common/mips_def.h"
 #include "../common/asm.h"
 #include "cache.h"
 

+ 5 - 1
libcpu/mips/loongson_1b/context_gcc.S

@@ -14,7 +14,11 @@
  * 2011-08-08     lgnq         port to Loongson LS1B
  */
 
-#include "../common/mips.inc"
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 
     .section ".text", "ax"

+ 5 - 1
libcpu/mips/loongson_1b/start_gcc.S

@@ -13,7 +13,11 @@
  * 2010-09-04     bernard      porting to Jz47xx
  */
 
-#include "../common/mips.inc"
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 
 	.section ".start", "ax"

+ 6 - 1
libcpu/mips/loongson_1c/cache_gcc.S

@@ -14,8 +14,13 @@
  * 2011-08-08     lgnq         port to Loongson LS1B
  * 2015-07-08     chinesebear  port to Loongson LS1C
  */
+
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
 #include "../common/mipsregs.h"
-#include "../common/mips.inc"
+#include "../common/mips_def.h"
 #include "../common/asm.h"
 #include "cache.h"
 

+ 5 - 1
libcpu/mips/loongson_1c/context_gcc.S

@@ -14,7 +14,11 @@
  * 2011-08-08     lgnq         port to Loongson LS1B
  */
 
-#include "../common/mips.inc"
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 #include "stackframe_fpu.h"
 

+ 5 - 1
libcpu/mips/loongson_1c/start_gcc.S

@@ -13,7 +13,11 @@
  * 2010-09-04     bernard      porting to Jz47xx
  */
 
-#include "../common/mips.inc"
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 #include "sdram_cfg.h"
 #include "cache.h"

+ 5 - 1
libcpu/mips/pic32/context_gcc.S

@@ -1,5 +1,9 @@
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
 #include <p32xxxx.h>
-#include "../common/mips.inc"
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 
     .section ".text", "ax"

+ 1 - 1
libcpu/mips/x1000/mips_cache_gcc.S

@@ -23,7 +23,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#	define	__ASSEMBLY__
+#define	__ASSEMBLY__
 #endif
 
 #include "../common/mips.h"

+ 1 - 1
libcpu/mips/x1000/mips_context_gcc.S

@@ -23,7 +23,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#	define __ASSEMBLY__
+#define __ASSEMBLY__
 #endif
 
 #include "../common/mips.h"

+ 1 - 1
libcpu/mips/x1000/mips_excpt_gcc.S

@@ -23,7 +23,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#	define __ASSEMBLY__
+#define __ASSEMBLY__
 #endif
 
 #include "../common/mips.h"

+ 1 - 1
libcpu/mips/x1000/mips_fp_gcc.S

@@ -23,7 +23,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#	define __ASSEMBLY__
+#define __ASSEMBLY__
 #endif
 
 #ifdef __mips_hard_float

+ 1 - 1
libcpu/mips/x1000/startup_gcc.S

@@ -23,7 +23,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#	define __ASSEMBLY__
+#define __ASSEMBLY__
 #endif
 
 #include "../common/mips.h"

+ 6 - 1
libcpu/mips/xburst/cache_gcc.S

@@ -4,7 +4,12 @@
  * Date           Author       Notes
  * 2010-05-17     swkyer       first version
  */
-#include "../common/mips.inc"
+
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/mipsregs.h"
 #include "../common/stackframe.h"
 

+ 6 - 1
libcpu/mips/xburst/context_gcc.S

@@ -5,7 +5,12 @@
  * 2010-05-17     swkyer       first version
  * 2010-09-11     bernard      port to Jz4755
  */
-#include "../common/mips.inc"
+
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 #include "stack.h"
 

+ 5 - 1
libcpu/mips/xburst/start_gcc.S

@@ -6,7 +6,11 @@
  * 2010-09-04     bernard      porting to Jz47xx
  */
 
-#include "../common/mips.inc"
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "../common/mips_def.h"
 #include "../common/stackframe.h"
 #include "stack.h"