aboutsummaryrefslogtreecommitdiff
path: root/sys/arm/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arm/conf')
-rw-r--r--sys/arm/conf/SOCDK30
-rw-r--r--sys/arm/conf/SOCFPGA (renamed from sys/arm/conf/SOCKIT.common)7
-rw-r--r--sys/arm/conf/SOCKIT6
-rw-r--r--sys/arm/conf/SOCKIT-BERI6
4 files changed, 41 insertions, 8 deletions
diff --git a/sys/arm/conf/SOCDK b/sys/arm/conf/SOCDK
new file mode 100644
index 000000000000..acdf4f341412
--- /dev/null
+++ b/sys/arm/conf/SOCDK
@@ -0,0 +1,30 @@
+#
+# Kernel configuration for Altera Arria10 SOC Development Kit.
+#
+# 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$
+
+#NO_UNIVERSE
+
+include "SOCFPGA"
+ident SOCDK
+
+options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
+
+# Flattened Device Tree
+options FDT_DTB_STATIC
+makeoptions FDT_DTS_FILE=socfpga_arria10_socdk_sdmmc.dts
diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCFPGA
index 5ff60a8ef7a4..812e1cf28e8b 100644
--- a/sys/arm/conf/SOCKIT.common
+++ b/sys/arm/conf/SOCFPGA
@@ -1,5 +1,5 @@
#
-# Kernel configuration for Terasic SoCKit (Altera Cyclone V SoC).
+# Kernel configuration for Altera SOCFPGA development kits.
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
@@ -18,6 +18,7 @@
#
# $FreeBSD$
+ident SOCFPGA
include "std.armv6"
include "../altera/socfpga/std.socfpga"
@@ -29,6 +30,7 @@ options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
options PLATFORM_SMP
options SMP # Enable multiple cores
+options MULTIDELAY
# NFS root from boopt/dhcp
#options BOOTP
@@ -60,7 +62,6 @@ device gpio
# USB support
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
device usb
-#device musb
device dwcotg
device umass
@@ -70,7 +71,7 @@ device pass
# Serial ports
device uart
-device uart_ns8250
+device uart_snps
# I2C (TWSI)
device iic
diff --git a/sys/arm/conf/SOCKIT b/sys/arm/conf/SOCKIT
index 656ce094c90e..a40cf5bacd99 100644
--- a/sys/arm/conf/SOCKIT
+++ b/sys/arm/conf/SOCKIT
@@ -20,11 +20,11 @@
#NO_UNIVERSE
+include "SOCFPGA"
ident SOCKIT
-include "SOCKIT.common"
-options ROOTDEVNAME=\"ufs:/dev/da0\"
+options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
# Flattened Device Tree
options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=socfpga-sockit.dts
+makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_sdmmc.dts
diff --git a/sys/arm/conf/SOCKIT-BERI b/sys/arm/conf/SOCKIT-BERI
index 4367ceb10c90..70cdd91d4cc8 100644
--- a/sys/arm/conf/SOCKIT-BERI
+++ b/sys/arm/conf/SOCKIT-BERI
@@ -18,8 +18,10 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
+include "SOCFPGA"
ident SOCKIT-BERI
-include "SOCKIT.common"
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s4\"
@@ -32,4 +34,4 @@ device altera_pio
# Flattened Device Tree
options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=socfpga-sockit-beri.dts
+makeoptions FDT_DTS_FILE=socfpga_cyclone5_sockit_beri_sdmmc.dts