Author: andrew
Date: Sun Mar 15 19:00:35 2015
New Revision: 280047
URL: https://svnweb.freebsd.org/changeset/base/280047
Log:
Move the x86 specific files to be built in the amd64 loader.efi. This will
help with importing the arm and arm64 versions of loader.efi.
Modified:
head/sys/boot/amd64/efi/Makefile
head/sys/boot/efi/libefi/Makefile
Modified: head/sys/boot/amd64/efi/Makefile
==============================================================================
--- head/sys/boot/amd64/efi/Makefile Sun Mar 15 18:42:19 2015
(r280046)
+++ head/sys/boot/amd64/efi/Makefile Sun Mar 15 19:00:35 2015
(r280047)
@@ -25,6 +25,9 @@ SRCS= autoload.c \
vers.c
SRCS+= amd64_tramp.S \
start.S
+.PATH: ${.CURDIR}/../../i386/libi386
+SRCS+= nullconsole.c \
+ comconsole.c
CFLAGS+= -fPIC
CFLAGS+= -I.
@@ -32,6 +35,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include
CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
CFLAGS+= -I${.CURDIR}/../../..
+CFLAGS+= -DNO_PCI
.if ${MK_FORTH} != "no"
BOOT_FORTH= yes
Modified: head/sys/boot/efi/libefi/Makefile
==============================================================================
--- head/sys/boot/efi/libefi/Makefile Sun Mar 15 18:42:19 2015
(r280046)
+++ head/sys/boot/efi/libefi/Makefile Sun Mar 15 19:00:35 2015
(r280047)
@@ -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
-
# Handle FreeBSD specific %b and %D printf format specifiers
CFLAGS+= ${FORMAT_EXTENSIONS}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
