svn commit: r264219 - in head/sys/arm: cavium cavium/cns11xx conf econa

[Rui Paulo]

Author: rpaulo
Date: Mon Apr  7 05:33:30 2014
New Revision: 264219
URL: http://svnweb.freebsd.org/changeset/base/264219

Log:
  Move sys/arm/econa to sys/arm/cavium/cns11xx.

Added:
  head/sys/arm/cavium/
  head/sys/arm/cavium/cns11xx/
     - copied from r264142, head/sys/arm/econa/
Deleted:
  head/sys/arm/econa/
Modified:
  head/sys/arm/cavium/cns11xx/cfi_bus_econa.c
  head/sys/arm/cavium/cns11xx/files.econa
  head/sys/arm/cavium/cns11xx/if_ece.c
  head/sys/arm/cavium/cns11xx/ohci_ec.c
  head/sys/arm/cavium/cns11xx/std.econa
  head/sys/arm/cavium/cns11xx/uart_bus_ec.c
  head/sys/arm/cavium/cns11xx/uart_cpu_ec.c
  head/sys/arm/conf/CNS11XXNAS
  head/sys/arm/conf/NOTES

Modified: head/sys/arm/cavium/cns11xx/cfi_bus_econa.c
==============================================================================
--- head/sys/arm/econa/cfi_bus_econa.c	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/cfi_bus_econa.c	Mon Apr  7 05:33:30 2014	(r264219)
@@ -40,8 +40,8 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/cfi/cfi_var.h>
 
-#include <arm/econa/econa_reg.h>
-#include <arm/econa/econa_var.h>
+#include <arm/cavium/cns11xx/econa_reg.h>
+#include <arm/cavium/cns11xx/econa_var.h>
 
 static int
 cfi_econa_probe(device_t dev)

Modified: head/sys/arm/cavium/cns11xx/files.econa
==============================================================================
--- head/sys/arm/econa/files.econa	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/files.econa	Mon Apr  7 05:33:30 2014	(r264219)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 arm/arm/cpufunc_asm_fa526.S	standard
-arm/econa/econa_machdep.c		standard
-arm/econa/econa.c			standard
-arm/econa/timer.c			standard
-arm/econa/uart_bus_ec.c		optional	uart
-arm/econa/uart_cpu_ec.c		optional	uart
+arm/cavium/cns11xx/econa_machdep.c		standard
+arm/cavium/cns11xx/econa.c			standard
+arm/cavium/cns11xx/timer.c			standard
+arm/cavium/cns11xx/uart_bus_ec.c		optional	uart
+arm/cavium/cns11xx/uart_cpu_ec.c		optional	uart
 dev/uart/uart_dev_ns8250.c	optional	uart
 arm/arm/bus_space_generic.c		standard
-arm/econa/ehci_ebus.c	optional	ehci
-arm/econa/ohci_ec.c	optional	ohci
-arm/econa/if_ece.c		standard
-arm/econa/cfi_bus_econa.c		optional	cfi
+arm/cavium/cns11xx/ehci_ebus.c	optional	ehci
+arm/cavium/cns11xx/ohci_ec.c	optional	ohci
+arm/cavium/cns11xx/if_ece.c		standard
+arm/cavium/cns11xx/cfi_bus_econa.c		optional	cfi

Modified: head/sys/arm/cavium/cns11xx/if_ece.c
==============================================================================
--- head/sys/arm/econa/if_ece.c	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/if_ece.c	Mon Apr  7 05:33:30 2014	(r264219)
@@ -62,9 +62,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <arm/econa/if_ecereg.h>
-#include <arm/econa/if_ecevar.h>
-#include <arm/econa/econa_var.h>
+#include <arm/cavium/cns11xx/if_ecereg.h>
+#include <arm/cavium/cns11xx/if_ecevar.h>
+#include <arm/cavium/cns11xx/econa_var.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>

Modified: head/sys/arm/cavium/cns11xx/ohci_ec.c
==============================================================================
--- head/sys/arm/econa/ohci_ec.c	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/ohci_ec.c	Mon Apr  7 05:33:30 2014	(r264219)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <arm/econa/econa_reg.h>
+#include <arm/cavium/cns11xx/econa_reg.h>
 
 #define	MEM_RID	0
 

Modified: head/sys/arm/cavium/cns11xx/std.econa
==============================================================================
--- head/sys/arm/econa/std.econa	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/std.econa	Mon Apr  7 05:33:30 2014	(r264219)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-files	"../econa/files.econa"
+files	"../cavium/cns11xx/files.econa"
 cpu		CPU_FA526
 machine 	arm
 makeoptions	CONF_CFLAGS=-march=armv4

Modified: head/sys/arm/cavium/cns11xx/uart_bus_ec.c
==============================================================================
--- head/sys/arm/econa/uart_bus_ec.c	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/uart_bus_ec.c	Mon Apr  7 05:33:30 2014	(r264219)
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <arm/econa/econa_reg.h>
+#include <arm/cavium/cns11xx/econa_reg.h>
 
 static int uart_ec_probe(device_t dev);
 

Modified: head/sys/arm/cavium/cns11xx/uart_cpu_ec.c
==============================================================================
--- head/sys/arm/econa/uart_cpu_ec.c	Sat Apr  5 03:01:29 2014	(r264142)
+++ head/sys/arm/cavium/cns11xx/uart_cpu_ec.c	Mon Apr  7 05:33:30 2014	(r264219)
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <arm/econa/econa_reg.h>
-#include <arm/econa/econa_var.h>
+#include <arm/cavium/cns11xx/econa_reg.h>
+#include <arm/cavium/cns11xx//econa_var.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;

Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS	Mon Apr  7 05:18:27 2014	(r264218)
+++ head/sys/arm/conf/CNS11XXNAS	Mon Apr  7 05:33:30 2014	(r264219)
@@ -26,7 +26,7 @@ ident		CNS11XXNAS
 #options 	FLASHADDR=0x50000000
 #options 	LOADERRAMADDR=0x00000000
 
-include		"../econa/std.econa"
+include		"../cavium/cns11xx/std.econa"
 
 makeoptions	MODULES_OVERRIDE=""
 

Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES	Mon Apr  7 05:18:27 2014	(r264218)
+++ head/sys/arm/conf/NOTES	Mon Apr  7 05:33:30 2014	(r264219)
@@ -13,7 +13,7 @@ cpu 	CPU_XSCALE_IXP435
 cpu	CPU_XSCALE_PXA2X0
 
 files	"../at91/files.at91"
-files	"../econa/files.econa"
+files	"../cavium/cns11xx/files.econa"
 files	"../mv/files.mv"
 files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"