From owner-svn-src-all@FreeBSD.ORG Sun Jul 28 17:37:32 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 031C937E; Sun, 28 Jul 2013 17:37:32 +0000 (UTC) (envelope-from ian@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D3AE22309; Sun, 28 Jul 2013 17:37:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SHbVv2036087; Sun, 28 Jul 2013 17:37:31 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6SHbVsS036084; Sun, 28 Jul 2013 17:37:31 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201307281737.r6SHbVsS036084@svn.freebsd.org> From: Ian Lepore Date: Sun, 28 Jul 2013 17:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253746 - in head/sys/arm: conf freescale/imx 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.14 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: Sun, 28 Jul 2013 17:37:32 -0000 Author: ian Date: Sun Jul 28 17:37:30 2013 New Revision: 253746 URL: http://svnweb.freebsd.org/changeset/base/253746 Log: Rename the existing std.imx and imx.files to std.imx51 and files.imx51, to pave the way for adding imx6 support. Added: head/sys/arm/freescale/imx/files.imx51 - copied unchanged from r253742, head/sys/arm/freescale/imx/imx.files head/sys/arm/freescale/imx/std.imx51 - copied, changed from r253742, head/sys/arm/freescale/imx/std.imx Deleted: head/sys/arm/freescale/imx/imx.files head/sys/arm/freescale/imx/std.imx Modified: head/sys/arm/conf/EFIKA_MX Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Sun Jul 28 17:35:19 2013 (r253745) +++ head/sys/arm/conf/EFIKA_MX Sun Jul 28 17:37:30 2013 (r253746) @@ -19,7 +19,7 @@ ident EFIKA_MX -include "../freescale/imx/std.imx" +include "../freescale/imx/std.imx51" makeoptions WITHOUT_MODULES="ahc" Copied: head/sys/arm/freescale/imx/files.imx51 (from r253742, head/sys/arm/freescale/imx/imx.files) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/freescale/imx/files.imx51 Sun Jul 28 17:37:30 2013 (r253746, copy of r253742, head/sys/arm/freescale/imx/imx.files) @@ -0,0 +1,51 @@ +# $FreeBSD$ +arm/arm/bus_space_asm_generic.S standard +arm/arm/bus_space_generic.c standard +arm/arm/cpufunc_asm_armv5.S standard +arm/arm/cpufunc_asm_arm11.S standard +arm/arm/cpufunc_asm_armv7.S standard +arm/arm/irq_dispatch.S standard +kern/kern_clocksource.c standard + +# Init +arm/freescale/imx/imx_machdep.c standard +arm/freescale/imx/common.c standard +arm/freescale/imx/bus_space.c standard + +# Dummy serial console +#arm/freescale/imx/console.c standard + +# TrustZone Interrupt Controller +arm/freescale/imx/tzic.c standard + +# IOMUX - external pins multiplexor +arm/freescale/imx/imx51_iomux.c optional iomux + +# GPIO +arm/freescale/imx/imx51_gpio.c optional gpio + +# Generic Periodic Timer +arm/freescale/imx/imx_gpt.c standard + +# Clock Configuration Manager +arm/freescale/imx/imx51_ccm.c standard + +# i.MX5xx PATA controller +dev/ata/chipsets/ata-fsl.c optional imxata + +# UART driver +dev/uart/uart_dev_imx.c optional uart + +# USB join controller (1 OTG, 3 EHCI) +dev/usb/controller/ehci_imx.c optional ehci + +# Watchdog +arm/freescale/imx/imx_wdog.c optional imxwdt + +# i2c +arm/freescale/imx/i2c.c optional fsliic +dev/ofw/ofw_iicbus.c optional fsliic + +# IPU - Image Processing Unit (frame buffer also) +arm/freescale/imx/imx51_ipuv3.c optional sc + Copied and modified: head/sys/arm/freescale/imx/std.imx51 (from r253742, head/sys/arm/freescale/imx/std.imx) ============================================================================== --- head/sys/arm/freescale/imx/std.imx Sun Jul 28 12:29:10 2013 (r253742, copy source) +++ head/sys/arm/freescale/imx/std.imx51 Sun Jul 28 17:37:30 2013 (r253746) @@ -11,5 +11,5 @@ makeoptions KERNPHYSADDR=0x90100000 options PHYSADDR=0x90000000 options STARTUP_PAGETABLE_ADDR=0x91000000 -files "../freescale/imx/imx.files" +files "../freescale/imx/files.imx51"