diff --git a/sys/arm/amlogic/aml8726/std.odroidc1 b/sys/arm/amlogic/aml8726/std.odroidc1
deleted file mode 100644
index 7d20ad3d126e..000000000000
--- a/sys/arm/amlogic/aml8726/std.odroidc1
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-include		"../amlogic/aml8726/std.aml8726"
-
-makeoptions	FDT_DTS_FILE=odroidc1.dts
-
-options		SMP				# Enable multiple cores
diff --git a/sys/arm/amlogic/aml8726/std.vsatv102-m6 b/sys/arm/amlogic/aml8726/std.vsatv102-m6
deleted file mode 100644
index 6e9d1918d35a..000000000000
--- a/sys/arm/amlogic/aml8726/std.vsatv102-m6
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-include		"../amlogic/aml8726/std.aml8726"
-
-makeoptions	FDT_DTS_FILE=vsatv102-m6.dts
-
-options		SMP				# Enable multiple cores
diff --git a/sys/arm/conf/ODROIDC1 b/sys/arm/conf/ODROIDC1
index f0f5ec4af3bf..b74a31096fe7 100644
--- a/sys/arm/conf/ODROIDC1
+++ b/sys/arm/conf/ODROIDC1
@@ -19,7 +19,7 @@
 
 ident		ODROIDC1
 
-include 	"../amlogic/aml8726/std.odroidc1"
+include 	"../amlogic/aml8726/std.aml8726"
 
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
@@ -56,6 +56,7 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	LINUX_BOOT_ABI
 options 	VFP			# Enable floating point hardware support
+options 	SMP			# Enable multiple cores
 
 # Debugging
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
@@ -141,3 +142,4 @@ device		axe			# ASIX Electronics USB Ethernet
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=odroidc1.dts
diff --git a/sys/arm/conf/VSATV102 b/sys/arm/conf/VSATV102
index 68e3bcd21265..3a44cee1ac98 100644
--- a/sys/arm/conf/VSATV102
+++ b/sys/arm/conf/VSATV102
@@ -19,7 +19,7 @@
 
 ident		ODROIDC1
 
-include 	"../amlogic/aml8726/std.vsatv102-m6"
+include 	"../amlogic/aml8726/std.aml8726"
 
 options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
@@ -56,6 +56,7 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	LINUX_BOOT_ABI
 options 	VFP			# Enable floating point hardware support
+options		SMP				# Enable multiple cores
 
 # Debugging
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
@@ -141,3 +142,4 @@ device		axe			# ASIX Electronics USB Ethernet
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=vsatv102-m6.dts