|
 |
9ae3a8 |
From 5be39a8c30fba163b3f8358c1b7db02facecb538 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 11 Jan 2014 17:59:51 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 01/22] Partially revert "rhel: Drop "cfi.pflash01" and "isa-ide" device"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389463208-6278-2-git-send-email-lersek@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56615
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 01/18] Partially revert "rhel: Drop "cfi.pflash01" and "isa-ide" device"
|
|
|
9ae3a8 |
Bugzilla: 1032346
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This reverts the cfi.pflash01 elimination in
|
|
|
9ae3a8 |
commit f6852e27575e095269a47f434d318b5fc8822e0a.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
default-configs/x86_64-softmmu.mak | 1 +
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
default-configs/x86_64-softmmu.mak | 1 +
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
9ae3a8 |
index e7c48ec..7b8b05c 100644
|
|
|
9ae3a8 |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
9ae3a8 |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
9ae3a8 |
@@ -19,6 +19,7 @@ CONFIG_I8257=y
|
|
|
9ae3a8 |
CONFIG_IDE_PIIX=y
|
|
|
9ae3a8 |
CONFIG_PIIX_PCI=y
|
|
|
9ae3a8 |
CONFIG_I8259=y
|
|
|
9ae3a8 |
+CONFIG_PFLASH_CFI01=y
|
|
|
9ae3a8 |
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
|
9ae3a8 |
CONFIG_PCI_HOTPLUG=y
|
|
|
9ae3a8 |
CONFIG_MC146818RTC=y
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|