Remove LOADER_FDT_SUPPORT as a Makefile variable.

LOADER_FDT_SUPPORT was used inconsistently in the tree. In some
places, it was used to control whether or not the user wanted FDT
included, and in other places it was a command to include
support. Remove it entirely. The former is now enabled -DWITH_FDT,
while the latter is controlled by Makefiles defining HAVE_FDT.

Supported by: Netflix

3 files changed, 5 insertions, 8 deletions

diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile
index 82852da1733e..3561d6e46a37 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/sys/boot/efi/loader/Makefile
@@ -71,13 +71,9 @@ CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID
 .endif
 .endif
 
-LOADER_FDT_SUPPORT?=	no
-.if ${MK_FDT} != "no" && ${LOADER_FDT_SUPPORT} != "no"
-CFLAGS+=	-I${BOOTSRC}/fdt
-CFLAGS+=	-I${BOOTSRC}/fdt
-CFLAGS+=	-DLOADER_FDT_SUPPORT
+.if defined(HAVE_FDT) && ${MK_FDT} != "no"
+.include	"${BOOTSRC}/fdt.mk"
 LIBEFI_FDT=	${BOOTOBJ}/efi/fdt/libefi_fdt.a
-LIBFDT=		${BOOTOBJ}/fdt/libfdt.a
 .endif
 
 # Include bcache code.
diff --git a/sys/boot/efi/loader/arch/arm/Makefile.inc b/sys/boot/efi/loader/arch/arm/Makefile.inc
index b2876ca19518..74e6616e991b 100644
--- a/sys/boot/efi/loader/arch/arm/Makefile.inc
+++ b/sys/boot/efi/loader/arch/arm/Makefile.inc
@@ -3,4 +3,4 @@
 SRCS+=	exec.c \
 	start.S
 
-LOADER_FDT_SUPPORT=yes
+HAVE_FDT=yes
diff --git a/sys/boot/efi/loader/arch/arm64/Makefile.inc b/sys/boot/efi/loader/arch/arm64/Makefile.inc
index 2ce5af79d0c3..b62ce41c0e27 100644
--- a/sys/boot/efi/loader/arch/arm64/Makefile.inc
+++ b/sys/boot/efi/loader/arch/arm64/Makefile.inc
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-LOADER_FDT_SUPPORT=yes
+HAVE_FDT=yes
+
 SRCS+=	exec.c \
 	start.S