[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file
From: |
Ákos Kovács |
Subject: |
[Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file |
Date: |
Fri, 27 Sep 2013 04:30:53 +0200 |
Signed-off-by: Ákos Kovács <address@hidden>
---
hw/intc/Kconfig | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 40d8ebc..4a96318 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -16,17 +16,23 @@ config ARM_GIC
config ARM_GIC_KVM
bool
- depends on KVM
config IOAPIC
bool
-config OPENPICS
+config OPENPIC
bool
config OPENPIC_KVM
bool
+<<<<<<< HEAD
+config OPENPIC_KVM
+ bool
+
config ARMV7M_NVIC
+=======
+config STELLARIS
+>>>>>>> eb5e304... hw/intc/Kconfig: Add Kconfig file
bool
select ARM_GIC
--
1.8.1.2
- [Qemu-devel] [v2 24/71] hw/core/Kconfig: Add Kconfig file, (continued)
- [Qemu-devel] [v2 24/71] hw/core/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 25/71] hw/cpu/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 26/71] hw/display/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 27/71] hw/dma/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 28/71] hw/gpio/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 29/71] hw/i2c/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 30/71] hw/ide/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 31/71] hw/input/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file,
Ákos Kovács <=
- [Qemu-devel] [v2 34/71] hw/misc/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 33/71] hw/isa/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 35/71] hw/mips/Kconfig: Add Kconfig for MIPS, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 36/71] hw/nvram/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 38/71] hw/pci-bridge/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 37/71] hw/pci/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 39/71] hw/pci-host/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26
- [Qemu-devel] [v2 40/71] hw/scsi/Kconfig: Add Kconfig file, Ákos Kovács, 2013/09/26