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" _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
