diff options
author | ian <ian@FreeBSD.org> | 2014-05-17 21:53:34 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-05-17 21:53:34 +0000 |
commit | 48984a3aa1c8a1fcc44ae183ada271d7f5dc8511 (patch) | |
tree | bea4dd96960f950b1c6f1c1346e19820c46ed3ad /sys | |
parent | 9d16e04a2f779a947e7b68cb5ddde3ec3cea847a (diff) | |
download | FreeBSD-src-48984a3aa1c8a1fcc44ae183ada271d7f5dc8511.zip FreeBSD-src-48984a3aa1c8a1fcc44ae183ada271d7f5dc8511.tar.gz |
MFC 264219: Move sys/arm/econa to sys/arm/cavium/cns11xx.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arm/cavium/cns11xx/cfi_bus_econa.c (renamed from sys/arm/econa/cfi_bus_econa.c) | 4 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/econa.c (renamed from sys/arm/econa/econa.c) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/econa_machdep.c (renamed from sys/arm/econa/econa_machdep.c) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/econa_reg.h (renamed from sys/arm/econa/econa_reg.h) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/econa_var.h (renamed from sys/arm/econa/econa_var.h) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/ehci_ebus.c (renamed from sys/arm/econa/ehci_ebus.c) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/files.econa | 13 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/if_ece.c (renamed from sys/arm/econa/if_ece.c) | 6 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/if_ecereg.h (renamed from sys/arm/econa/if_ecereg.h) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/if_ecevar.h (renamed from sys/arm/econa/if_ecevar.h) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/ohci_ec.c (renamed from sys/arm/econa/ohci_ec.c) | 2 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/std.econa (renamed from sys/arm/econa/std.econa) | 2 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/timer.c (renamed from sys/arm/econa/timer.c) | 0 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/uart_bus_ec.c (renamed from sys/arm/econa/uart_bus_ec.c) | 2 | ||||
-rw-r--r-- | sys/arm/cavium/cns11xx/uart_cpu_ec.c (renamed from sys/arm/econa/uart_cpu_ec.c) | 4 | ||||
-rw-r--r-- | sys/arm/conf/CNS11XXNAS | 2 | ||||
-rw-r--r-- | sys/arm/conf/NOTES | 2 | ||||
-rw-r--r-- | sys/arm/econa/files.econa | 13 |
18 files changed, 25 insertions, 25 deletions
diff --git a/sys/arm/econa/cfi_bus_econa.c b/sys/arm/cavium/cns11xx/cfi_bus_econa.c index 88b6899..d93010f 100644 --- a/sys/arm/econa/cfi_bus_econa.c +++ b/sys/arm/cavium/cns11xx/cfi_bus_econa.c @@ -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) diff --git a/sys/arm/econa/econa.c b/sys/arm/cavium/cns11xx/econa.c index f9492b6..f9492b6 100644 --- a/sys/arm/econa/econa.c +++ b/sys/arm/cavium/cns11xx/econa.c diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/cavium/cns11xx/econa_machdep.c index 708109b..708109b 100644 --- a/sys/arm/econa/econa_machdep.c +++ b/sys/arm/cavium/cns11xx/econa_machdep.c diff --git a/sys/arm/econa/econa_reg.h b/sys/arm/cavium/cns11xx/econa_reg.h index 0650194..0650194 100644 --- a/sys/arm/econa/econa_reg.h +++ b/sys/arm/cavium/cns11xx/econa_reg.h diff --git a/sys/arm/econa/econa_var.h b/sys/arm/cavium/cns11xx/econa_var.h index 044dcb7..044dcb7 100644 --- a/sys/arm/econa/econa_var.h +++ b/sys/arm/cavium/cns11xx/econa_var.h diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/cavium/cns11xx/ehci_ebus.c index 4b72b7f..4b72b7f 100644 --- a/sys/arm/econa/ehci_ebus.c +++ b/sys/arm/cavium/cns11xx/ehci_ebus.c diff --git a/sys/arm/cavium/cns11xx/files.econa b/sys/arm/cavium/cns11xx/files.econa new file mode 100644 index 0000000..c69895a --- /dev/null +++ b/sys/arm/cavium/cns11xx/files.econa @@ -0,0 +1,13 @@ +# $FreeBSD$ +arm/arm/cpufunc_asm_fa526.S standard +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/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 diff --git a/sys/arm/econa/if_ece.c b/sys/arm/cavium/cns11xx/if_ece.c index faccabb..657f6f3 100644 --- a/sys/arm/econa/if_ece.c +++ b/sys/arm/cavium/cns11xx/if_ece.c @@ -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> diff --git a/sys/arm/econa/if_ecereg.h b/sys/arm/cavium/cns11xx/if_ecereg.h index 23929e0..23929e0 100644 --- a/sys/arm/econa/if_ecereg.h +++ b/sys/arm/cavium/cns11xx/if_ecereg.h diff --git a/sys/arm/econa/if_ecevar.h b/sys/arm/cavium/cns11xx/if_ecevar.h index 00278ce..00278ce 100644 --- a/sys/arm/econa/if_ecevar.h +++ b/sys/arm/cavium/cns11xx/if_ecevar.h diff --git a/sys/arm/econa/ohci_ec.c b/sys/arm/cavium/cns11xx/ohci_ec.c index 543aae1..d2ce4c3 100644 --- a/sys/arm/econa/ohci_ec.c +++ b/sys/arm/cavium/cns11xx/ohci_ec.c @@ -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 diff --git a/sys/arm/econa/std.econa b/sys/arm/cavium/cns11xx/std.econa index 6b1f2d0..d520aa4 100644 --- a/sys/arm/econa/std.econa +++ b/sys/arm/cavium/cns11xx/std.econa @@ -1,6 +1,6 @@ # $FreeBSD$ -files "../econa/files.econa" +files "../cavium/cns11xx/files.econa" cpu CPU_FA526 machine arm makeoptions CONF_CFLAGS=-march=armv4 diff --git a/sys/arm/econa/timer.c b/sys/arm/cavium/cns11xx/timer.c index e79a70a..e79a70a 100644 --- a/sys/arm/econa/timer.c +++ b/sys/arm/cavium/cns11xx/timer.c diff --git a/sys/arm/econa/uart_bus_ec.c b/sys/arm/cavium/cns11xx/uart_bus_ec.c index 90d5b07..b632359 100644 --- a/sys/arm/econa/uart_bus_ec.c +++ b/sys/arm/cavium/cns11xx/uart_bus_ec.c @@ -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); diff --git a/sys/arm/econa/uart_cpu_ec.c b/sys/arm/cavium/cns11xx/uart_cpu_ec.c index a6416a2..c5258d4 100644 --- a/sys/arm/econa/uart_cpu_ec.c +++ b/sys/arm/cavium/cns11xx/uart_cpu_ec.c @@ -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; diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index c3284aa..a93adad 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -26,7 +26,7 @@ ident CNS11XXNAS #options FLASHADDR=0x50000000 #options LOADERRAMADDR=0x00000000 -include "../econa/std.econa" +include "../cavium/cns11xx/std.econa" makeoptions MODULES_OVERRIDE="" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index ad608d4..6a0218d 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -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" diff --git a/sys/arm/econa/files.econa b/sys/arm/econa/files.econa deleted file mode 100644 index 8222d68..0000000 --- a/sys/arm/econa/files.econa +++ /dev/null @@ -1,13 +0,0 @@ -# $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 -dev/uart/uart_dev_ns8250.c optional uart -arm/arm/bus_space_generic.c standard -arm/econa/ehci_ebus.c standard ehci -arm/econa/ohci_ec.c standard ohci -arm/econa/if_ece.c standard -arm/econa/cfi_bus_econa.c optional cfi |