svn commit: r362241 - in stable/12/sys: arm64/conf modules/dtb/mv

[Emmanuel Vadot]

Author: manu
Date: Tue Jun 16 20:36:22 2020
New Revision: 362241
URL: https://svnweb.freebsd.org/changeset/base/362241

Log:
  MFC r351144:
  
  arm64: Add EspressoBin DTB to the build
  
  This will compile the espressobin dts to a dtb file and this will be
  install in /boot/dtb/marvell/ during installkernel.

Modified:
  stable/12/sys/arm64/conf/GENERIC
  stable/12/sys/modules/dtb/mv/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm64/conf/GENERIC
==============================================================================
--- stable/12/sys/arm64/conf/GENERIC	Tue Jun 16 20:35:01 2020	(r362240)
+++ stable/12/sys/arm64/conf/GENERIC	Tue Jun 16 20:36:22 2020	(r362241)
@@ -308,4 +308,4 @@ options 	FDT
 device		acpi
 
 # DTBs
-makeoptions	MODULES_EXTRA="dtb/allwinner dtb/rockchip dtb/rpi"
+makeoptions	MODULES_EXTRA="dtb/allwinner dtb/mv dtb/rockchip dtb/rpi"

Modified: stable/12/sys/modules/dtb/mv/Makefile
==============================================================================
--- stable/12/sys/modules/dtb/mv/Makefile	Tue Jun 16 20:35:01 2020	(r362240)
+++ stable/12/sys/modules/dtb/mv/Makefile	Tue Jun 16 20:36:22 2020	(r362241)
@@ -1,7 +1,13 @@
 # $FreeBSD$
 # All the dts files for Marvell systems we support.
+
+.if ${MACHINE_ARCH} == "armv7"
 DTS=	\
 	armada-388-clearfog.dts \
 	armada-388-gp.dts
+.elif ${MACHINE_ARCH} == "aarch64"
+DTS=	\
+	marvell/armada-3720-espressobin.dts
+.endif
 
 .include <bsd.dtb.mk>