From 4d44ac7c1a258d2c5b526e001366ed4bc955131c Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 17 May 2014 21:53:34 +0000 Subject: [PATCH] MFC 264219: Move sys/arm/econa to sys/arm/cavium/cns11xx. git-svn-id: svn://svn.freebsd.org/base/stable/10@266363 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/arm/{econa => cavium/cns11xx}/cfi_bus_econa.c | 4 ++-- sys/arm/{econa => cavium/cns11xx}/econa.c | 0 sys/arm/{econa => cavium/cns11xx}/econa_machdep.c | 0 sys/arm/{econa => cavium/cns11xx}/econa_reg.h | 0 sys/arm/{econa => cavium/cns11xx}/econa_var.h | 0 sys/arm/{econa => cavium/cns11xx}/ehci_ebus.c | 0 sys/arm/cavium/cns11xx/files.econa | 13 +++++++++++++ sys/arm/{econa => cavium/cns11xx}/if_ece.c | 6 +++--- sys/arm/{econa => cavium/cns11xx}/if_ecereg.h | 0 sys/arm/{econa => cavium/cns11xx}/if_ecevar.h | 0 sys/arm/{econa => cavium/cns11xx}/ohci_ec.c | 2 +- sys/arm/{econa => cavium/cns11xx}/std.econa | 2 +- sys/arm/{econa => cavium/cns11xx}/timer.c | 0 sys/arm/{econa => cavium/cns11xx}/uart_bus_ec.c | 2 +- sys/arm/{econa => cavium/cns11xx}/uart_cpu_ec.c | 4 ++-- sys/arm/conf/CNS11XXNAS | 2 +- sys/arm/conf/NOTES | 2 +- sys/arm/econa/files.econa | 13 ------------- 18 files changed, 25 insertions(+), 25 deletions(-) rename sys/arm/{econa => cavium/cns11xx}/cfi_bus_econa.c (96%) rename sys/arm/{econa => cavium/cns11xx}/econa.c (100%) rename sys/arm/{econa => cavium/cns11xx}/econa_machdep.c (100%) rename sys/arm/{econa => cavium/cns11xx}/econa_reg.h (100%) rename sys/arm/{econa => cavium/cns11xx}/econa_var.h (100%) rename sys/arm/{econa => cavium/cns11xx}/ehci_ebus.c (100%) create mode 100644 sys/arm/cavium/cns11xx/files.econa rename sys/arm/{econa => cavium/cns11xx}/if_ece.c (99%) rename sys/arm/{econa => cavium/cns11xx}/if_ecereg.h (100%) rename sys/arm/{econa => cavium/cns11xx}/if_ecevar.h (100%) rename sys/arm/{econa => cavium/cns11xx}/ohci_ec.c (99%) rename sys/arm/{econa => cavium/cns11xx}/std.econa (90%) rename sys/arm/{econa => cavium/cns11xx}/timer.c (100%) rename sys/arm/{econa => cavium/cns11xx}/uart_bus_ec.c (98%) rename sys/arm/{econa => cavium/cns11xx}/uart_cpu_ec.c (96%) delete mode 100644 sys/arm/econa/files.econa diff --git a/sys/arm/econa/cfi_bus_econa.c b/sys/arm/cavium/cns11xx/cfi_bus_econa.c similarity index 96% rename from sys/arm/econa/cfi_bus_econa.c rename to sys/arm/cavium/cns11xx/cfi_bus_econa.c index 88b689931..d93010f2c 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 -#include -#include +#include +#include static int cfi_econa_probe(device_t dev) diff --git a/sys/arm/econa/econa.c b/sys/arm/cavium/cns11xx/econa.c similarity index 100% rename from sys/arm/econa/econa.c rename to sys/arm/cavium/cns11xx/econa.c diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/cavium/cns11xx/econa_machdep.c similarity index 100% rename from sys/arm/econa/econa_machdep.c rename to sys/arm/cavium/cns11xx/econa_machdep.c diff --git a/sys/arm/econa/econa_reg.h b/sys/arm/cavium/cns11xx/econa_reg.h similarity index 100% rename from sys/arm/econa/econa_reg.h rename to sys/arm/cavium/cns11xx/econa_reg.h diff --git a/sys/arm/econa/econa_var.h b/sys/arm/cavium/cns11xx/econa_var.h similarity index 100% rename from sys/arm/econa/econa_var.h rename to sys/arm/cavium/cns11xx/econa_var.h diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/cavium/cns11xx/ehci_ebus.c similarity index 100% rename from sys/arm/econa/ehci_ebus.c rename to 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 000000000..c69895a83 --- /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 similarity index 99% rename from sys/arm/econa/if_ece.c rename to sys/arm/cavium/cns11xx/if_ece.c index faccabb38..657f6f337 100644 --- a/sys/arm/econa/if_ece.c +++ b/sys/arm/cavium/cns11xx/if_ece.c @@ -62,9 +62,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sys/arm/econa/if_ecereg.h b/sys/arm/cavium/cns11xx/if_ecereg.h similarity index 100% rename from sys/arm/econa/if_ecereg.h rename to sys/arm/cavium/cns11xx/if_ecereg.h diff --git a/sys/arm/econa/if_ecevar.h b/sys/arm/cavium/cns11xx/if_ecevar.h similarity index 100% rename from sys/arm/econa/if_ecevar.h rename to sys/arm/cavium/cns11xx/if_ecevar.h diff --git a/sys/arm/econa/ohci_ec.c b/sys/arm/cavium/cns11xx/ohci_ec.c similarity index 99% rename from sys/arm/econa/ohci_ec.c rename to sys/arm/cavium/cns11xx/ohci_ec.c index 543aae138..d2ce4c369 100644 --- a/sys/arm/econa/ohci_ec.c +++ b/sys/arm/cavium/cns11xx/ohci_ec.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #define MEM_RID 0 diff --git a/sys/arm/econa/std.econa b/sys/arm/cavium/cns11xx/std.econa similarity index 90% rename from sys/arm/econa/std.econa rename to sys/arm/cavium/cns11xx/std.econa index 6b1f2d057..d520aa437 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 similarity index 100% rename from sys/arm/econa/timer.c rename to 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 similarity index 98% rename from sys/arm/econa/uart_bus_ec.c rename to sys/arm/cavium/cns11xx/uart_bus_ec.c index 90d5b07a9..b632359bb 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 #include -#include +#include 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 similarity index 96% rename from sys/arm/econa/uart_cpu_ec.c rename to sys/arm/cavium/cns11xx/uart_cpu_ec.c index a6416a2bc..c5258d437 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 -#include -#include +#include +#include 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 c3284aa17..a93adaddd 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 ad608d4c5..6a0218d6c 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 8222d68fd..000000000 --- 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 -- 2.45.0