From 6fdb9d3af06d99d7154cbf565926dfe45f9a4b1a Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 1 Nov 2019 21:26:43 +0000
Subject: [PATCH] We don't support configuring serial PCI cards in EFI. Make
 this clearer in the source rather than obfuscaring it behind NO_PCI (nothing
 else declares that, so it's not making the ifdefs clearer).

---
 stand/efi/loader/Makefile       | 2 +-
 stand/i386/libi386/comconsole.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
index 814bf069796c..d290cae5d4c8 100644
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -55,7 +55,7 @@ CFLAGS+=	-I${EFISRC}/include
 CFLAGS+=	-I${EFISRC}/include/${MACHINE}
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
 CFLAGS+=	-I${BOOTSRC}/i386/libi386
-CFLAGS+=	-DNO_PCI -DEFI
+CFLAGS+=	-DEFI
 
 .if !defined(BOOT_HIDE_SERIAL_NUMBERS)
 # Export serial numbers, UUID, and asset tag from loader.
diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c
index b9fcf032e185..4eaad2d1a194 100644
--- a/stand/i386/libi386/comconsole.c
+++ b/stand/i386/libi386/comconsole.c
@@ -214,7 +214,8 @@ comc_port_set(struct env_var *ev, int flags, const void *value)
 static uint32_t
 comc_parse_pcidev(const char *string)
 {
-#ifdef NO_PCI
+#ifdef EFI
+	/* We don't support PCI in EFI yet */
 	return (0);
 #else
 	char *p, *p1;
@@ -256,7 +257,8 @@ comc_parse_pcidev(const char *string)
 static int
 comc_pcidev_handle(uint32_t locator)
 {
-#ifdef NO_PCI
+#ifdef EFI
+	/* We don't support PCI in EFI yet */
 	return (CMD_ERROR);
 #else
 	char intbuf[64];