diff options
| author | Warner Losh <imp@FreeBSD.org> | 2019-11-01 21:26:43 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2019-11-01 21:26:43 +0000 |
| commit | 08b86a1a8a107274f97ace292e91fc82228dde7e (patch) | |
| tree | 407ef7dd152cbfb5231026eaeecbd5c581b56091 | |
| parent | 9d8d1209839f802b4cdaeb794cca2d2b5597a9a5 (diff) | |
Notes
| -rw-r--r-- | stand/efi/loader/Makefile | 2 | ||||
| -rw-r--r-- | 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 814bf069796ce..d290cae5d4c88 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 b9fcf032e1850..4eaad2d1a194a 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]; |