svn commit: r284096 - in stable/10/sys: arm/conf modules/dtb/am335x

[Ian Lepore]

Author: ian
Date: Sat Jun  6 19:15:48 2015
New Revision: 284096
URL: https://svnweb.freebsd.org/changeset/base/284096

Log:
  MFC r279824, r279827, r279825:
  
    Add a dtb module for AM335x systems (just Beaglebone right now).
  
    Remove the static DTB config and instead build modules/dtb/am335x.
  
    Also, remove WITHOUT_MODULES="ahc" which was added long ago to work
    around build problems that have long since been fixed correctly.
  
    Revert accidentally commited modules/Makefile file from r279824.

Added:
  stable/10/sys/modules/dtb/am335x/
     - copied from r279824, head/sys/modules/dtb/am335x/
Modified:
  stable/10/sys/arm/conf/BEAGLEBONE
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/BEAGLEBONE
==============================================================================
--- stable/10/sys/arm/conf/BEAGLEBONE	Sat Jun  6 19:15:08 2015	(r284095)
+++ stable/10/sys/arm/conf/BEAGLEBONE	Sat Jun  6 19:15:48 2015	(r284096)
@@ -25,7 +25,7 @@ ident		BEAGLEBONE
 
 include		"../ti/am335x/std.am335x"
 
-makeoptions	WITHOUT_MODULES="ahc"
+makeoptions	MODULES_EXTRA="dtb/am335x"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -158,5 +158,3 @@ device		usfs
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
-options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=beaglebone.dts