svn commit: r354240 - in head/stand: efi/loader i386/libi386

[Warner Losh]

Author: imp
Date: Fri Nov  1 21:26:43 2019
New Revision: 354240
URL: https://svnweb.freebsd.org/changeset/base/354240

Log:
  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).

Modified:
  head/stand/efi/loader/Makefile
  head/stand/i386/libi386/comconsole.c

Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile	Fri Nov  1 11:28:43 2019	(r354239)
+++ head/stand/efi/loader/Makefile	Fri Nov  1 21:26:43 2019	(r354240)
@@ -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.

Modified: head/stand/i386/libi386/comconsole.c
==============================================================================
--- head/stand/i386/libi386/comconsole.c	Fri Nov  1 11:28:43 2019	(r354239)
+++ head/stand/i386/libi386/comconsole.c	Fri Nov  1 21:26:43 2019	(r354240)
@@ -214,7 +214,8 @@ comc_port_set(struct env_var *ev, int flags, const voi
 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];