Date: Sat, 6 Jun 2015 18:49:03 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284094 - in stable/10/sys: arm/conf modules modules/dtb/imx6 modules/dtb/rpi Message-ID: <201506061849.t56In3of003978@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sat Jun 6 18:49:02 2015 New Revision: 284094 URL: https://svnweb.freebsd.org/changeset/base/284094 Log: MFC r278338, r278340, r278458, r278519: Create a module to install the Raspberry Pi dtb files. Pull in the rpi.dts -> rpi.dtb module (dtb/rpi) and have it install rpi.dtb in /boot/dtb by default. Add a module to build the dtb files for all supported imx6 systems. Remove imx6s-wandboard.dts, there is no such file. Added: stable/10/sys/modules/dtb/imx6/ - copied from r279551, head/sys/modules/dtb/imx6/ stable/10/sys/modules/dtb/rpi/ - copied from r278338, head/sys/modules/dtb/rpi/ Modified: stable/10/sys/arm/conf/IMX6 stable/10/sys/arm/conf/RPI-B stable/10/sys/modules/Makefile stable/10/sys/modules/dtb/imx6/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/conf/IMX6 ============================================================================== --- stable/10/sys/arm/conf/IMX6 Sat Jun 6 18:46:37 2015 (r284093) +++ stable/10/sys/arm/conf/IMX6 Sat Jun 6 18:49:02 2015 (r284094) @@ -153,6 +153,7 @@ device u3g # USB modems # Flattened Device Tree options FDT # Configure using FDT/DTB data +makeoptions MODULES_EXTRA=dtb/imx6 # SoC-specific devices device ffec # Freescale Fast Ethernet Controller Modified: stable/10/sys/arm/conf/RPI-B ============================================================================== --- stable/10/sys/arm/conf/RPI-B Sat Jun 6 18:46:37 2015 (r284093) +++ stable/10/sys/arm/conf/RPI-B Sat Jun 6 18:49:02 2015 (r284094) @@ -138,4 +138,5 @@ options FDT # Configure using FDT/DTB # Note: DTB is normally loaded and modified by RPi boot loader, then # handed to kernel via U-Boot and ubldr. #options FDT_DTB_STATIC -makeoptions FDT_DTS_FILE=rpi.dts +#makeoptions FDT_DTS_FILE=rpi.dts +makeoptions MODULES_EXTRA=dtb/rpi Modified: stable/10/sys/modules/Makefile ============================================================================== --- stable/10/sys/modules/Makefile Sat Jun 6 18:46:37 2015 (r284093) +++ stable/10/sys/modules/Makefile Sat Jun 6 18:49:02 2015 (r284094) @@ -894,6 +894,8 @@ _zfs= zfs SUBDIR=${MODULES_OVERRIDE} .endif +SUBDIR+=${MODULES_EXTRA} + .for reject in ${WITHOUT_MODULES} SUBDIR:= ${SUBDIR:N${reject}} .endfor Modified: stable/10/sys/modules/dtb/imx6/Makefile ============================================================================== --- head/sys/modules/dtb/imx6/Makefile Mon Mar 2 22:12:56 2015 (r279551) +++ stable/10/sys/modules/dtb/imx6/Makefile Sat Jun 6 18:49:02 2015 (r284094) @@ -5,8 +5,7 @@ DTS= \ imx6q-cubox-i.dts \ imx6dl-hummingboard.dts \ imx6q-hummingboard.dts \ - imx6q-wandboard.dts \ imx6dl-wandboard.dts \ - imx6s-wandboard.dts + imx6q-wandboard.dts .include <bsd.dtb.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506061849.t56In3of003978>