aboutsummaryrefslogtreecommitdiff
path: root/sys/arm/conf/GENERIC
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arm/conf/GENERIC')
-rw-r--r--sys/arm/conf/GENERIC13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 26b0c7bf0294..b0a2eb92554b 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -100,7 +100,7 @@ device pci
device pci_host_generic
# PCI NICs
-device re # RealTek 8139C+/8169/8169S/8110S
+device re # Realtek 8139C+/8169/8169S/8110S
# VirtIO
device virtio
@@ -216,6 +216,12 @@ device ffec # Freescale Fast Ethernet Controller
device neta # Marvell 10/100/1000 Network controller
device smsc # SMSC LAN91C111
+# random(4)
+device tpm # Trusted Platform Module
+options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0
+options RANDOM_ENABLE_KBD
+options RANDOM_ENABLE_MOUSE
+
# Sound support
device sound
@@ -261,7 +267,6 @@ device aw_thermal # Allwinner Thermal Sensor Controller
# HID support
device hid # Generic HID support
device hidbus # Generic HID Bus
-options U2F_MAKE_UHID_ALIAS # install /dev/uhid alias for /dev/u2f/
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
@@ -271,7 +276,3 @@ makeoptions MODULES_EXTRA+="dtb/nvidia"
makeoptions MODULES_EXTRA+="dtb/rockchip"
makeoptions MODULES_EXTRA+="dtb/rpi"
makeoptions MODULES_EXTRA+="dtb/zynq"
-
-# SOC-specific modules
-makeoptions MODULES_EXTRA+="allwinner"
-makeoptions MODULES_EXTRA+="imx"