svn commit: r329507 - in head/sys: arm/conf modules modules/imx modules/imx/imx_i2c

[Ian Lepore]

Author: ian
Date: Sun Feb 18 02:48:54 2018
New Revision: 329507
URL: https://svnweb.freebsd.org/changeset/base/329507

Log:
  Build modules specific to imx5/imx6 only when building those kernels.
  
  This adds sys/modules/imx with a SUBDIR makefile to make the whole
  collection of modules that are specific to these SoCs.  Initially, that
  "whole collection" consists of the if_ffec and imx_i2c drivers.
  
  The if_ffec driver is referenced in its existing home in ../ffec rather
  than moving it into the imx directory, because it's used by powerpc too,
  but it is no longer built for all armv6/7 systems.
  
  The imx_i2c driver is newly added as a module.

Added:
  head/sys/modules/imx/
  head/sys/modules/imx/Makefile   (contents, props changed)
  head/sys/modules/imx/imx_i2c/
  head/sys/modules/imx/imx_i2c/Makefile   (contents, props changed)
Modified:
  head/sys/arm/conf/IMX53
  head/sys/arm/conf/IMX6
  head/sys/modules/Makefile

Modified: head/sys/arm/conf/IMX53
==============================================================================
--- head/sys/arm/conf/IMX53	Sun Feb 18 02:01:41 2018	(r329506)
+++ head/sys/arm/conf/IMX53	Sun Feb 18 02:48:54 2018	(r329507)
@@ -117,6 +117,6 @@ device		wlan_amrr		# AMRR transmit rate control algori
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
-makeoptions	MODULES_EXTRA=dtb/imx5
+makeoptions	MODULES_EXTRA="dtb/imx5 imx"
 
 options 	INTRNG

Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6	Sun Feb 18 02:01:41 2018	(r329506)
+++ head/sys/arm/conf/IMX6	Sun Feb 18 02:48:54 2018	(r329507)
@@ -117,7 +117,7 @@ device		hdmi
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
-makeoptions	MODULES_EXTRA=dtb/imx6
+makeoptions	MODULES_EXTRA="dtb/imx6 imx"
 
 # SoC-specific devices
 device		ffec			# Freescale Fast Ethernet Controller

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Sun Feb 18 02:01:41 2018	(r329506)
+++ head/sys/modules/Makefile	Sun Feb 18 02:48:54 2018	(r329507)
@@ -813,10 +813,6 @@ _bcm283x_clkman=  bcm283x_clkman
 _bcm283x_pwm=  bcm283x_pwm
 .endif
 
-.if ${MACHINE_ARCH:Marmv[67]*} != ""
-_ffec=		ffec
-.endif
-
 SUBDIR+=${MODULES_EXTRA}
 
 .for reject in ${WITHOUT_MODULES}

Added: head/sys/modules/imx/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/modules/imx/Makefile	Sun Feb 18 02:48:54 2018	(r329507)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+# Build modules specific to freescale/nxp imx-family SoCs.
+
+SUBDIR = \
+	../ffec \
+	imx_i2c \
+	
+.include <bsd.subdir.mk>

Added: head/sys/modules/imx/imx_i2c/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/modules/imx/imx_i2c/Makefile	Sun Feb 18 02:48:54 2018	(r329507)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/arm/freescale/imx
+
+KMOD=	imx_i2c
+SRCS=	imx_i2c.c
+
+SRCS+=	\
+	bus_if.h \
+	device_if.h \
+	iicbus_if.h \
+	ofw_bus_if.h \
+	opt_platform.h \
+
+.include <bsd.kmod.mk>