Index: sys/arm/conf/GENERIC
===================================================================
--- sys/arm/conf/GENERIC
+++ sys/arm/conf/GENERIC
@@ -20,14 +20,6 @@
 
 ident		GENERIC
 
-cpu		CPU_CORTEXA
-options 	SMP_ON_UP
-machine 	arm armv7
-makeoptions	CONF_CFLAGS="-march=armv7a"
-
-makeoptions	KERNVIRTADDR=0xc0000000
-options 	KERNVIRTADDR=0xc0000000
-
 include 	"std.armv7"
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.allwinner_up"
@@ -61,11 +53,6 @@
 options		SOC_TI_AM335X
 options		SOC_OMAP4
 
-options 	SCHED_ULE		# ULE scheduler
-options 	SMP			# Enable multiple cores
-options 	PLATFORM
-options 	LINUX_BOOT_ABI
-
 # EXT_RESOURCES pseudo devices
 options 	EXT_RESOURCES
 device		clk
@@ -77,7 +64,6 @@
 device		cpufreq
 
 # Interrupt controller
-options 	INTRNG
 device		gic
 
 # PMU support (for CCNT).
@@ -243,9 +229,4 @@
 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.armv7
===================================================================
--- sys/arm/conf/std.armv7
+++ sys/arm/conf/std.armv7
@@ -2,6 +2,19 @@
 #
 # $FreeBSD$
 
+cpu		CPU_CORTEXA
+options 	SMP_ON_UP
+machine 	arm armv7
+makeoptions	CONF_CFLAGS="-march=armv7a"
+
+makeoptions	KERNVIRTADDR=0xc0000000
+options 	KERNVIRTADDR=0xc0000000
+
+options 	SCHED_ULE		# ULE scheduler
+options 	SMP			# Enable multiple cores
+options 	PLATFORM
+options 	LINUX_BOOT_ABI
+
 options 	HZ=1000
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -78,3 +91,11 @@
 #options 	USB_VERBOSE
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
 
+# Extensible Firmware Interface
+options 	EFI
+
+# Flattened Device Tree
+options 	FDT			# Configure using FDT/DTB data
+
+# Interrupt controller
+options 	INTRNG