From owner-svn-src-all@freebsd.org Sun Jul 8 21:09:54 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D2B410325C5; Sun, 8 Jul 2018 21:09:54 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DFDB8BC11; Sun, 8 Jul 2018 21:09:54 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AAC1347B; Sun, 8 Jul 2018 21:09:54 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w68L9sIH006447; Sun, 8 Jul 2018 21:09:54 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w68L9q9X006437; Sun, 8 Jul 2018 21:09:52 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201807082109.w68L9q9X006437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 8 Jul 2018 21:09:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336111 - in head/sys/arm: conf freescale/imx X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: in head/sys/arm: conf freescale/imx X-SVN-Commit-Revision: 336111 X-SVN-Commit-Repository: base 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.27 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, 08 Jul 2018 21:09:55 -0000 Author: ian Date: Sun Jul 8 21:09:52 2018 New Revision: 336111 URL: https://svnweb.freebsd.org/changeset/base/336111 Log: Move device statements out of std.imx* and into kernel config files. In the armv4/5 world device statements in these files were common, but in the v6/7 world, other socs don't put device statements into those files, so this just brings imx5 and imx6 into line with the current conventions. Modified: head/sys/arm/conf/EFIKA_MX head/sys/arm/conf/GENERIC head/sys/arm/conf/IMX53 head/sys/arm/conf/IMX6 head/sys/arm/freescale/imx/std.imx51 head/sys/arm/freescale/imx/std.imx53 head/sys/arm/freescale/imx/std.imx6 Modified: head/sys/arm/conf/EFIKA_MX ============================================================================== --- head/sys/arm/conf/EFIKA_MX Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/conf/EFIKA_MX Sun Jul 8 21:09:52 2018 (r336111) @@ -121,6 +121,7 @@ device wlan_amrr # AMRR transmit rate control algori options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=efikamx.dts +device fdt_pinctrl # FDT pinmux driver # NOTE: serial console will be disabled if syscons enabled # Uncomment following lines for framebuffer/syscons support Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/conf/GENERIC Sun Jul 8 21:09:52 2018 (r336111) @@ -261,6 +261,9 @@ device cesa device crypto device cryptodev +# imx6 on-chip RTC +device imx_snvs # On-chip RTC + # Flattened Device Tree options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4" Modified: head/sys/arm/conf/IMX53 ============================================================================== --- head/sys/arm/conf/IMX53 Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/conf/IMX53 Sun Jul 8 21:09:52 2018 (r336111) @@ -118,5 +118,6 @@ device wlan_amrr # AMRR transmit rate control algori # Flattened Device Tree options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA="dtb/imx5 imx" +device fdt_pinctrl # FDT pinmux driver options INTRNG Modified: head/sys/arm/conf/IMX6 ============================================================================== --- head/sys/arm/conf/IMX6 Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/conf/IMX6 Sun Jul 8 21:09:52 2018 (r336111) @@ -118,11 +118,13 @@ device hdmi # Flattened Device Tree options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA="dtb/imx6 imx" +device fdt_pinctrl # FDT pinmux driver # SoC-specific devices device ffec # Freescale Fast Ethernet Controller device fsliic # Freescale i2c/iic device iic # iic protocol device iicbus # iic bus +device imx_snvs # On-chip RTC device imxwdt # Watchdog. WARNING: can't be disabled!!! Modified: head/sys/arm/freescale/imx/std.imx51 ============================================================================== --- head/sys/arm/freescale/imx/std.imx51 Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/freescale/imx/std.imx51 Sun Jul 8 21:09:52 2018 (r336111) @@ -3,6 +3,4 @@ machine arm armv7 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -device fdt_pinctrl - files "../freescale/imx/files.imx5" Modified: head/sys/arm/freescale/imx/std.imx53 ============================================================================== --- head/sys/arm/freescale/imx/std.imx53 Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/freescale/imx/std.imx53 Sun Jul 8 21:09:52 2018 (r336111) @@ -3,6 +3,4 @@ machine arm armv7 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -device fdt_pinctrl - files "../freescale/imx/files.imx5" Modified: head/sys/arm/freescale/imx/std.imx6 ============================================================================== --- head/sys/arm/freescale/imx/std.imx6 Sun Jul 8 20:40:28 2018 (r336110) +++ head/sys/arm/freescale/imx/std.imx6 Sun Jul 8 21:09:52 2018 (r336111) @@ -6,8 +6,5 @@ makeoptions CONF_CFLAGS="-march=armv7a" options IPI_IRQ_START=0 options IPI_IRQ_END=15 -device fdt_pinctrl -device imx6_snvs - files "../freescale/imx/files.imx6"