svn commit: r279825 - head/sys/arm/conf

[Ian Lepore]

Author: ian
Date: Mon Mar  9 21:54:27 2015
New Revision: 279825
URL: https://svnweb.freebsd.org/changeset/base/279825

Log:
  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.
  
  PR:		198460

Modified:
  head/sys/arm/conf/BEAGLEBONE

Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE	Mon Mar  9 21:50:10 2015	(r279824)
+++ head/sys/arm/conf/BEAGLEBONE	Mon Mar  9 21:54:27 2015	(r279825)
@@ -25,13 +25,13 @@ ident		BEAGLEBONE
 
 include		"../ti/am335x/std.am335x"
 
-makeoptions	WITHOUT_MODULES="ahc"
+makeoptions	MODULES_EXTRA="dtb/am335x"
 
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
 makeoptions	WITH_CTF=1
-makeoptions	MODULES_EXTRA="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt"
+makeoptions	MODULES_EXTRA+="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
@@ -165,5 +165,3 @@ device		usfs
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
-options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=beaglebone.dts