diff options
| author | emaste <emaste@FreeBSD.org> | 2015-12-21 19:25:27 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-12-21 19:25:27 +0000 |
| commit | a989874001d0c4a0dc8a628f98b7bef8fe8c3b4a (patch) | |
| tree | 94c63320dd7e561dc4f121e58d56c4a8c5befea5 | |
| parent | 7295d680ea42c53cb36aab414ad609e2cf13e59e (diff) | |
| download | FreeBSD-src-a989874001d0c4a0dc8a628f98b7bef8fe8c3b4a.zip FreeBSD-src-a989874001d0c4a0dc8a628f98b7bef8fe8c3b4a.tar.gz | |
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
| -rw-r--r-- | sys/boot/amd64/efi/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/efi/libefi/Makefile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/boot/amd64/efi/Makefile b/sys/boot/amd64/efi/Makefile index faece5d..bb32623 100644 --- a/sys/boot/amd64/efi/Makefile +++ b/sys/boot/amd64/efi/Makefile @@ -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_STAGING_SIZE} # 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 diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile index bd753cf..99c2e9b 100644 --- a/sys/boot/efi/libefi/Makefile +++ b/sys/boot/efi/libefi/Makefile @@ -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/libstand # 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 |
