diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-01-19 23:58:55 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-01-27 14:46:17 +0200 |
| commit | 09852232ee131d0bfa5bdf7f44a806158a5c8711 (patch) | |
| tree | 8088e176d0836c24de697d74d79fdde54bd14f62 /hw | |
| parent | 0058ae1d9483f5f96c7798e2ae51cce42c69abfb (diff) | |
| download | qemu-09852232ee131d0bfa5bdf7f44a806158a5c8711.tar.gz | |
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 <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/acpi/bios-linker-loader.c (renamed from hw/i386/bios-linker-loader.c) | 0 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 1 |
3 files changed, 1 insertions, 1 deletions
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 index 5cc4d90c16..5cc4d90c16 100644 --- a/hw/i386/bios-linker-loader.c +++ b/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 \ |