|
 |
8be556 |
From b89c862fa8365ec6f2fa82e3f714acee17dd5589 Mon Sep 17 00:00:00 2001
|
|
|
8be556 |
From: Andrew Jones <drjones@redhat.com>
|
|
|
8be556 |
Date: Tue, 16 Jun 2015 11:48:40 +0200
|
|
|
8be556 |
Subject: [PATCH 078/217] ACPI: split CONFIG_ACPI into 4 pieces
|
|
|
8be556 |
MIME-Version: 1.0
|
|
|
8be556 |
Content-Type: text/plain; charset=UTF-8
|
|
|
8be556 |
Content-Transfer-Encoding: 8bit
|
|
|
8be556 |
|
|
|
8be556 |
Message-id: <1434455325-23399-29-git-send-email-drjones@redhat.com>
|
|
|
8be556 |
Patchwork-id: 66260
|
|
|
8be556 |
O-Subject: [AArch64 RHEL-7.2 qemu-kvm-rhev PATCH 28/33] ACPI: split CONFIG_ACPI into 4 pieces
|
|
|
8be556 |
Bugzilla: 1231719
|
|
|
8be556 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
8be556 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
8be556 |
|
|
|
8be556 |
Author: Shannon Zhao <shannon.zhao@linaro.org>
|
|
|
8be556 |
|
|
|
8be556 |
As core.c, piix4.c, ich9.c and pcihp.c are for x86, add CONFIG_ACPI_X86
|
|
|
8be556 |
to make it only for x86. ARM doesn't support cpu and memory hotplug, add
|
|
|
8be556 |
CONFIG_ACPI_CPU_HOTPLUG and CONFIG_ACPI_MEMORY_HOTPLUG to exclude them
|
|
|
8be556 |
for target-arm.
|
|
|
8be556 |
|
|
|
8be556 |
Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
|
|
|
8be556 |
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
|
|
|
8be556 |
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
|
|
8be556 |
Message-id: 1432522520-8068-24-git-send-email-zhaoshenglong@huawei.com
|
|
|
8be556 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
8be556 |
(cherry picked from commit 135a67a692bedb952ea720351026247104da8645)
|
|
|
8be556 |
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
|
|
8be556 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8be556 |
---
|
|
|
8be556 |
default-configs/arm-softmmu.mak | 1 +
|
|
|
8be556 |
default-configs/i386-softmmu.mak | 3 +++
|
|
|
8be556 |
default-configs/mips-softmmu.mak | 3 +++
|
|
|
8be556 |
default-configs/mips64-softmmu.mak | 3 +++
|
|
|
8be556 |
default-configs/mips64el-softmmu.mak | 3 +++
|
|
|
8be556 |
default-configs/mipsel-softmmu.mak | 3 +++
|
|
|
8be556 |
default-configs/x86_64-softmmu.mak | 3 +++
|
|
|
8be556 |
hw/acpi/Makefile.objs | 5 +++--
|
|
|
8be556 |
hw/i2c/Makefile.objs | 2 +-
|
|
|
8be556 |
9 files changed, 23 insertions(+), 3 deletions(-)
|
|
|
8be556 |
|
|
|
8be556 |
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
|
|
|
8be556 |
index 0399634..deb788d 100644
|
|
|
8be556 |
--- a/default-configs/arm-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/arm-softmmu.mak
|
|
|
8be556 |
@@ -96,3 +96,4 @@ CONFIG_ALLWINNER_A10=y
|
|
|
8be556 |
CONFIG_XIO3130=y
|
|
|
8be556 |
CONFIG_IOH3420=y
|
|
|
8be556 |
CONFIG_I82801B11=y
|
|
|
8be556 |
+CONFIG_ACPI=y
|
|
|
8be556 |
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
|
|
|
8be556 |
index 074d0fd..c2b82de 100644
|
|
|
8be556 |
--- a/default-configs/i386-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/i386-softmmu.mak
|
|
|
8be556 |
@@ -15,6 +15,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_IDE_ISA=y
|
|
|
8be556 |
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
|
|
|
8be556 |
index 46e2a0d..645908e 100644
|
|
|
8be556 |
--- a/default-configs/mips-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/mips-softmmu.mak
|
|
|
8be556 |
@@ -15,6 +15,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_PIIX4=y
|
|
|
8be556 |
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
|
|
|
8be556 |
index 8e05cd2..2ce9fb3 100644
|
|
|
8be556 |
--- a/default-configs/mips64-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/mips64-softmmu.mak
|
|
|
8be556 |
@@ -15,6 +15,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_PIIX4=y
|
|
|
8be556 |
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
|
|
|
8be556 |
index cb0afb9..0e978e7 100644
|
|
|
8be556 |
--- a/default-configs/mips64el-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/mips64el-softmmu.mak
|
|
|
8be556 |
@@ -15,6 +15,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_PIIX4=y
|
|
|
8be556 |
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
|
|
|
8be556 |
index d217d5a..17cce79 100644
|
|
|
8be556 |
--- a/default-configs/mipsel-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/mipsel-softmmu.mak
|
|
|
8be556 |
@@ -15,6 +15,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_PIIX4=y
|
|
|
8be556 |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
8be556 |
index 4076f89..f218e06 100644
|
|
|
8be556 |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
8be556 |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
8be556 |
@@ -13,6 +13,9 @@ CONFIG_PCSPK=y
|
|
|
8be556 |
CONFIG_PCKBD=y
|
|
|
8be556 |
CONFIG_FDC=y
|
|
|
8be556 |
CONFIG_ACPI=y
|
|
|
8be556 |
+CONFIG_ACPI_X86=y
|
|
|
8be556 |
+CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
8be556 |
+CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
8be556 |
CONFIG_APM=y
|
|
|
8be556 |
CONFIG_I8257=y
|
|
|
8be556 |
CONFIG_IDE_PIIX=y
|
|
|
8be556 |
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
|
|
|
8be556 |
index b9fefa7..29d46d8 100644
|
|
|
8be556 |
--- a/hw/acpi/Makefile.objs
|
|
|
8be556 |
+++ b/hw/acpi/Makefile.objs
|
|
|
8be556 |
@@ -1,5 +1,6 @@
|
|
|
8be556 |
-common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o
|
|
|
8be556 |
-common-obj-$(CONFIG_ACPI) += memory_hotplug.o
|
|
|
8be556 |
+common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o ich9.o pcihp.o
|
|
|
8be556 |
+common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
|
|
|
8be556 |
+common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
|
|
|
8be556 |
common-obj-$(CONFIG_ACPI) += acpi_interface.o
|
|
|
8be556 |
common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
|
|
|
8be556 |
common-obj-$(CONFIG_ACPI) += aml-build.o
|
|
|
8be556 |
diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
|
|
|
8be556 |
index 648278e..0f13060 100644
|
|
|
8be556 |
--- a/hw/i2c/Makefile.objs
|
|
|
8be556 |
+++ b/hw/i2c/Makefile.objs
|
|
|
8be556 |
@@ -1,6 +1,6 @@
|
|
|
8be556 |
common-obj-y += core.o smbus.o smbus_eeprom.o
|
|
|
8be556 |
common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
|
|
|
8be556 |
-common-obj-$(CONFIG_ACPI) += smbus_ich9.o
|
|
|
8be556 |
+common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o
|
|
|
8be556 |
common-obj-$(CONFIG_APM) += pm_smbus.o
|
|
|
8be556 |
common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
|
|
|
8be556 |
common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
|
|
|
8be556 |
--
|
|
|
8be556 |
1.8.3.1
|
|
|
8be556 |
|