[MIPS] Move ARC code into arch/mips/fw/arc

Move the ARC code to arch/mips/fw/arc from arch/mips/arc.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index a097ae61eb6b165b89e602b35199d8beff8f6028..b0fac2d436b7f8b96a4c782da1da6fb97b54072d 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -148,7 +148,7 @@ endif
 #
 # Firmware support
 #
-libs-$(CONFIG_ARC)             += arch/mips/arc/
+libs-$(CONFIG_ARC)             += arch/mips/fw/arc/
 libs-$(CONFIG_CFE)             += arch/mips/fw/cfe/
 libs-$(CONFIG_SIBYTE_CFE)      += arch/mips/sibyte/cfe/
 

diff --git a/arch/mips/arc/Makefile b/arch/mips/fw/arc/Makefile
similarity index 100%
rename from arch/mips/arc/Makefile
rename to arch/mips/fw/arc/Makefile

diff --git a/arch/mips/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c
similarity index 100%
rename from arch/mips/arc/arc_con.c
rename to arch/mips/fw/arc/arc_con.c

diff --git a/arch/mips/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
similarity index 100%
rename from arch/mips/arc/cmdline.c
rename to arch/mips/fw/arc/cmdline.c

diff --git a/arch/mips/arc/env.c b/arch/mips/fw/arc/env.c
similarity index 95%
rename from arch/mips/arc/env.c
rename to arch/mips/fw/arc/env.c
index e521a6e010aa2351bd27e193212a49119d4a17eb..6f5dd42b96e2a2e1daa56ea16ef89e36120a1a69 100644 (file)
--- a/arch/mips/arc/env.c
+++ b/arch/mips/fw/arc/env.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 PCHAR __init

diff --git a/arch/mips/arc/file.c b/arch/mips/fw/arc/file.c
similarity index 98%
rename from arch/mips/arc/file.c
rename to arch/mips/fw/arc/file.c
index cb0127cf5bc155a029495272134975e2a81fa69b..30335341b44750786bdde99226823f4be4d8801b 100644 (file)
--- a/arch/mips/arc/file.c
+++ b/arch/mips/fw/arc/file.c
@@ -10,7 +10,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 LONG

diff --git a/arch/mips/arc/identify.c b/arch/mips/fw/arc/identify.c
similarity index 100%
rename from arch/mips/arc/identify.c
rename to arch/mips/fw/arc/identify.c

diff --git a/arch/mips/arc/init.c b/arch/mips/fw/arc/init.c
similarity index 100%
rename from arch/mips/arc/init.c
rename to arch/mips/fw/arc/init.c

diff --git a/arch/mips/arc/memory.c b/arch/mips/fw/arc/memory.c
similarity index 100%
rename from arch/mips/arc/memory.c
rename to arch/mips/fw/arc/memory.c

diff --git a/arch/mips/arc/misc.c b/arch/mips/fw/arc/misc.c
similarity index 97%
rename from arch/mips/arc/misc.c
rename to arch/mips/fw/arc/misc.c
index b2e10b9e9452229572f8d190188aeeef42ec53fb..e527c5fd5a3246881e09a4bfc4423de60910bfe8 100644 (file)
--- a/arch/mips/arc/misc.c
+++ b/arch/mips/fw/arc/misc.c
@@ -14,7 +14,7 @@
 
 #include <asm/bcache.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #include <asm/bootinfo.h>
 #include <asm/system.h>

diff --git a/arch/mips/arc/promlib.c b/arch/mips/fw/arc/promlib.c
similarity index 100%
rename from arch/mips/arc/promlib.c
rename to arch/mips/fw/arc/promlib.c

diff --git a/arch/mips/arc/salone.c b/arch/mips/fw/arc/salone.c
similarity index 100%
rename from arch/mips/arc/salone.c
rename to arch/mips/fw/arc/salone.c

diff --git a/arch/mips/arc/time.c b/arch/mips/fw/arc/time.c
similarity index 94%
rename from arch/mips/arc/time.c
rename to arch/mips/fw/arc/time.c
index 299ff2c5c0b5c53e7aae186c61ea142488bddbde..42138c837d48c5231686e894fd7f0a0b1bcaf87d 100644 (file)
--- a/arch/mips/arc/time.c
+++ b/arch/mips/fw/arc/time.c
@@ -9,7 +9,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 struct linux_tinfo * __init

diff --git a/arch/mips/arc/tree.c b/arch/mips/fw/arc/tree.c
similarity index 99%
rename from arch/mips/arc/tree.c
rename to arch/mips/fw/arc/tree.c
index abd1786ea09b13bd33ecabacc5508c69590e0840..d68e5a59c1f635a166a289136fc80fbc473dcdde 100644 (file)
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/fw/arc/tree.c
@@ -10,7 +10,7 @@
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
 #include <linux/init.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 #undef DEBUG_PROM_TREE

diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 6edbb3051c82cb93d3f51987cf3a43c7f8664b14..883e35ea4e82b036702f5658d61808e61a90f137 100644 (file)
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -15,7 +15,7 @@
 #include <linux/screen_info.h>
 
 #ifdef CONFIG_ARC
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #endif
 

diff --git a/include/asm-mips/arc/hinv.h b/include/asm-mips/fw/arc/hinv.h
similarity index 99%
rename from include/asm-mips/arc/hinv.h
rename to include/asm-mips/fw/arc/hinv.h
index 1862912ab14845b267cc3979808da57f620bb5a9..e6ff4add04e2d31b48ea553d8dfce08fbf8e0cd2 100644 (file)
--- a/include/asm-mips/arc/hinv.h
+++ b/include/asm-mips/fw/arc/hinv.h
@@ -5,7 +5,7 @@
 #define _ASM_ARC_HINV_H
 
 #include <asm/sgidefs.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 
 /* configuration query defines */
 typedef enum configclass {

diff --git a/include/asm-mips/arc/types.h b/include/asm-mips/fw/arc/types.h
similarity index 100%
rename from include/asm-mips/arc/types.h
rename to include/asm-mips/fw/arc/types.h

diff --git a/include/asm-mips/sgiarcs.h b/include/asm-mips/sgiarcs.h
index 439bce7daa3a407bf9b5659acf7ac64748300034..6d1eda60e01f666a011d16dec00b58c9536c5103 100644 (file)
--- a/include/asm-mips/sgiarcs.h
+++ b/include/asm-mips/sgiarcs.h
@@ -13,7 +13,7 @@
 #define _ASM_SGIARCS_H
 
 #include <asm/types.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 
 /* Various ARCS error codes. */
 #define PROM_ESUCCESS                   0x00

diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h
index 82aeb9e322db9bde8a223a9c4ac30ba05478c308..852213d03b7281889e11edbe741a7015f6025324 100644 (file)
--- a/include/asm-mips/sn/klconfig.h
+++ b/include/asm-mips/sn/klconfig.h
@@ -51,8 +51,8 @@
 
 #if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35)
 #include <asm/sn/agent.h>
-#include <asm/arc/types.h>
-#include <asm/arc/hinv.h>
+#include <asm/fw/arc/types.h>
+#include <asm/fw/arc/hinv.h>
 #if defined(CONFIG_SGI_IP35)
 // The hack file has to be before vector and after sn0_fru....
 #include <asm/hack.h>