summaryrefslogtreecommitdiffstats
path: root/sys/arm/conf
diff options
context:
space:
mode:
authorjmcneill <jmcneill@FreeBSD.org>2016-04-21 16:49:04 +0000
committerjmcneill <jmcneill@FreeBSD.org>2016-04-21 16:49:04 +0000
commitc253d598f3865b355a1db4e309624c779e9ed186 (patch)
treecf73e4e6c54998fef470c5a975c9d7c23884d6c5 /sys/arm/conf
parent4ce3b8fcffb6da6e46855dd89507e97b7c87873d (diff)
downloadFreeBSD-src-c253d598f3865b355a1db4e309624c779e9ed186.zip
FreeBSD-src-c253d598f3865b355a1db4e309624c779e9ed186.tar.gz
Replace the A20 kernel config with a generic ALLWINNER kernel config that
supports A20, A31, and A31S. Adds support for the BananaPi M2 (A31S) board. Submitted by: Emmanuel Vadot <manu@bidouilliste.com> Reviewed by: jmcneill Differential Revision: https://reviews.freebsd.org/D5580
Diffstat (limited to 'sys/arm/conf')
-rw-r--r--sys/arm/conf/ALLWINNER (renamed from sys/arm/conf/A20)16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/arm/conf/A20 b/sys/arm/conf/ALLWINNER
index f28080c..dc62ccd 100644
--- a/sys/arm/conf/A20
+++ b/sys/arm/conf/ALLWINNER
@@ -1,5 +1,5 @@
#
-# A20 -- Custom configuration for the Allwinner A20 ARM SoC
+# ALLWINNER -- Custom configuration for the Allwinner A20 and A31 ARM SoC
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
@@ -18,14 +18,16 @@
#
# $FreeBSD$
-ident A20
+ident ALLWINNER
include "std.armv6"
-include "../allwinner/a20/std.a20"
+include "../allwinner/std.allwinner"
options INTRNG
options SOC_ALLWINNER_A20
+options SOC_ALLWINNER_A31
+options SOC_ALLWINNER_A31S
options HZ=100
options SCHED_ULE # ULE scheduler
@@ -56,7 +58,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options BOOTP_WIRED_TO=dwc0
# EXT_RESOURCES pseudo devices
-options EXT_RESOURCES
+options EXT_RESOURCES
device clk
device phy
device hwreset
@@ -125,9 +127,6 @@ device miibus
# Sound support
device sound
-# Pinmux
-device fdt_pinctrl
-
# Framebuffer support
device vt
device kbdmux
@@ -136,6 +135,9 @@ device ukbd
device videomode
device hdmi
+# Pinmux
+device fdt_pinctrl
+
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
makeoptions MODULES_EXTRA=dtb/allwinner
OpenPOWER on IntegriCloud