Index: sys/arm/conf/GENERIC
===================================================================
--- sys/arm/conf/GENERIC
+++ sys/arm/conf/GENERIC
@@ -29,37 +29,13 @@
 options 	KERNVIRTADDR=0xc0000000
 
 include 	"std.armv7"
-files		"../allwinner/files.allwinner"
-files		"../allwinner/files.allwinner_up"
-files		"../allwinner/a10/files.a10"
-files		"../allwinner/a13/files.a13"
-files		"../allwinner/a20/files.a20"
-files		"../allwinner/a31/files.a31"
-files		"../allwinner/a33/files.a33"
-files		"../allwinner/a83t/files.a83t"
-files		"../allwinner/h3/files.h3"
-files		"../broadcom/bcm2835/files.bcm2836"
-files		"../broadcom/bcm2835/files.bcm283x"
-files		"../freescale/imx/files.imx6"
-files		"../nvidia/tegra124/files.tegra124"
-files		"../qemu/files.qemu"
-files		"../ti/files.ti"
-files		"../ti/am335x/files.am335x"
-files		"../ti/omap4/files.omap4"
-files		"../xilinx/files.zynq7"
-
-options 	SOC_ALLWINNER_A10
-options 	SOC_ALLWINNER_A13
-options 	SOC_ALLWINNER_A20
-options 	SOC_ALLWINNER_A31
-options 	SOC_ALLWINNER_A31S
-options 	SOC_ALLWINNER_A33
-options 	SOC_ALLWINNER_A83T
-options 	SOC_ALLWINNER_H2PLUS
-options 	SOC_ALLWINNER_H3
-options 	SOC_BCM2836
-options		SOC_TI_AM335X
-options		SOC_OMAP4
+include 	"std.allwinner"
+include 	"std.broadcom"
+include 	"std.freescale"
+include 	"std.nvidia"
+include 	"std.qemu"
+include 	"std.ti"
+include 	"std.xilinx"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
@@ -127,21 +103,8 @@
 # I2C support
 device		iicbus
 device		iic
-device		twsi
-device		rsb			# Allwinner Reduced Serial Bus
-device		p2wi			# Allwinner Push-Pull Two Wire
-device		axp209			# AXP209 Power Management Unit
-device		axp81x			# AXP813/818 Power Management Unit
-device		bcm2835_bsc
-device		fsliic			# Freescale i2c/iic
 device		icee			# AT24Cxxx and compatible EEPROMs
 device		sy8106a			# SY8106A Buck Regulator
-device		ti_i2c
-device		am335x_pmic		# AM335x Power Management IC (TPC65217)
-device		am335x_rtc		# RTC support (power management only)
-device		twl			# TI TWLX0X0/TPS659x0 Power Management
-device		twl_vreg		# twl voltage regulation
-device		twl_clks		# twl external clocks
 
 # i2c RTCs
 device		ds1307			# Dallas DS1307 RTC and compatible
@@ -161,23 +124,10 @@
 device		evdev			# input event device support
 options		EVDEV_SUPPORT		# evdev support in legacy drivers
 device		uinput			# install /dev/uinput cdev
-device		aw_cir
 
 # SPI
 device		spibus
 device		spigen
-device		bcm2835_spi
-device		ti_spi
-
-# ADC support
-device		ti_adc
-
-# Watchdog support
-# If we don't enable the watchdog driver, the BealeBone could potentially
-# reboot automatically because the boot loader might have enabled the
-# watchdog.
-device		ti_wdt
-device		imxwdt			# Watchdog. WARNING: can't be disabled!!!
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
@@ -211,14 +161,6 @@
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus
 
-device		awg			# 10/100/1000 integrated EMAC controller
-device		cpsw			# TI Common Platform Ethernet Switch (CPSW)
-device		cgem			# Zynq-7000 gig ethernet device
-device		dwc			# 10/100/1000 integrated GMAC controller
-device		emac			# 10/100 integrated EMAC controller
-device		ffec			# Freescale Fast Ethernet Controller
-device		smsc			# SMSC LAN91C111
-
 # Sound support
 device		sound
 
@@ -228,24 +170,12 @@
 device		ums
 device		videomode
 device		hdmi
-device		vchiq
 
 # Pinmux
 device		fdt_pinctrl
 
-# TI Programmable Realtime Unit support
-device		ti_pruss
-
-# Mailbox support
-device		ti_mbox
-
-# DMA controller
-device		fslsdma
-device		ti_sdma
-
 # Extensible Firmware Interface
 options 	EFI
 
 # 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"
Index: sys/arm/conf/std.allwinner
===================================================================
--- /dev/null
+++ sys/arm/conf/std.allwinner
@@ -0,0 +1,36 @@
+files		"../allwinner/files.allwinner"
+files		"../allwinner/files.allwinner_up"
+files		"../allwinner/a10/files.a10"
+files		"../allwinner/a13/files.a13"
+files		"../allwinner/a20/files.a20"
+files		"../allwinner/a31/files.a31"
+files		"../allwinner/a33/files.a33"
+files		"../allwinner/a83t/files.a83t"
+files		"../allwinner/h3/files.h3"
+
+options 	SOC_ALLWINNER_A10
+options 	SOC_ALLWINNER_A13
+options 	SOC_ALLWINNER_A20
+options 	SOC_ALLWINNER_A31
+options 	SOC_ALLWINNER_A31S
+options 	SOC_ALLWINNER_A33
+options 	SOC_ALLWINNER_A83T
+options 	SOC_ALLWINNER_H2PLUS
+options 	SOC_ALLWINNER_H3
+
+# I2C support
+device		twsi			# Allwinner I2C
+device		rsb			# Allwinner Reduced Serial Bus
+device		p2wi			# Allwinner Push-Pull Two Wire
+device		axp209			# AXP209 Power Management Unit
+device		axp81x			# AXP813/818 Power Management Unit
+
+# EVDEV support
+device		aw_cir
+
+# Ethernet NICs
+device		awg			# 10/100/1000 integrated EMAC controller
+device		dwc			# 10/100/1000 integrated GMAC controller
+device		emac			# 10/100 integrated EMAC controller
+
+makeoptions	MODULES_EXTRA+="dtb/allwinner"
Index: sys/arm/conf/std.broadcom
===================================================================
--- /dev/null
+++ sys/arm/conf/std.broadcom
@@ -0,0 +1,15 @@
+files		"../broadcom/bcm2835/files.bcm2836"
+files		"../broadcom/bcm2835/files.bcm283x"
+
+options 	SOC_BCM2836
+
+# I2C support
+device		bcm2835_bsc
+
+# SPI Support
+device		bcm2835_spi
+
+# Framebuffer support
+device		vchiq
+
+makeoptions	MODULES_EXTRA+="dtb/rpi"
Index: sys/arm/conf/std.freescale
===================================================================
--- /dev/null
+++ sys/arm/conf/std.freescale
@@ -0,0 +1,15 @@
+files		"../freescale/imx/files.imx6"
+
+# I2C Support
+device		fsliic			# Freescale i2c/iic
+
+# Watchdog support
+device		imxwdt			# Watchdog. WARNING: can't be disabled!!!
+
+# Ethernet NICs
+device		ffec			# Freescale Fast Ethernet Controller
+
+# DMA controller
+device		fslsdma
+
+makeoptions	MODULES_EXTRA+="dtb/imx6"
Index: sys/arm/conf/std.nvidia
===================================================================
--- /dev/null
+++ sys/arm/conf/std.nvidia
@@ -0,0 +1,3 @@
+files		"../nvidia/tegra124/files.tegra124"
+
+makeoptions	MODULES_EXTRA+="dtb/nvidia"
Index: sys/arm/conf/std.qemu
===================================================================
--- /dev/null
+++ sys/arm/conf/std.qemu
@@ -0,0 +1 @@
+files		"../qemu/files.qemu"
Index: sys/arm/conf/std.ti
===================================================================
--- /dev/null
+++ sys/arm/conf/std.ti
@@ -0,0 +1,42 @@
+files		"../ti/files.ti"
+files		"../ti/am335x/files.am335x"
+files		"../ti/omap4/files.omap4"
+
+options		SOC_TI_AM335X
+options		SOC_OMAP4
+
+# I2C Support
+device		ti_i2c
+device		am335x_pmic		# AM335x Power Management IC (TPC65217)
+device		am335x_rtc		# RTC support (power management only)
+device		twl			# TI TWLX0X0/TPS659x0 Power Management
+device		twl_vreg		# twl voltage regulation
+device		twl_clks		# twl external clocks
+
+# SPI Support
+device		ti_spi
+
+# ADC support
+device		ti_adc
+
+# Watchdog support
+# If we don't enable the watchdog driver, the BealeBone could potentially
+# reboot automatically because the boot loader might have enabled the
+# watchdog.
+device		ti_wdt
+
+# Ethernet NICs
+device		cpsw			# TI Common Platform Ethernet Switch (CPSW)
+device		cgem			# Zynq-7000 gig ethernet device
+device		smsc			# SMSC LAN91C111
+
+# TI Programmable Realtime Unit support
+device		ti_pruss
+
+# Mailbox support
+device		ti_mbox
+
+# DMA controller
+device		ti_sdma
+
+makeoptions	MODULES_EXTRA+="dtb/am335x dtb/omap4"
Index: sys/arm/conf/std.xilinx
===================================================================
--- /dev/null
+++ sys/arm/conf/std.xilinx
@@ -0,0 +1,3 @@
+files		"../xilinx/files.zynq7"
+
+makeoptions	MODULES_EXTRA+="dtb/zynq"