summaryrefslogtreecommitdiffstats
path: root/sys/arm/conf
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-11-02 10:45:19 -0200
committerRenato Botelho <renato@netgate.com>2016-11-02 10:45:19 -0200
commit841f35badba9e12f94b576f843daf49955da85fa (patch)
tree637fcf5764747ea0ed464f94cb59da330f03d629 /sys/arm/conf
parent02fa2d6083daaf327638f8e0fb9aa0be9bff743a (diff)
parent0f6aead99b2a420a730d47a074145dcb7d0f6721 (diff)
downloadFreeBSD-src-841f35badba9e12f94b576f843daf49955da85fa.zip
FreeBSD-src-841f35badba9e12f94b576f843daf49955da85fa.tar.gz
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/arm/conf')
-rw-r--r--sys/arm/conf/BEAGLEBONE3
-rw-r--r--sys/arm/conf/RPI-B2
-rw-r--r--sys/arm/conf/RPI22
3 files changed, 5 insertions, 2 deletions
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 312659b..be6a98f 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -133,3 +133,6 @@ device hdmi
device ums
device ukbd
device kbdmux
+
+# Uncomment to enable evdev support for ti_adc
+# options EVDEV_SUPPORT
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 58d05ca..5e8aee2 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -94,4 +94,4 @@ options FDT # Configure using FDT/DTB data
# handed to kernel via U-Boot and ubldr.
#options FDT_DTB_STATIC
#makeoptions FDT_DTS_FILE=rpi.dts
-makeoptions MODULES_EXTRA=dtb/rpi
+makeoptions MODULES_EXTRA="dtb/rpi rpi_ft5406"
diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2
index 75e1b7e..82293ad 100644
--- a/sys/arm/conf/RPI2
+++ b/sys/arm/conf/RPI2
@@ -98,4 +98,4 @@ options FDT # Configure using FDT/DTB data
# handed to kernel via U-Boot and ubldr.
#options FDT_DTB_STATIC
#makeoptions FDT_DTS_FILE=rpi2.dts
-makeoptions MODULES_EXTRA=dtb/rpi
+makeoptions MODULES_EXTRA="dtb/rpi rpi_ft5406"
OpenPOWER on IntegriCloud