On Fri, Sep 13, 2019 at 12:49 PM Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> wrote: > > On Fri, 30 Aug 2019 at 03:07, Dan Williams <dan.j.williams@xxxxxxxxx> wrote: > > > ... > > diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile > > index 4ac2de4dfa72..d7a6db03ea79 100644 > > --- a/drivers/firmware/efi/Makefile > > +++ b/drivers/firmware/efi/Makefile > > @@ -20,13 +20,16 @@ obj-$(CONFIG_UEFI_CPER) += cper.o > > obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o > > obj-$(CONFIG_EFI_RUNTIME_WRAPPERS) += runtime-wrappers.o > > obj-$(CONFIG_EFI_STUB) += libstub/ > > -obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_mem.o > > +obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_map.o > > obj-$(CONFIG_EFI_BOOTLOADER_CONTROL) += efibc.o > > obj-$(CONFIG_EFI_TEST) += test/ > > obj-$(CONFIG_EFI_DEV_PATH_PARSER) += dev-path-parser.o > > obj-$(CONFIG_APPLE_PROPERTIES) += apple-properties.o > > obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o > > > > +fake_map-y += fake_mem.o > > +fake_map-$(CONFIG_X86) += x86-fake_mem.o > > + > > Please use > > fake-mem-$(CONFIG_X86) := x86-fake_mem.o > obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_mem.o $(fake-mem-y) Ok, looks good. > > instead, and please use either - or _ in filenames, not both. Fair enough.