From f1012f03d1308b00a50c3a5579834b4f2e55dd90 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Fri, 27 Apr 2018 21:15:51 +0000 Subject: [PATCH] arm: dts: overlays: Remove the overlay module Move the DTSO variables in the main SoC dtb file Discussed with: ian --- sys/arm/conf/GENERIC | 2 +- sys/modules/dtb/allwinner/Makefile | 2 ++ sys/modules/dtb/overlays/Makefile | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 sys/modules/dtb/overlays/Makefile diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index a8f69349505..116ea87cd6c 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -246,4 +246,4 @@ options EFI # Flattened Device Tree options FDT # Configure using FDT/DTB data -makeoptions MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4 dtb/overlays" +makeoptions MODULES_EXTRA="dtb/allwinner dtb/am335x dtb/imx6 dtb/nvidia dtb/rpi dtb/zynq dtb/omap4" diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 1bcd35a6de9..ca3eab576ba 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -19,6 +19,8 @@ DTS= \ sun8i-h3-orangepi-one.dts \ sun8i-h3-orangepi-plus2e.dts +DTSO= sun8i-h3-sid.dtso + LINKS= \ ${DTBDIR}/sun4i-a10-cubieboard.dtb ${DTBDIR}/cubieboard.dtb \ ${DTBDIR}/sun4i-a10-olinuxino-lime.dtb ${DTBDIR}/olinuxino-lime.dtb \ diff --git a/sys/modules/dtb/overlays/Makefile b/sys/modules/dtb/overlays/Makefile deleted file mode 100644 index bea5f03efe6..00000000000 --- a/sys/modules/dtb/overlays/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ -# All the dtso files -DTSO= sun8i-h3-sid.dtso - -.include