MFC r304316:

Rename kernel config A10 into ALLWINNER_UP as it is intend to work with all
Allwinner Uniprocessor SoC.
As of now it works with A10 and A13 (and possibly R8 as it is the same as the A13).
Move files.a10 into a1o subdirectory as it should be.
Rename std.a10 into std.allwinner_up

4 files changed, 115 insertions, 3 deletions

diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/a10/files.a10
index e7fd8d7..988b2eb 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 0000000..d90f99d
--- /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
index b3770f8..6294cd0 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/ALLWINNER_UP b/sys/arm/conf/ALLWINNER_UP
new file mode 100644
index 0000000..68c20a6
--- /dev/null
+++ b/sys/arm/conf/ALLWINNER_UP
@@ -0,0 +1,109 @@
+#
+# 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:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+ident		ALLWINNER_UP
+
+include 	"std.armv6"
+include 	"../allwinner/std.allwinner_up"
+
+options 	INTRNG
+
+options 	SOC_ALLWINNER_A10
+options 	SOC_ALLWINNER_A13
+
+options 	SCHED_4BSD		# 4BSD scheduler
+options 	PLATFORM
+options 	MULTIDELAY
+
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=emac0
+
+# EXT_RESOURCES pseudo devices
+options		EXT_RESOURCES
+device		clk
+device		phy
+device		hwreset
+device		regulator
+
+# MMC/SD/SDIO Card slot support
+device		mmc			# mmc/sd bus
+device		mmcsd			# mmc/sd flash cards
+
+# ATA controllers
+device		ahci			# AHCI-compatible SATA controllers
+#device		ata			# Legacy ATA/SATA controllers
+
+# Console and misc
+device		uart
+device		uart_snps
+device		pty
+device		snp
+device		md
+device		random			# Entropy device
+
+# I2C support
+device		iicbus
+device		iic
+device		twsi
+device		axp209			# AXP209 Power Management Unit
+
+device		pcf8563			# RTC
+
+# GPIO
+device		gpio
+device		gpioled
+
+device		scbus			# SCSI bus (required for ATA/SCSI)
+device		da			# Direct Access (disks)
+device		pass			# Passthrough device (direct ATA/SCSI access)
+
+# USB support
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
+device		usb
+#device		uhci
+device		ohci
+device		ehci
+
+device		umass
+
+# Ethernet
+device		loop
+device		ether
+device		mii
+device		bpf
+
+device		emac
+
+# USB ethernet support, requires miibus
+device		miibus
+
+# Sound support
+device		sound
+
+# Pinmux
+device		fdt_pinctrl
+
+# Flattened Device Tree
+options 	FDT			# Configure using FDT/DTB data
+makeoptions	MODULES_EXTRA=dtb/allwinner