svn commit: r323967 - in head/sys/arm: conf freescale/imx

[Andrew Turner]

Author: andrew
Date: Sun Sep 24 09:33:08 2017
New Revision: 323967
URL: https://svnweb.freebsd.org/changeset/base/323967

Log:
  Add i.MX6 and Xilinx to GENERIC.
  
  Merge in the missing devices from the IMX6 and ZEDBOARD kernel configs. The
  Freescale sdma device has been renamed to fslsdma to mark it as a platform
  specific driver.
  
  Reviewed by:	ian
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D11564

Modified:
  head/sys/arm/conf/GENERIC
  head/sys/arm/freescale/imx/files.imx6

Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC	Sun Sep 24 09:05:35 2017	(r323966)
+++ head/sys/arm/conf/GENERIC	Sun Sep 24 09:33:08 2017	(r323967)
@@ -40,11 +40,13 @@ files		"../allwinner/a83t/files.a83t"
 files		"../allwinner/h3/files.h3"
 files		"../broadcom/bcm2835/files.bcm2836"
 files		"../broadcom/bcm2835/files.bcm283x"
+files		"../freescale/imx/files.imx6"
 files		"../nvidia/tegra124/files.tegra124"
 files		"../qemu/files.qemu"
 files		"../ti/files.ti"
 files		"../ti/am335x/files.am335x"
 files		"../ti/omap4/files.omap4"
+files		"../xilinx/files.zynq7"
 
 options 	SOC_ALLWINNER_A10
 options 	SOC_ALLWINNER_A13
@@ -116,6 +118,7 @@ device		pty
 device		snp
 device		md			# Memory "disks"
 device		random			# Entropy device
+device		firmware		# firmware assist module
 device		pl310			# PL310 L2 cache controller
 device		psci
 
@@ -128,6 +131,7 @@ device		p2wi			# Allwinner Push-Pull Two Wire
 device		axp209			# AXP209 Power Management Unit
 device		axp81x			# AXP813/818 Power Management Unit
 device		bcm2835_bsc
+device		fsliic			# Freescale i2c/iic
 device		icee			# AT24Cxxx and compatible EEPROMs
 device		sy8106a			# SY8106A Buck Regulator
 device		ti_i2c
@@ -171,6 +175,7 @@ device		ti_adc
 # reboot automatically because the boot loader might have enabled the
 # watchdog.
 device		ti_wdt
+device		imxwdt			# Watchdog. WARNING: can't be disabled!!!
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
@@ -186,6 +191,7 @@ device		ehci
 device		dwcotg			# DWC OTG controller
 device		musb
 
+device		axe			# USB-Ethernet
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 device		ukbd			# Allow keyboard like HIDs to control console
@@ -205,8 +211,10 @@ device		miibus
 
 device		awg			# 10/100/1000 integrated EMAC controller
 device		cpsw			# TI Common Platform Ethernet Switch (CPSW)
+device		cgem			# Zynq-7000 gig ethernet device
 device		dwc			# 10/100/1000 integrated GMAC controller
 device		emac			# 10/100 integrated EMAC controller
+device		ffec			# Freescale Fast Ethernet Controller
 device		smsc			# SMSC LAN91C111
 
 # Sound support
@@ -230,6 +238,7 @@ device		ti_pruss
 device		ti_mbox
 
 # DMA controller
+device		fslsdma
 device		ti_sdma
 
 # Extensible Firmware Interface
@@ -237,4 +246,4 @@ options 	EFI
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
-makeoptions	MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/nvidia dtb/rpi dtb/omap4"
+makeoptions	MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4"

Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6	Sun Sep 24 09:05:35 2017	(r323966)
+++ head/sys/arm/freescale/imx/files.imx6	Sun Sep 24 09:33:08 2017	(r323967)
@@ -22,7 +22,7 @@ arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx_gpt.c		optional imx_gpt
 arm/freescale/imx/imx_gpio.c		optional gpio
 arm/freescale/imx/imx_i2c.c		optional fsliic
-arm/freescale/imx/imx6_sdma.c		optional sdma
+arm/freescale/imx/imx6_sdma.c		optional fslsdma
 arm/freescale/imx/imx6_audmux.c		optional sound
 arm/freescale/imx/imx6_ssi.c		optional sound
 arm/freescale/imx/imx6_ahci.c		optional ahci