diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/a10/files.a10
similarity index 73%
rename from sys/arm/allwinner/files.a10
rename to sys/arm/allwinner/a10/files.a10
index e7fd8d7705e..988b2eb152e 100644
--- a/sys/arm/allwinner/files.a10
+++ b/sys/arm/allwinner/a10/files.a10
@@ -2,4 +2,3 @@
 
 arm/allwinner/a10/a10_intc.c		standard
 arm/allwinner/a10_padconf.c		standard
-arm/allwinner/timer.c			standard
diff --git a/sys/arm/allwinner/files.allwinner_up b/sys/arm/allwinner/files.allwinner_up
new file mode 100644
index 00000000000..d90f99d53bc
--- /dev/null
+++ b/sys/arm/allwinner/files.allwinner_up
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+arm/allwinner/timer.c			standard
diff --git a/sys/arm/allwinner/std.a10 b/sys/arm/allwinner/std.allwinner_up
similarity index 66%
rename from sys/arm/allwinner/std.a10
rename to sys/arm/allwinner/std.allwinner_up
index b3770f8c9fc..6294cd0b461 100644
--- a/sys/arm/allwinner/std.a10
+++ b/sys/arm/allwinner/std.allwinner_up
@@ -1,4 +1,4 @@
-# Allwinner A10 common options
+# Allwinner Uniprocessor common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
@@ -8,6 +8,7 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
+files		"../allwinner/files.allwinner_up"
 files		"../allwinner/files.allwinner"
-files		"../allwinner/files.a10"
+files		"../allwinner/a10/files.a10"
 files		"../allwinner/a13/files.a13"
diff --git a/sys/arm/conf/A10 b/sys/arm/conf/ALLWINNER_UP
similarity index 94%
rename from sys/arm/conf/A10
rename to sys/arm/conf/ALLWINNER_UP
index 9939bc69aeb..68c20a64f63 100644
--- a/sys/arm/conf/A10
+++ b/sys/arm/conf/ALLWINNER_UP
@@ -1,5 +1,5 @@
 #
-# A10 -- Custom configuration for the AllWinner A10 SoC
+# ALLWINNER_UP -- Custom configuration for the AllWinner Uniprocessor SoC
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
@@ -18,10 +18,10 @@
 #
 # $FreeBSD$
 
-ident		A10
+ident		ALLWINNER_UP
 
 include 	"std.armv6"
-include 	"../allwinner/std.a10"
+include 	"../allwinner/std.allwinner_up"
 
 options 	INTRNG