From: Julian Pidancet Date: Mon, 13 Feb 2012 12:47:46 +0000 (+0000) Subject: hvmloader: Only compile 32bitbios_support.c when rombios is enabled X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=80d7abf8d4fc843e52d8609ba35d7f3229f8d9ec;p=xen.git hvmloader: Only compile 32bitbios_support.c when rombios is enabled 32bitbios_support.c only contains code specific to rombios, and should not be built-in when building hvmloader for SeaBIOS only (as for rombios.c). Signed-off-by: Julian Pidancet Acked-by: Ian Campbell --- diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 41a4369ff0..e82146a251 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -29,7 +29,7 @@ LOADADDR = 0x100000 CFLAGS += $(CFLAGS_xeninclude) OBJS = hvmloader.o mp_tables.o util.o smbios.o -OBJS += 32bitbios_support.o smp.o cacheattr.o xenbus.o +OBJS += smp.o cacheattr.o xenbus.o OBJS += e820.o pci.o pir.o ctype.o ifeq ($(debug),y) OBJS += tests.o @@ -39,7 +39,7 @@ CIRRUSVGA_DEBUG ?= n ROMBIOS_DIR := ../rombios ifneq ($(ROMBIOS_DIR),) -OBJS += rombios.o +OBJS += 32bitbios_support.o rombios.o CFLAGS += -DENABLE_ROMBIOS ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest endif