diff options
Diffstat (limited to 'usr/src/boot/efi/loader')
| -rw-r--r-- | usr/src/boot/efi/loader/Makefile.com | 10 | ||||
| -rw-r--r-- | usr/src/boot/efi/loader/conf.c | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/usr/src/boot/efi/loader/Makefile.com b/usr/src/boot/efi/loader/Makefile.com index 576f60eaf0..963ea246e6 100644 --- a/usr/src/boot/efi/loader/Makefile.com +++ b/usr/src/boot/efi/loader/Makefile.com @@ -12,6 +12,8 @@ # # Copyright 2016 Toomas Soome <tsoome@me.com> # +# Copyright 2022 Joyent, Inc. +# include $(SRC)/boot/Makefile.version include $(SRC)/boot/Makefile.inc @@ -77,6 +79,14 @@ CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi CPPFLAGS += -I$(PNGLITE) CPPFLAGS += -DNO_PCI -DEFI +# +# Using SNP from loader causes issues when chain-loading iPXE, as described in +# TRITON-1191. While the exact problem is not known, we have no use for SNP, so +# we'll just disable it. +# +CPPFLAGS += -DLOADER_DISABLE_SNP + + DPLIBSA= ../../../libsa/$(MACHINE)/libsa_pics.a LIBSA= -L../../../libsa/$(MACHINE) -lsa_pics diff --git a/usr/src/boot/efi/loader/conf.c b/usr/src/boot/efi/loader/conf.c index d29cbca573..e493d7cb03 100644 --- a/usr/src/boot/efi/loader/conf.c +++ b/usr/src/boot/efi/loader/conf.c @@ -24,6 +24,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Copyright (c) 2019, Joyent, Inc. + */ + #include <sys/cdefs.h> #include <stand.h> @@ -38,7 +42,9 @@ struct devsw *devsw[] = { &efipart_fddev, &efipart_cddev, &efipart_hddev, +#ifndef LOADER_DISABLE_SNP &efinet_dev, +#endif &vdisk_dev, &zfs_dev, NULL @@ -60,7 +66,9 @@ struct fs_ops *file_system[] = { }; struct netif_driver *netif_drivers[] = { +#ifndef LOADER_DISABLE_SNP &efinetif, +#endif NULL }; |