svn commit: r329144 - stable/11/sys/boot

[Kyle Evans]

Author: kevans
Date: Sun Feb 11 22:38:16 2018
New Revision: 329144
URL: https://svnweb.freebsd.org/changeset/base/329144

Log:
  Re-sync loader.mk and ficl.mk to where they should be
  
  This is a direct commit to stable/11 due to changes lost during an MFC of a
  move.

Modified:
  stable/11/sys/boot/ficl.mk
  stable/11/sys/boot/loader.mk

Modified: stable/11/sys/boot/ficl.mk
==============================================================================
--- stable/11/sys/boot/ficl.mk	Sun Feb 11 22:16:24 2018	(r329143)
+++ stable/11/sys/boot/ficl.mk	Sun Feb 11 22:38:16 2018	(r329144)
@@ -6,7 +6,7 @@
 
 .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1
 FICL_CPUARCH=	i386
-.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_ARCH:Mmips64*} != ""
 FICL_CPUARCH=	mips64
 .else
 FICL_CPUARCH=	${MACHINE_CPUARCH}

Modified: stable/11/sys/boot/loader.mk
==============================================================================
--- stable/11/sys/boot/loader.mk	Sun Feb 11 22:16:24 2018	(r329143)
+++ stable/11/sys/boot/loader.mk	Sun Feb 11 22:38:16 2018	(r329144)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${SRCTOP}/sys/boot/common ${SRCTOP}/sys/boot/libsa
+.include "defs.mk"
 
 .PATH: ${LDRSRC} ${BOOTSRC}/libsa
 
@@ -24,29 +24,19 @@ SRCS+=	load_elf32.c reloc_elf32.c
 SRCS+=	load_elf64.c reloc_elf64.c
 .elif ${MACHINE_CPUARCH} == "sparc64"
 SRCS+=	load_elf64.c reloc_elf64.c
-.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+.elif ${MACHINE_ARCH:Mmips64*} != ""
 SRCS+= load_elf64.c reloc_elf64.c
 .elif ${MACHINE} == "mips"
 SRCS+=	load_elf32.c reloc_elf32.c
 .endif
 
-.if defined(LOADER_NET_SUPPORT)
-SRCS+=	dev_net.c
+.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
+SRCS+=	disk.c part.c
 .endif
 
-.if !defined(LOADER_NO_DISK_SUPPORT)
-SRCS+=	disk.c part.c
-CFLAGS+= -DLOADER_DISK_SUPPORT
-.if !defined(LOADER_NO_GPT_SUPPORT)
-CFLAGS+= -DLOADER_GPT_SUPPORT
+.if ${LOADER_NET_SUPPORT:Uno} == "yes"
+SRCS+= dev_net.c
 .endif
-.if !defined(LOADER_NO_MBR_SUPPORT)
-CFLAGS+= -DLOADER_MBR_SUPPORT
-.endif
-.endif
-.if !defined(LOADER_NO_GELI_SUPPORT)
-CFLAGS+= -DLOADER_GELI_SUPPORT
-.endif
 
 .if defined(HAVE_BCACHE)
 SRCS+=  bcache.c
@@ -68,7 +58,7 @@ SRCS+=	pnp.c
 .endif
 
 # Forth interpreter
-.if defined(MK_FORTH)
+.if ${MK_FORTH} != "no"
 SRCS+=	interp_forth.c
 .include "${BOOTSRC}/ficl.mk"
 .endif