svn commit: r346305 - in head/sys/arm: allwinner conf
Emmanuel Vadot
manu at FreeBSD.org
Tue Sep 3 14:07:51 UTC 2019
Author: manu
Date: Tue Apr 16 22:42:50 2019
New Revision: 346305
URL: https://svnweb.freebsd.org/changeset/base/346305
Log:
arm: allwinner: Makes more device optional
MFC after: 2 weeks
Modified:
head/sys/arm/allwinner/files.allwinner
head/sys/arm/conf/GENERIC
Modified: head/sys/arm/allwinner/files.allwinner
==============================================================================
--- head/sys/arm/allwinner/files.allwinner Tue Apr 16 21:09:57 2019 (r346304)
+++ head/sys/arm/allwinner/files.allwinner Tue Apr 16 22:42:50 2019 (r346305)
@@ -2,10 +2,10 @@
arm/allwinner/a10_ahci.c optional ahci
arm/allwinner/a10_codec.c optional sound
-arm/allwinner/a10_dmac.c standard
-arm/allwinner/a31_dmac.c standard
+arm/allwinner/a10_dmac.c optional a10_dmac
+arm/allwinner/a31_dmac.c optional a31_dmac
arm/allwinner/a10_ehci.c optional ehci
-arm/allwinner/a10_sramc.c standard
+arm/allwinner/a10_sramc.c optional SOC_ALLWINNER_A10
arm/allwinner/aw_gpio.c optional gpio
arm/allwinner/aw_if_dwc.c optional dwc
arm/allwinner/aw_machdep.c standard
@@ -13,21 +13,21 @@ arm/allwinner/aw_mmc.c optional mmc | mmccam
arm/allwinner/aw_mp.c optional smp
arm/allwinner/aw_nmi.c optional intrng
arm/allwinner/aw_rsb.c optional rsb | p2wi
-arm/allwinner/aw_rtc.c standard
+arm/allwinner/aw_rtc.c optional aw_rtc
arm/allwinner/aw_syscon.c optional ext_resources syscon
-arm/allwinner/aw_ts.c standard
+arm/allwinner/aw_ts.c optional aw_thermal
arm/allwinner/aw_usbphy.c optional ehci | ohci
-arm/allwinner/aw_wdog.c standard
+arm/allwinner/aw_wdog.c optional aw_wdog
arm/allwinner/axp209.c optional axp209
arm/allwinner/axp81x.c optional axp81x
arm/allwinner/if_awg.c optional awg ext_resources syscon
arm/allwinner/if_emac.c optional emac
-arm/allwinner/sunxi_dma_if.m standard
+arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac
dev/iicbus/twsi/a10_twsi.c optional twsi
dev/usb/controller/generic_ohci.c optional ohci
dev/usb/controller/generic_usb_if.m optional ohci
-arm/allwinner/aw_sid.c standard
-arm/allwinner/aw_thermal.c standard
+arm/allwinner/aw_sid.c optional aw_sid
+arm/allwinner/aw_thermal.c optional aw_thermal
dev/iicbus/sy8106a.c optional sy8106a
arm/allwinner/aw_cir.c optional aw_cir evdev
Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC Tue Apr 16 21:09:57 2019 (r346304)
+++ head/sys/arm/conf/GENERIC Tue Apr 16 22:42:50 2019 (r346305)
@@ -181,6 +181,7 @@ device ti_adc
# watchdog.
device ti_wdt
device imxwdt # Watchdog. WARNING: can't be disabled!!!
+device aw_wdog # Allwinner Watchdog
device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
@@ -253,6 +254,8 @@ device ti_mbox
# DMA controller
device fslsdma
device ti_sdma
+device a10_dmac
+device a31_dmac
# Extensible Firmware Interface
options EFI
@@ -262,8 +265,15 @@ device cesa
device crypto
device cryptodev
-# imx6 on-chip RTC
-device imx6_snvs # On-chip RTC
+# RTC
+device imx6_snvs # IMX6 On-chip RTC
+device aw_rtc # Allwinner On-chip RTC
+
+# EFUSE
+device aw_sid # Allwinner Secure ID EFUSE
+
+# Thermal sensors
+device aw_thermal # Allwinner Thermal Sensor Controller
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
More information about the svn-src-all
mailing list