From owner-svn-src-all@FreeBSD.ORG Mon Apr 7 05:33:33 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C8CAA24; Mon, 7 Apr 2014 05:33:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C321AD9; Mon, 7 Apr 2014 05:33:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s375XXRh051417; Mon, 7 Apr 2014 05:33:33 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s375XVs3051406; Mon, 7 Apr 2014 05:33:31 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201404070533.s375XVs3051406@svn.freebsd.org> From: Rui Paulo Date: Mon, 7 Apr 2014 05:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264219 - in head/sys/arm: cavium cavium/cns11xx conf econa X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 05:33:33 -0000 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 -#include -#include +#include +#include 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 #include -#include -#include -#include +#include +#include +#include #include #include 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 -#include +#include #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 #include -#include +#include 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 -#include -#include +#include +#include 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"