[MIPS] Move CFE code into arch/mips/fw/cfe

Move the platform independent part of the CFE code to arch/mips/fw/cfe from arch/mips/sibyte/cfe. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
git-mirror · Oct 11, 2007 · df78b5c · df78b5c
1 parent cc6e8e0
commit df78b5c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 8 deletions.
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
@@ -688,6 +688,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config BOOT_RAW
 	bool
 
+config CFE
+	bool
+
 config DMA_COHERENT
 	bool
 

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
@@ -149,6 +149,7 @@ endif
 # Firmware support
 #
 libs-$(CONFIG_ARC)		+= arch/mips/arc/
+libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/
 libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/
 
 #

diff --git a/arch/mips/fw/cfe/Makefile b/arch/mips/fw/cfe/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Broadcom Common Firmware Environment support
+#
+
+lib-y += cfe_api.o
diff --git a/arch/mips/sibyte/cfe/cfe_api.c → arch/mips/fw/cfe/cfe_api.c b/arch/mips/sibyte/cfe/cfe_api.c → arch/mips/fw/cfe/cfe_api.c
@@ -30,7 +30,7 @@
     *
     ********************************************************************* */
 
-#include "cfe_api.h"
+#include <asm/fw/cfe/cfe_api.h>
 #include "cfe_api_int.h"
 
 /* Cast from a native pointer to a cfe_xptr_t and back.	 */

diff --git a/arch/mips/sibyte/cfe/cfe_api_int.h → arch/mips/fw/cfe/cfe_api_int.h b/arch/mips/sibyte/cfe/cfe_api_int.h → arch/mips/fw/cfe/cfe_api_int.h
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
@@ -124,6 +124,7 @@ config SB1_CERR_STALL
 config SIBYTE_CFE
 	bool "Booting from CFE"
 	depends on SIBYTE_SB1xxx_SOC
+	select CFE
 	select SYS_HAS_EARLY_PRINTK
 	help
 	  Make use of the CFE API for enumerating available memory,

diff --git a/arch/mips/sibyte/cfe/Makefile b/arch/mips/sibyte/cfe/Makefile
@@ -1,3 +1,3 @@
-lib-y					= cfe_api.o setup.o
+lib-y					= setup.o
 lib-$(CONFIG_SMP)			+= smp.o
 lib-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= console.o
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
@@ -4,8 +4,8 @@
 
 #include <asm/sibyte/board.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 extern int cfe_cons_handle;
 

diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
@@ -29,8 +29,8 @@
 #include <asm/reboot.h>
 #include <asm/sibyte/board.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 /* Max ram addressable in 32-bit segments */
 #ifdef CONFIG_64BIT

diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
@@ -21,8 +21,8 @@
 #include <linux/smp.h>
 #include <asm/processor.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 /*
  * Use CFE to find out how many CPUs are available, setting up

diff --git a/arch/mips/sibyte/cfe/cfe_api.h → include/asm-mips/fw/cfe/cfe_api.h b/arch/mips/sibyte/cfe/cfe_api.h → include/asm-mips/fw/cfe/cfe_api.h
diff --git a/arch/mips/sibyte/cfe/cfe_error.h → include/asm-mips/fw/cfe/cfe_error.h b/arch/mips/sibyte/cfe/cfe_error.h → include/asm-mips/fw/cfe/cfe_error.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -688,6 +688,9 @@ config ARCH_MAY_HAVE_PC_FDC @@
     config BOOT_RAW
     	bool
+    config CFE
+    	bool
     config DMA_COHERENT
     	bool
@@ Expand Down @@