d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the x86 specific files to be built in the amd64 loader.efi. This will

Browse Source 
help with importing the arm and arm64 versions of loader.efi.
This commit is contained in:
andrew 2015-03-15 19:00:35 +00:00
parent 0a32d97912
commit 36adcb3650
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/amd64/efi/Makefile
View File

@ -25,6 +25,9 @@ SRCS= autoload.c \
vers.c vers.c
SRCS+= amd64_tramp.S \ SRCS+= amd64_tramp.S \
start.S start.S
.PATH: ${.CURDIR}/../../i386/libi386
SRCS+= nullconsole.c \
comconsole.c
CFLAGS+= -fPIC CFLAGS+= -fPIC
CFLAGS+= -I. CFLAGS+= -I.
@ -32,6 +35,7 @@ CFLAGS+= -I${.CURDIR}/../../efi/include
CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../..
CFLAGS+= -DNO_PCI
.if ${MK_FORTH} != "no" .if ${MK_FORTH} != "no"
BOOT_FORTH= yes BOOT_FORTH= yes

4
sys/boot/efi/libefi/Makefile
View File

@ -5,8 +5,6 @@ INTERNALLIB=
SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \ SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
libefi.c time.c libefi.c time.c
.PATH: ${.CURDIR}/../../i386/libi386
SRCS+= nullconsole.c comconsole.c
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_ARCH} == "amd64"
CFLAGS+= -fPIC -mno-red-zone CFLAGS+= -fPIC -mno-red-zone
@ -18,8 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
# Pick up the bootstrap header for some interface items # Pick up the bootstrap header for some interface items
CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../common
CFLAGS+= -DNO_PCI
# Handle FreeBSD specific %b and %D printf format specifiers # Handle FreeBSD specific %b and %D printf format specifiers
CFLAGS+= ${FORMAT_EXTENSIONS} CFLAGS+= ${FORMAT_EXTENSIONS}