svn commit: r292560 - in stable/10/sys/boot: amd64/efi efi/libefi

[Ed Maste]

Author: emaste
Date: Mon Dec 21 19:25:27 2015
New Revision: 292560
URL: https://svnweb.freebsd.org/changeset/base/292560

Log:
  MFC r280047: build x86-specific files in amd64 loader.efi
  
  This was originally done for the arm and arm64 loader.efi and is MFC'd
  here to ease future UEFI loader MFCs.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/boot/amd64/efi/Makefile
  stable/10/sys/boot/efi/libefi/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/amd64/efi/Makefile
==============================================================================
--- stable/10/sys/boot/amd64/efi/Makefile	Mon Dec 21 19:15:06 2015	(r292559)
+++ stable/10/sys/boot/amd64/efi/Makefile	Mon Dec 21 19:25:27 2015	(r292560)
@@ -26,6 +26,8 @@ SRCS=	autoload.c \
 	vers.c
 SRCS+=	amd64_tramp.S \
 	start.S
+SRCS+=	nullconsole.c \
+	comconsole.c
 
 CFLAGS+=	-fPIC
 CFLAGS+=	-I.
@@ -53,7 +55,7 @@ CFLAGS+=	-DEFI_STAGING_SIZE=${EFI_STAGIN
 
 # Always add MI sources 
 .PATH:		${.CURDIR}/../../common
-# For smbios.c
+# For smbios.c, nullconsole.c, comconsole.c
 .PATH:		${.CURDIR}/../../i386/libi386
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common

Modified: stable/10/sys/boot/efi/libefi/Makefile
==============================================================================
--- stable/10/sys/boot/efi/libefi/Makefile	Mon Dec 21 19:15:06 2015	(r292559)
+++ stable/10/sys/boot/efi/libefi/Makefile	Mon Dec 21 19:25:27 2015	(r292560)
@@ -5,8 +5,6 @@ INTERNALLIB=
 
 SRCS=	delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
 	libefi.c time.c
-.PATH:	${.CURDIR}/../../i386/libi386
-SRCS+= nullconsole.c comconsole.c
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -fPIC -mno-red-zone
@@ -18,8 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/li
 # Pick up the bootstrap header for some interface items
 CFLAGS+= -I${.CURDIR}/../../common
 
-CFLAGS+= -DNO_PCI
-
  
 # Suppress warning from clang for FreeBSD %b and %D formats
 CFLAGS+= -fformat-extensions