[Qemu-devel] [PULL 11/16] bios-linker-loader: move source to common location

[Michael S. Tsirkin]

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 <address@hidden>
---
 hw/{i386 => acpi}/bios-linker-loader.c | 0
 hw/acpi/Makefile.objs                  | 1 +
 hw/i386/Makefile.objs                  | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename hw/{i386 => acpi}/bios-linker-loader.c (100%)

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/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index acd2389..ee82073 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/Makefile.objs b/hw/i386/Makefile.objs
index 9d419ad..2b678ef 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 \
-- 
MST