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.

7 files changed, 7 insertions, 7 deletions

diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index a26d107bfb1c..5a0ff319adb4 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -121,6 +121,7 @@ device		wlan_amrr		# AMRR transmit rate control algorithm
 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
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 427db9aae9e3..0f779a4f274a 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -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"
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
index 7503328f8bf7..983381b3f0c3 100644
--- a/sys/arm/conf/IMX53
+++ b/sys/arm/conf/IMX53
@@ -118,5 +118,6 @@ device		wlan_amrr		# AMRR transmit rate control algorithm
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA="dtb/imx5 imx"
+device  	fdt_pinctrl		# FDT pinmux driver
 
 options 	INTRNG
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 73fd368b6860..43aaf4365ba3 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -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!!!
 
diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51
index 7f8a95dc0c4f..092ec7e47384 100644
--- a/sys/arm/freescale/imx/std.imx51
+++ b/sys/arm/freescale/imx/std.imx51
@@ -3,6 +3,4 @@ machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-device  	fdt_pinctrl
-
 files "../freescale/imx/files.imx5"
diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53
index 7f8a95dc0c4f..092ec7e47384 100644
--- a/sys/arm/freescale/imx/std.imx53
+++ b/sys/arm/freescale/imx/std.imx53
@@ -3,6 +3,4 @@ machine		arm	armv7
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-device  	fdt_pinctrl
-
 files "../freescale/imx/files.imx5"
diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6
index 0d57ff5c22e5..1969b7f64de5 100644
--- a/sys/arm/freescale/imx/std.imx6
+++ b/sys/arm/freescale/imx/std.imx6
@@ -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"