Page MenuHomeFreeBSD
Files F156363306

D29993.id88171.diff
No OneTemporary
Actions

D29993.id88171.diff
View Options

diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -33,6 +33,13 @@
SRCS+= boot1.c proto.c self_reloc.c start.S ufs_module.c devpath.c
.if ${MK_LOADER_ZFS} != "no"
SRCS+= zfs_module.c
+# If you build self_reloc you need VERIEXEC definitions
+.if ${MK_LOADER_VERIEXEC} != "no"
+CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h
+.if ${MK_LOADER_VERIEXEC_VECTX} != "no"
+CFLAGS+= -DLOADER_VERIEXEC_VECTX
+.endif
+.endif
CFLAGS.zfs_module.c+= -I${ZFSSRC}
CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs
CFLAGS.zfs_module.c+= -I${SYSDIR}/crypto/skein
diff --git a/stand/efi/fdt/Makefile b/stand/efi/fdt/Makefile
--- a/stand/efi/fdt/Makefile
+++ b/stand/efi/fdt/Makefile
@@ -9,6 +9,8 @@
SRCS= efi_fdt.c
+.include "${BOOTSRC}/loader.mk"
+
# EFI library headers
CFLAGS+= -I${EFISRC}/include
CFLAGS+= -I${EFISRC}/include/${MACHINE}
diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
--- a/stand/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
@@ -67,4 +67,6 @@
CFLAGS+= -DTERM_EMU
+.include "${BOOTSRC}/loader.mk"
+
.include <bsd.lib.mk>
diff --git a/stand/fdt/Makefile b/stand/fdt/Makefile
--- a/stand/fdt/Makefile
+++ b/stand/fdt/Makefile
@@ -17,4 +17,6 @@
CFLAGS+= -Wformat -Wall
+.include "${BOOTSRC}/loader.mk"
+
.include <bsd.lib.mk>
diff --git a/stand/ficl.mk b/stand/ficl.mk
--- a/stand/ficl.mk
+++ b/stand/ficl.mk
@@ -19,4 +19,7 @@
.if ${MK_LOADER_VERIEXEC} != "no"
CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h
+.if ${MK_LOADER_VERIEXEC_VECTX} != "no"
+CFLAGS+= -DLOADER_VERIEXEC_VECTX
+.endif
.endif
diff --git a/stand/i386/libfirewire/Makefile b/stand/i386/libfirewire/Makefile
--- a/stand/i386/libfirewire/Makefile
+++ b/stand/i386/libfirewire/Makefile
@@ -8,6 +8,8 @@
SRCS+= firewire.c fwohci.c dconsole.c
SRCS+= dcons.c fwcrom.c
+.include "${BOOTSRC}/loader.mk"
+
CFLAGS+= -D_BOOT
CFLAGS+= -I${LDRSRC}
diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
--- a/stand/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
@@ -17,6 +17,8 @@
.PATH: ${SYSDIR}/teken
SRCS+= teken.c
+.include "${BOOTSRC}/loader.mk"
+
BOOT_COMCONSOLE_PORT?= 0x3f8
CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT}
diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile
--- a/stand/liblua/Makefile
+++ b/stand/liblua/Makefile
@@ -42,6 +42,9 @@
.endif
.if ${MK_LOADER_VERIEXEC} == "yes"
CFLAGS+= -I${SRCTOP}/lib/libsecureboot/h -DLOADER_VERIEXEC
++.if ${MK_LOADER_VERIEXEC_VECTX} != "no"
++CFLAGS+= -DLOADER_VERIEXEC_VECTX
++.endif
.endif
.include <bsd.lib.mk>

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 12:15 AM (1 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33026274
Default Alt Text
D29993.id88171.diff (2 KB)

Event Timeline