From: Michael S. Tsirkin Date: Mon, 19 Jan 2015 21:58:55 +0000 (+0200) Subject: bios-linker-loader: move source to common location X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=09852232ee131d0bfa5bdf7f44a806158a5c8711;p=qmiga%2Fqemu.git bios-linker-loader: move source to common location There are plans to use bios linker by MIPS, ARM. It's only used by ACPI ATM, so put it in hw/acpi and make it depend on CONFIG_ACPI. Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index acd2389431..ee82073338 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -1,3 +1,4 @@ common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o common-obj-$(CONFIG_ACPI) += memory_hotplug.o common-obj-$(CONFIG_ACPI) += acpi_interface.o +common-obj-$(CONFIG_ACPI) += bios-linker-loader.o diff --git a/hw/i386/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c similarity index 100% rename from hw/i386/bios-linker-loader.c rename to hw/acpi/bios-linker-loader.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 9d419addb4..2b678ef2a6 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -7,7 +7,6 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o -obj-y += bios-linker-loader.o hw/i386/acpi-build.o: hw/i386/acpi-build.c hw/i386/acpi-dsdt.hex \ hw/i386/ssdt-proc.hex hw/i386/ssdt-pcihp.hex hw/i386/ssdt-misc.hex \ hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex \