[Qemu-devel] [v2 00/71] Integrating Kconfig to Qemu

[Qemu-devel] [v2 00/71] Integrating Kconfig to Qemu

[Ákos Kovács]

This patchset contains the necessary changes in the build system to
enable interactive build configuration with Kconfig.

It also contains the Kconfig files for each hw/* subdirectory, including the boards.

The most significant change is that the Makefile is now capable to include the generated
kconfig-devices.mak or exclude it with the 'make defconfig' command.

Ákos Kovács (71):
  rules.mak: New logical functions
  Makefile.target: CONFIG_NO_* variables removed
  default-configs/: CONFIG_GDBSTUB_XML removed
  scripts/kconfig: kconfig-frontends submodule added
  Makefile: Clone kconfig git submodule in Makefile
  hw/arm/Makefile.objs: CONFIG_* created for each board
  hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards condtionally
  hw/m68k/Makefile.objs: Conditionally build boards
  hw/microblaze/Makefile.objs: Create configs for petalogix boards
  hw/mips/Makefile.objs: Create CONFIG_* for mips boards
  hw/ppc/Makefile.objs: Build all boards conditinally
  hw/sh4/Makefile.objs: Build sh4 boards conditionally
  hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created
  hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst
  hw/s390x/Makefile.objs: Create CONFIG_S390_VIRTIO and CONFIG_S390_CCW
  hw/s390x/Kconfig: Add s390x Kconfig
  hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_lx60
    conditionally
  hw/intc/Makefile.objs: Make CONFIG_ARMV7_NVIC
  hw/9pfs/Kconfig: Add 9pfs Kconfig
  hw/arm/Kconfig: Add ARM Kconfig
  hw/audio/Kconfig: Add audio Kconfig
  hw/block/Kconfig: Add Kconfig file
  hw/char/Kconfig: Add Kconfig file
  hw/core/Kconfig: Add Kconfig file
  hw/cpu/Kconfig: Add Kconfig file
  hw/display/Kconfig: Add Kconfig file
  hw/dma/Kconfig: Add Kconfig file
  hw/gpio/Kconfig: Add Kconfig file
  hw/i2c/Kconfig: Add Kconfig file
  hw/ide/Kconfig: Add Kconfig file
  hw/input/Kconfig: Add Kconfig file
  hw/intc/Kconfig: Add Kconfig file
  hw/isa/Kconfig: Add Kconfig file
  hw/misc/Kconfig: Add Kconfig file
  hw/mips/Kconfig: Add Kconfig for MIPS
  hw/nvram/Kconfig: Add Kconfig file
  hw/pci/Kconfig: Add Kconfig file
  hw/pci-bridge/Kconfig: Add Kconfig file
  hw/pci-host/Kconfig: Add Kconfig file
  hw/scsi/Kconfig: Add Kconfig file
  hw/sd/Kconfig: Add Kconfig file
  hw/ssi/Kconfig: Add Kconfig file
  hw/timer/Kconfig: Add Kconfig file
  hw/tpm/Kconfig: Add Kconfig file
  hw/alpha/Kconfig: Add Kconfig for Alpha
  hw/cris/Kconfig: Added Cris kconfig file
  hw/lm32/Kconfig: Added kconfig for lm32
  hw/m68k/Kconfig: m68k kconfig file added
  hw/usb/Kconfig: Add Kconfig file
  hw/watchdog/Kconfig: Add Kconfig file
  hw/Kconfig: Add the main Kconfig for hw/
  hw/moxie/Kconfig: Add Kconfig for moxie
  hw/unicore32/Kconfig: Add Unicore32 Kconfig
  hw/moxie/Kconfig: Make the board default and bool
  hw/xtensa/Kconfig: Kconfig for xtensa added
  hw/openrisc/Makefile.objs: Add CONFIG_ prefix for OPENRISC_SIM
  hw/openrisc/Kconfig: Add Kconfig for OpenRISC
  hw/sparc64/Kconfig: Kconfig added for Sparc64
  configure: Generate Kconfig.targets with --target-list
  Kconfig: Main kconfig file added
  hw/usb/hcd-ohci.c: Move sysbus and PCI code to new files
  hw/usb/Makefile.objs: Make config options for USB_OHCI_*
  Makefile.objs: Split CONFIG_USB_EHCI
  hw/ppc/Makefile.objs: Create PPC405_UC for ppc405_uc.c
  hw/ppc/Kconfig: Add Kconfig for PPC
  hw/usb/Kconfig: Add the new USB_(O|U)HCI_(PCI|SYSBUS)
  hw/i386/Kconfig: Add i386 Kconfig
  hw/acpi/Kconfig: Create ACPI Kconfig
  hw/microblaze/Kconfig: Kconfig added for microblaze
  hw/sh4/Kconfig: Kconfig for SH4 added
  hw/sparc/Kconfig: Kconfig for Sparc added

 .gitmodules                               |   3 +
 Kconfig                                   |  10 +
 Makefile                                  |  97 +++++++++-
 Makefile.target                           |  12 +-
 configure                                 |  14 ++
 default-configs/arm-linux-user.mak        |   2 -
 default-configs/arm-softmmu.mak           |  15 +-
 default-configs/armeb-linux-user.mak      |   2 -
 default-configs/i386-softmmu.mak          |   3 +
 default-configs/m68k-linux-user.mak       |   2 -
 default-configs/m68k-softmmu.mak          |   4 +-
 default-configs/microblaze-softmmu.mak    |   3 +
 default-configs/microblazeel-softmmu.mak  |   3 +
 default-configs/mips-softmmu.mak          |   6 +
 default-configs/mips64-softmmu.mak        |   6 +
 default-configs/mips64el-softmmu.mak      |   6 +
 default-configs/mipsel-softmmu.mak        |   6 +
 default-configs/pci.mak                   |   2 +
 default-configs/ppc-linux-user.mak        |   2 -
 default-configs/ppc-softmmu.mak           |   9 +-
 default-configs/ppc64-linux-user.mak      |   2 -
 default-configs/ppc64-softmmu.mak         |  10 +-
 default-configs/ppc64abi32-linux-user.mak |   2 -
 default-configs/ppcemb-softmmu.mak        |   9 +-
 default-configs/sh4-softmmu.mak           |   4 +
 default-configs/sh4eb-softmmu.mak         |   3 +
 default-configs/sparc-softmmu.mak         |   2 +
 default-configs/x86_64-softmmu.mak        |   3 +
 default-configs/xtensa-softmmu.mak        |   3 +
 default-configs/xtensaeb-softmmu.mak      |   3 +
 hw/9pfs/Kconfig                           |   2 +
 hw/Kconfig                                |  28 +++
 hw/acpi/Kconfig                           |   4 +
 hw/alpha/Kconfig                          |  13 ++
 hw/arm/Kconfig                            | 237 +++++++++++++++++++++++
 hw/arm/Makefile.objs                      |  35 +++-
 hw/audio/Kconfig                          |  41 ++++
 hw/block/Kconfig                          |  31 +++
 hw/char/Kconfig                           |  24 +++
 hw/core/Kconfig                           |  11 ++
 hw/cpu/Kconfig                            |  18 ++
 hw/cris/Kconfig                           |   7 +
 hw/display/Kconfig                        |  84 ++++++++
 hw/dma/Kconfig                            |  24 +++
 hw/gpio/Kconfig                           |   5 +
 hw/i2c/Kconfig                            |   6 +
 hw/i386/Kconfig                           |  54 ++++++
 hw/i386/Makefile.objs                     |   5 +-
 hw/ide/Kconfig                            |  50 +++++
 hw/input/Kconfig                          |  23 +++
 hw/intc/Kconfig                           |  38 ++++
 hw/intc/Makefile.objs                     |   2 +-
 hw/isa/Kconfig                            |  39 ++++
 hw/lm32/Kconfig                           |  17 ++
 hw/lm32/Makefile.objs                     |   4 +-
 hw/m68k/Kconfig                           |  22 +++
 hw/m68k/Makefile.objs                     |   7 +-
 hw/microblaze/Kconfig                     |  19 ++
 hw/microblaze/Makefile.objs               |   7 +-
 hw/mips/Kconfig                           |  73 +++++++
 hw/mips/Makefile.objs                     |   8 +-
 hw/misc/Kconfig                           |  67 +++++++
 hw/moxie/Kconfig                          |   6 +
 hw/net/Kconfig                            |  74 +++++++
 hw/nvram/Kconfig                          |   5 +
 hw/openrisc/Kconfig                       |   7 +
 hw/openrisc/Makefile.objs                 |   2 +-
 hw/pci-bridge/Kconfig                     |   3 +
 hw/pci-host/Kconfig                       |  36 ++++
 hw/pci/Kconfig                            |   8 +
 hw/pci/Makefile.objs                      |   2 +-
 hw/ppc/Kconfig                            |  98 ++++++++++
 hw/ppc/Makefile.objs                      |  14 +-
 hw/s390x/Kconfig                          |  12 ++
 hw/s390x/Makefile.objs                    |   6 +-
 hw/scsi/Kconfig                           |  21 ++
 hw/sd/Kconfig                             |  27 +++
 hw/sh4/Kconfig                            |  17 ++
 hw/sh4/Makefile.objs                      |   4 +-
 hw/sparc/Kconfig                          |  18 ++
 hw/sparc/Makefile.objs                    |   3 +-
 hw/sparc64/Kconfig                        |  14 ++
 hw/ssi/Kconfig                            |  14 ++
 hw/timer/Kconfig                          |  81 ++++++++
 hw/tpm/Kconfig                            |   6 +
 hw/unicore32/Kconfig                      |   5 +
 hw/usb/Kconfig                            |  77 ++++++++
 hw/usb/Makefile.objs                      |   6 +-
 hw/usb/hcd-ohci-pci.c                     |  96 +++++++++
 hw/usb/hcd-ohci-sysbus.c                  |  84 ++++++++
 hw/usb/hcd-ohci.h                         | 311 ++++++++++++++++++++++++++++++
 hw/watchdog/Kconfig                       |   7 +
 hw/xtensa/Kconfig                         |  10 +
 hw/xtensa/Makefile.objs                   |   4 +-
 rules.mak                                 |  16 ++
 scripts/kconfig                           |   1 +
 96 files changed, 2283 insertions(+), 65 deletions(-)
 create mode 100644 Kconfig
 create mode 100644 hw/9pfs/Kconfig
 create mode 100644 hw/Kconfig
 create mode 100644 hw/acpi/Kconfig
 create mode 100644 hw/alpha/Kconfig
 create mode 100644 hw/arm/Kconfig
 create mode 100644 hw/audio/Kconfig
 create mode 100644 hw/block/Kconfig
 create mode 100644 hw/char/Kconfig
 create mode 100644 hw/core/Kconfig
 create mode 100644 hw/cpu/Kconfig
 create mode 100644 hw/cris/Kconfig
 create mode 100644 hw/display/Kconfig
 create mode 100644 hw/dma/Kconfig
 create mode 100644 hw/gpio/Kconfig
 create mode 100644 hw/i2c/Kconfig
 create mode 100644 hw/i386/Kconfig
 create mode 100644 hw/ide/Kconfig
 create mode 100644 hw/input/Kconfig
 create mode 100644 hw/intc/Kconfig
 create mode 100644 hw/isa/Kconfig
 create mode 100644 hw/lm32/Kconfig
 create mode 100644 hw/m68k/Kconfig
 create mode 100644 hw/microblaze/Kconfig
 create mode 100644 hw/mips/Kconfig
 create mode 100644 hw/misc/Kconfig
 create mode 100644 hw/moxie/Kconfig
 create mode 100644 hw/net/Kconfig
 create mode 100644 hw/nvram/Kconfig
 create mode 100644 hw/openrisc/Kconfig
 create mode 100644 hw/pci-bridge/Kconfig
 create mode 100644 hw/pci-host/Kconfig
 create mode 100644 hw/pci/Kconfig
 create mode 100644 hw/ppc/Kconfig
 create mode 100644 hw/s390x/Kconfig
 create mode 100644 hw/scsi/Kconfig
 create mode 100644 hw/sd/Kconfig
 create mode 100644 hw/sh4/Kconfig
 create mode 100644 hw/sparc/Kconfig
 create mode 100644 hw/sparc64/Kconfig
 create mode 100644 hw/ssi/Kconfig
 create mode 100644 hw/timer/Kconfig
 create mode 100644 hw/tpm/Kconfig
 create mode 100644 hw/unicore32/Kconfig
 create mode 100644 hw/usb/Kconfig
 create mode 100644 hw/usb/hcd-ohci-pci.c
 create mode 100644 hw/usb/hcd-ohci-sysbus.c
 create mode 100644 hw/usb/hcd-ohci.h
 create mode 100644 hw/watchdog/Kconfig
 create mode 100644 hw/xtensa/Kconfig
 create mode 160000 scripts/kconfig

-- 
1.8.1.2

[Qemu-devel] [v2 01/71] rules.mak: New logical functions

[Ákos Kovács]

lnot, land, lor, lif, eq, ne, isempty, notempty functions added
Example usage:
    obj-$(call lor,$(CONFIG_LINUX),$(CONFIG_BSD)) += feature.o

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 rules.mak | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/rules.mak b/rules.mak
index 4499745..7e8e3bd 100644
--- a/rules.mak
+++ b/rules.mak
@@ -106,6 +106,22 @@ clean: clean-timestamp
 obj := .
 old-nested-dirs :=
 
+# Logical functions
+lnot = $(if $(subst n,,$1),n,y)
+
+land-yy = y
+land = $(land-$1$2)
+
+lor = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)
+
+lif = $(if $(subst n,,$1),$2,$3)
+
+eq = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)
+ne = $(if $(subst $2,,$1)$(subst $1,,$2),y,n)
+
+isempty = $(call eq,$1,)
+notempty = $(call ne,$1,)
+
 define push-var
 $(eval save-$2-$1 = $(value $1))
 $(eval $1 :=)
-- 
1.8.1.2

[Qemu-devel] [v2 02/71] Makefile.target: CONFIG_NO_* variables removed

[Ákos Kovács]

CONFIG_NO_* variables replaced with the lnot logical function.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Makefile.target      | 8 ++------
 hw/pci/Makefile.objs | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 9a49852..bbc668b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -70,10 +70,6 @@ all: $(PROGS) stap
 # Dummy command so that make thinks it has done something
 	@true
 
-CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
-CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
-CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
-
 #########################################################
 # cpu emulator library
 obj-y = exec.o translate-all.o cpu-exec.o
@@ -84,7 +80,7 @@ obj-y += fpu/softfloat.o
 obj-y += target-$(TARGET_BASE_ARCH)/
 obj-y += disas.o
 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
-obj-$(CONFIG_NO_KVM) += kvm-stub.o
+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 
 #########################################################
 # Linux user emulator target
@@ -125,7 +121,7 @@ LIBS+=$(libs_softmmu)
 
 # xen support
 obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
-obj-$(CONFIG_NO_XEN) += xen-stub.o
+obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o
 
 # Hardware support
 ifeq ($(TARGET_NAME), sparc64)
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
index 720f438..80f8aa6 100644
--- a/hw/pci/Makefile.objs
+++ b/hw/pci/Makefile.objs
@@ -5,7 +5,7 @@ common-obj-$(CONFIG_PCI) += slotid_cap.o
 common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
 common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
 
-common-obj-$(CONFIG_NO_PCI) += pci-stub.o
+common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o
 common-obj-$(CONFIG_ALL) += pci-stub.o
 
 common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o
-- 
1.8.1.2

Re: [Qemu-devel] [v2 02/71] Makefile.target: CONFIG_NO_* variables removed

[Peter Maydell]

On 27 September 2013 11:30, Ákos Kovács <akoskovacs@gmx.com> wrote:
> CONFIG_NO_* variables replaced with the lnot logical function.
>
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  Makefile.target      | 8 ++------
>  hw/pci/Makefile.objs | 2 +-
>  2 files changed, 3 insertions(+), 7 deletions(-)

This is still your broken version which missed some CONFIG_NO_*
uses that need removing. I suggest you just incorporate my
v2 series patches into your series instead if they haven't been
committed yet (don't forget to include Paolo's reviewed-by tag):
http://lists.nongnu.org/archive/html/qemu-devel/2013-09/msg02443.html

thanks
-- PMM

[Qemu-devel] [v2 03/71] default-configs/: CONFIG_GDBSTUB_XML removed

[Ákos Kovács]

Makefile.target: Build gdbstub-xml.o only when
TARGET_XML_FILES is not empty.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Makefile.target                           | 2 +-
 default-configs/arm-linux-user.mak        | 2 --
 default-configs/arm-softmmu.mak           | 1 -
 default-configs/armeb-linux-user.mak      | 2 --
 default-configs/m68k-linux-user.mak       | 2 --
 default-configs/m68k-softmmu.mak          | 1 -
 default-configs/ppc-linux-user.mak        | 2 --
 default-configs/ppc-softmmu.mak           | 1 -
 default-configs/ppc64-linux-user.mak      | 2 --
 default-configs/ppc64-softmmu.mak         | 1 -
 default-configs/ppc64abi32-linux-user.mak | 2 --
 default-configs/ppcemb-softmmu.mak        | 1 -
 12 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index bbc668b..af6ac7e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -79,7 +79,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
 obj-y += fpu/softfloat.o
 obj-y += target-$(TARGET_BASE_ARCH)/
 obj-y += disas.o
-obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
+obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
 obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 
 #########################################################
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
index 46d4aa2..413361a 100644
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/arm-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for arm-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index ac0815d..d13bc2b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,7 +2,6 @@
 
 include pci.mak
 include usb.mak
-CONFIG_GDBSTUB_XML=y
 CONFIG_VGA=y
 CONFIG_ISA_MMIO=y
 CONFIG_NAND=y
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
index 41d0cc4..bf2ffe7 100644
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/armeb-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for armeb-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
index f3487aa..06cd5ed 100644
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/m68k-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for m68k-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 51fe5bb..d9552df 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -3,5 +3,4 @@
 include pci.mak
 include usb.mak
 CONFIG_COLDFIRE=y
-CONFIG_GDBSTUB_XML=y
 CONFIG_PTIMER=y
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
index 681a945..6273df2 100644
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/ppc-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for ppc-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index eac0b28..f5cd0bd 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,7 +3,6 @@
 include pci.mak
 include sound.mak
 include usb.mak
-CONFIG_GDBSTUB_XML=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
index 089c08f..422d3fb 100644
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/ppc64-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for ppc64-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 7831c2b..975112a 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -3,7 +3,6 @@
 include pci.mak
 include sound.mak
 include usb.mak
-CONFIG_GDBSTUB_XML=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
index f038ffd..1c657ec 100644
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -1,3 +1 @@
 # Default configuration for ppc64abi32-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 86080a7..4411203 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,7 +3,6 @@
 include pci.mak
 include sound.mak
 include usb.mak
-CONFIG_GDBSTUB_XML=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
-- 
1.8.1.2

[Qemu-devel] [v2 04/71] scripts/kconfig: kconfig-frontends submodule added

[Ákos Kovács]

Add the kconfig-frontends to scripts/, picking version 3.10.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 .gitmodules     | 3 +++
 scripts/kconfig | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 scripts/kconfig

diff --git a/.gitmodules b/.gitmodules
index d7e3f3c..754fc03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "dtc"]
 	path = dtc
 	url = git://git.qemu.org/dtc.git
+[submodule "scripts/kconfig"]
+	path = scripts/kconfig
+	url = git://ymorin.is-a-geek.org/kconfig-frontends
diff --git a/scripts/kconfig b/scripts/kconfig
new file mode 160000
index 0000000..f0a6c0a
--- /dev/null
+++ b/scripts/kconfig
@@ -0,0 +1 @@
+Subproject commit f0a6c0a0d14545c81757934c3679511b63b6c82f
-- 
1.8.1.2

[Qemu-devel] [v2 05/71] Makefile: Clone kconfig git submodule in Makefile

[Ákos Kovács]

configure: Append CONFIG_DEVICES_FILE=config-all-devices.mak to the config-host.mak
Use this new variable to control the current device configuration place.

If the user wants to configure QEMU with Kconfig, replace
config-all-devices.mak to kconfig-devices.mak at config-host.mak to
use the new configuration.

Make defconfig target capable to restore the original behaviour.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Makefile        | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 Makefile.target |  2 +-
 configure       |  3 ++
 3 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4d257f1..c8466a5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
 CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
 CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)
 CONFIG_ALL=y
--include config-all-devices.mak
+-include $(CONFIG_DEVICES_FILE)
 -include config-all-disas.mak
 
 include $(SRC_PATH)/rules.mak
@@ -56,7 +56,7 @@ Makefile: ;
 configure: ;
 
 .PHONY: all clean cscope distclean dvi html info install install-doc \
-	pdf recurse-all speed test dist
+	pdf recurse-all speed test dist help config-devices-file kconfig-reconfigure
 
 $(call set-vpath, $(SRC_PATH))
 
@@ -73,8 +73,11 @@ else
 DOCS=
 endif
 
+export KCONFIG_CONFIG=kconfig-devices.mak
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
+ifneq ($(CONFIG_DEVICES_FILE),$(KCONFIG_CONFIG))
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
+endif
 SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))
 
 ifeq ($(SUBDIR_DEVICES_MAK),)
@@ -112,6 +115,9 @@ endif
 
 defconfig:
 	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
+ifeq ($(CONFIG_DEVICES_FILE),$(KCONFIG_CONFIG))
+	$(call quiet-command,sed -i "s/CONFIG_DEVICES_FILE=.*/CONFIG_DEVICES_FILE=config-all-devices.mak/" config-host.mak)
+endif
 
 ifneq ($(wildcard config-host.mak),)
 include $(SRC_PATH)/Makefile.objs
@@ -180,6 +186,93 @@ libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o
 
 ######################################################################
 
+######################################################################
+# Kconfig rules
+#
+KCONFIG_PATH:=scripts/kconfig
+Kconfig:=$(SRC_PATH)/Kconfig
+export KCONFIG_AUTOHEADER=auto.h
+export KCONFIG_AUTOCONFIG=auto.mak
+
+KCONFIG_FRONTENDS:=$(KCONFIG_PATH)/frontends
+KCONFIG_CONF:=$(KCONFIG_FRONTENDS)/conf/conf
+
+kconfig-reconfigure:
+	$(call quiet-command, cd $(KCONFIG_PATH) ; ./configure)
+
+define kconfig-check-deps
+@if test -f $1 ; then \
+	$1 $(Kconfig); \
+else \
+	echo $2; \
+	echo "After installing the missing dependencies, please run \"make kconfig-reconfigure\""; \
+fi
+endef
+
+$(KCONFIG_PATH)/bootstrap:
+	@echo Cloning kconfig-frontends...
+	$(call quiet-command,git submodule update --init $(KCONFIG_PATH))
+
+$(KCONFIG_PATH)/Makefile: $(KCONFIG_PATH)/bootstrap
+	$(call quiet-command,cd $(KCONFIG_PATH) ; ./bootstrap ; ./configure)
+
+$(foreach i, conf nconf mconf gconf xconf, \
+	$(KCONFIG_FRONTENDS)/$i/$i): $(KCONFIG_PATH)/Makefile config-host.mak
+	$(MAKE) -C $(KCONFIG_PATH)
+
+config-devices-file:
+ifneq ($(CONFIG_DEVICES_FILE),$(KCONFIG_CONFIG))
+	$(call quiet-command,sed -i "s/CONFIG_DEVICES_FILE=.*/CONFIG_DEVICES_FILE=$(KCONFIG_CONFIG)/" config-host.mak)
+endif
+
+config: $(KCONFIG_CONF) config-devices-file
+	$< --oldaskconfig $(Kconfig)
+
+nconfig: $(KCONFIG_FRONTENDS)/nconfig/nconfig config-devices-file
+	$(call kconfig-check-deps,$<,"Please install libncurses5 and libncurses5-dev")
+
+xconfig: $(KCONFIG_FRONTENDS)/qconf/qconf config-devices-file
+	$(call kconfig-check-deps,$<,"Please install Qt headers and libraries (libqt4-gui, libqt4-dev)")
+
+gconfig: $(KCONFIG_FRONTENDS)/gconf/gconf config-devices-file
+	$(call kconfig-check-deps,$<,"Please install GTK+ headers and libraries (libgtk-dev, libglade-dev, gir-glib)")
+
+oldconfig: $(KCONFIG_CONF) config-devices-file
+	$< --$@ $(Kconfig)
+
+menuconfig: $(KCONFIG_FRONTENDS)/mconf/mconf config-devices-file
+	$(call kconfig-check-deps,$<,"Please install libncurses5 and libncurses5-dev")
+
+silentoldconfig: $(KCONFIG_CONF) config-devices-file
+	@echo "  Build Kconfig config file"
+	mkdir -p include/config
+	$< --$@ $(Kconfig)
+
+savedefconfig: $(obj)/conf config-devices-file
+	$< --$@=defconfig $(Kconfig)
+
+%config: $(KCONFIG_CONF) config-devices-file
+	$< --$@ $(Kconfig)
+
+help:
+	@echo  '  config	  - Update current config utilising a line-oriented program'
+	@echo  '  nconfig         - Update current config utilising a ncurses menu based program'
+	@echo  '  menuconfig	  - Update current config utilising a menu based program'
+	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
+	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
+	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
+	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
+	@echo  '  defconfig	  - New config with default from ARCH supplied defconfig'
+	@echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'
+	@echo  '  allnoconfig	  - New config where all options are answered with no'
+	@echo  '  allyesconfig	  - New config where all options are accepted with yes'
+	@echo  '  alldefconfig    - New config with all symbols set to default'
+	@echo  '  randconfig	  - New config with random answer to all options'
+	@echo  '  listnewconfig   - List new options'
+	@echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
+
+######################################################################
+
 qemu-img.o: qemu-img-cmds.h
 
 qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a
diff --git a/Makefile.target b/Makefile.target
index af6ac7e..adcc534 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -2,7 +2,7 @@
 
 include ../config-host.mak
 include config-target.mak
-include config-devices.mak
+include ../$(CONFIG_DEVICES_FILE)
 include $(SRC_PATH)/rules.mak
 
 $(call set-vpath, $(SRC_PATH))
diff --git a/configure b/configure
index 18fa608..cd01f05 100755
--- a/configure
+++ b/configure
@@ -4506,6 +4506,9 @@ if [ "$dtc_internal" = "yes" ]; then
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi
 
+# Add the default device configuration file
+echo "CONFIG_DEVICES_FILE=config-all-devices.mak" >> $config_host_mak
+
 # build tree in object directory in case the source is not in the current directory
 DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa"
 DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
-- 
1.8.1.2

[Qemu-devel] [v2 06/71] hw/arm/Makefile.objs: CONFIG_* created for each board

[Ákos Kovács]

The new CONFIG_* definitions added to the default-configs/arm-softmmu.mak

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/arm-softmmu.mak | 13 +++++++++++++
 hw/arm/Makefile.objs            | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index d13bc2b..885b0c1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -79,3 +79,16 @@ CONFIG_VERSATILE_PCI=y
 CONFIG_VERSATILE_I2C=y
 
 CONFIG_SDHCI=y
+
+CONFIG_COLLIE=y
+CONFIG_GUMSTIX=y
+CONFIG_HIGHBANK=y
+CONFIG_INTEGRATORCP=y
+CONFIG_KZM=y
+CONFIG_MUSICPAL=y
+CONFIG_PALM=y
+CONFIG_SPITZ=y
+CONFIG_TOSA=y
+CONFIG_VERSATILEPB=y
+CONFIG_VXPRESS=y
+CONFIG_Z2=y
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 3671b42..723f7c2 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,7 +1,28 @@
-obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o
-obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o
-obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o
-obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o
-
-obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
-obj-y += omap1.o omap2.o strongarm.o
+obj-y += boot.o
+obj-$(CONFIG_COLLIE)   += collie.o
+obj-$(CONFIG_EXYNOS4)  += exynos4_boards.o 
+obj-$(CONFIG_EXYNOS4) += exynos4210.o
+obj-$(CONFIG_GUMSTIX)  += gumstix.o
+obj-$(CONFIG_HIGHBANK) += highbank.o
+obj-$(CONFIG_INTEGRATORCP) += integratorcp.o
+obj-$(CONFIG_KZM)      += kzm.o
+obj-$(CONFIG_MAINSTONE)+= mainstone.o
+obj-$(CONFIG_MUSICPAL) += musicpal.o
+obj-$(CONFIG_NSERIES)  += nseries.o
+obj-$(CONFIG_OMAP_SX1) += omap_sx1.o
+obj-$(CONFIG_PALM)     += palm.o
+obj-$(CONFIG_REALVIEW) += realview.o 
+obj-$(CONFIG_SPITZ)    += spitz.o
+obj-$(CONFIG_STELLARIS)+= stellaris.o
+obj-$(CONFIG_TOSA)     += tosa.o
+obj-$(CONFIG_VERSATILEPB) += versatilepb.o
+obj-$(CONFIG_VEXPRESS)     += vexpress.o
+obj-$(CONFIG_ZYNQ) += xilinx_zynq.o 
+obj-$(CONFIG_ARMV7M) += armv7m.o
+obj-$(CONFIG_PXA2XX) += pxa2xx.o
+obj-$(CONFIG_Z2) += z2.o
+obj-$(CONFIG_PXA2XX) += pxa2xx_gpio.o
+obj-$(CONFIG_PXA2XX) += pxa2xx_pic.o
+obj-$(CONFIG_OMAP) += omap1.o
+obj-$(CONFIG_OMAP) += omap2.o 
+obj-$(CONFIG_STRONGARM) += strongarm.o
-- 
1.8.1.2

[Qemu-devel] [v2 08/71] hw/m68k/Makefile.objs: Conditionally build boards

[Ákos Kovács]

CONFIG_AN5206, CONFIG_DUMMY_M68K, CONFIG_MCF5206, CONFIG_MCF5208
make variables created for m68k boards, and added to
default-configs/m86k-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/m68k-softmmu.mak | 3 +++
 hw/m68k/Makefile.objs            | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index d9552df..72e1336 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -4,3 +4,6 @@ include pci.mak
 include usb.mak
 CONFIG_COLDFIRE=y
 CONFIG_PTIMER=y
+CONFIG_AN5206=y
+CONFIG_DUMMY_M68K=y
+CONFIG_MCF5208=y
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
index c4352e7..288dbb5 100644
--- a/hw/m68k/Makefile.objs
+++ b/hw/m68k/Makefile.objs
@@ -1,4 +1,5 @@
-obj-y += an5206.o mcf5208.o
-obj-y += dummy_m68k.o
+obj-$(CONFIG_AN5206) += an5206.o
+obj-$(CONFIG_DUMMY_M68K) += dummy_m68k.o
 
-obj-y += mcf5206.o mcf_intc.o
+obj-$(CONFIG_MCF5206) += mcf5206.o
+obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o
-- 
1.8.1.2

[Qemu-devel] [v2 09/71] hw/microblaze/Makefile.objs: Create configs for petalogix boards

[Ákos Kovács]

CONFIG_PETALOGIX_* configs added to default-configs/microblaze-softmmu.mak
and default-configs/microblazeel-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/microblaze-softmmu.mak   | 3 +++
 default-configs/microblazeel-softmmu.mak | 3 +++
 hw/microblaze/Makefile.objs              | 7 +++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index ce26308..11aaaa4 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -9,3 +9,6 @@ CONFIG_XILINX_SPI=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_SSI=y
 CONFIG_SSI_M25P80=y
+
+CONFIG_PETALOGIX_S3ADSP1800=y
+CONFIG_PETALOGIX_ML605=y
diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
index acf22c5..a6f22cd 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/microblazeel-softmmu.mak
@@ -9,3 +9,6 @@ CONFIG_XILINX_SPI=y
 CONFIG_XILINX_ETHLITE=y
 CONFIG_SSI=y
 CONFIG_SSI_M25P80=y
+
+CONFIG_PETALOGIX_S3ADSP1800=y
+CONFIG_PETALOGIX_ML605=y
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index c65e2aa..43fa3fa 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -1,4 +1,3 @@
-obj-y += petalogix_s3adsp1800_mmu.o
-obj-y += petalogix_ml605_mmu.o
-obj-y += boot.o
-obj-y += pic_cpu.o
+obj-y += boot.o pic_cpu.o
+obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o
+obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o
-- 
1.8.1.2

[Qemu-devel] [v2 10/71] hw/mips/Makefile.objs: Create CONFIG_* for mips boards

[Ákos Kovács]

Add the new configs to default-configs/mips*-sofmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/mips-softmmu.mak     | 6 ++++++
 default-configs/mips64-softmmu.mak   | 6 ++++++
 default-configs/mips64el-softmmu.mak | 6 ++++++
 default-configs/mipsel-softmmu.mak   | 6 ++++++
 hw/mips/Makefile.objs                | 8 ++++++--
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 71177ef..e6ed0ee 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -35,3 +35,9 @@ CONFIG_MC146818RTC=y
 CONFIG_VT82C686=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_EMPTY_SLOT=y
+
+CONFIG_R4K=y
+CONFIG_JAZZ=y
+CONFIG_MALTA=y
+CONFIG_MIPSSIM=y
+CONFIG_FULONG=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index 617301b..643bb80 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -35,3 +35,9 @@ CONFIG_MC146818RTC=y
 CONFIG_VT82C686=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_EMPTY_SLOT=y
+
+CONFIG_R4K=y
+CONFIG_JAZZ=y
+CONFIG_MALTA=y
+CONFIG_MIPSSIM=y
+CONFIG_FULONG=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 317b151..6aa8ad6 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -37,3 +37,9 @@ CONFIG_MC146818RTC=y
 CONFIG_VT82C686=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_EMPTY_SLOT=y
+
+CONFIG_R4K=y
+CONFIG_JAZZ=y
+CONFIG_MALTA=y
+CONFIG_MIPSSIM=y
+CONFIG_FULONG=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index 532a9ae..783ed49 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -35,3 +35,9 @@ CONFIG_MC146818RTC=y
 CONFIG_VT82C686=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_EMPTY_SLOT=y
+
+CONFIG_R4K=y
+CONFIG_JAZZ=y
+CONFIG_MALTA=y
+CONFIG_MIPSSIM=y
+CONFIG_FULONG=y
diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
index 0a652f8..8c32312 100644
--- a/hw/mips/Makefile.objs
+++ b/hw/mips/Makefile.objs
@@ -1,4 +1,8 @@
-obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
 obj-y += addr.o cputimer.o mips_int.o
+obj-$(CONFIG_GT64XXX_PCI) += gt64xxx_pci.o
+
+obj-$(CONFIG_R4K) += mips_r4k.o
+obj-$(CONFIG_JAZZ) += mips_jazz.o
+obj-$(CONFIG_MALTA) += mips_malta.o 
 obj-$(CONFIG_FULONG) += mips_fulong2e.o
-obj-y += gt64xxx_pci.o
+obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
-- 
1.8.1.2

[Qemu-devel] [v2 11/71] hw/ppc/Makefile.objs: Build all boards conditinally

[Ákos Kovács]

CONFIG_PPC405, CONFIG_PPC440, CONFIG_PPC4XX, CONFIG_PREP,
CONFIG_MAC_OLDWORLD, CONFIG_MAC_NEWWORLD, CONFIG_VIRTEX configuration
options created for default-configs/ppc*-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/ppc-softmmu.mak    |  8 ++++++++
 default-configs/ppc64-softmmu.mak  |  9 +++++++++
 default-configs/ppcemb-softmmu.mak |  8 ++++++++
 hw/ppc/Makefile.objs               | 13 +++++++------
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index f5cd0bd..ec39ded 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -46,3 +46,11 @@ CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
 # For PReP
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
+
+CONFIG_PREP=y
+CONFIG_PPC4XX=y
+CONFIG_PPC405=y
+CONFIG_PPC440=y
+CONFIG_MAC_OLDWORLD=y
+CONFIG_MAC_NEWWORLD=y
+CONFIG_VIRTEX=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 975112a..bfe9dce 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -55,3 +55,12 @@ CONFIG_I82374=y
 CONFIG_I8257=y
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
+
+CONFIG_PREP=y
+CONFIG_PPC4XX=y
+CONFIG_PPC405=y
+CONFIG_PPC440=y
+CONFIG_PREP=y
+CONFIG_MAC_OLDWORLD=y
+CONFIG_MAC_NEWWORLD=y
+CONFIG_VIRTEX=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 4411203..1e17114 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -41,3 +41,11 @@ CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
 # For PReP
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
+
+CONFIG_PREP=y
+CONFIG_PPC4XX=y
+CONFIG_PPC405=y
+CONFIG_PPC440=y
+CONFIG_MAC_OLDWORLD=y
+CONFIG_MAC_NEWWORLD=y
+CONFIG_VIRTEX=y
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 7a1cd5d..9a52a5e 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -5,16 +5,17 @@ obj-$(CONFIG_PSERIES) += spapr.o spapr_vio.o spapr_events.o
 obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
 obj-$(CONFIG_PSERIES) += spapr_pci.o
 # PowerPC 4xx boards
-obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o
-obj-y += ppc4xx_pci.o
+obj-$(CONFIG_PPC405) += ppc405_boards.o  ppc405_uc.o
+obj-$(CONFIG_PPC440) += ppc440_bamboo.o
+obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc4xx_devs.o
 # PReP
-obj-y += prep.o
+obj-$(CONFIG_PREP) += prep.o
 # OldWorld PowerMac
-obj-y += mac_oldworld.o
+obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o
 # NewWorld PowerMac
-obj-y += mac_newworld.o
+obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o
 # e500
 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
 obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
 # PowerPC 440 Xilinx ML507 reference board.
-obj-y += virtex_ml507.o
+obj-$(CONFIG_VIRTEX) += virtex_ml507.o
-- 
1.8.1.2

[Qemu-devel] [v2 12/71] hw/sh4/Makefile.objs: Build sh4 boards conditionally

[Ákos Kovács]

New CONFIG_* varibales created for r2d and shix boards
and added to the default-configs/sh4*-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/sh4-softmmu.mak   | 3 +++
 default-configs/sh4eb-softmmu.mak | 3 +++
 hw/sh4/Makefile.objs              | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 8e00390..6eb62d7 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -16,3 +16,6 @@ CONFIG_PCSPK=y
 CONFIG_I82374=y
 CONFIG_I8257=y
 CONFIG_MC146818RTC=y
+
+CONFIG_R2D=y
+CONFIG_SHIX=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index efdd058..ba962df 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -16,3 +16,6 @@ CONFIG_PCSPK=y
 CONFIG_I82374=y
 CONFIG_I8257=y
 CONFIG_MC146818RTC=y
+
+CONFIG_R2D=y
+CONFIG_SHIX=y
diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
index 2393702..3f9d652 100644
--- a/hw/sh4/Makefile.objs
+++ b/hw/sh4/Makefile.objs
@@ -1,4 +1,4 @@
-obj-y += shix.o r2d.o
-
 obj-y += sh7750.o sh7750_regnames.o
 obj-y += sh_pci.o
+obj-$(CONFIG_R2D)  += r2d.o
+obj-$(CONFIG_SHIX) += shix.o
-- 
1.8.1.2

[Qemu-devel] [v2 13/71] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created

[Ákos Kovács]

CONFIG_LEON3 added to default-configs/sparc-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/sparc-softmmu.mak | 2 ++
 hw/sparc/Makefile.objs            | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 8fc93dd..8680d75 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -15,4 +15,6 @@ CONFIG_CS4231=y
 CONFIG_GRLIB=y
 CONFIG_STP2000=y
 CONFIG_ECCMEMCTL=y
+
 CONFIG_SUN4M=y
+CONFIG_LEON3=y
diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
index c987b5b..540cedc 100644
--- a/hw/sparc/Makefile.objs
+++ b/hw/sparc/Makefile.objs
@@ -1 +1,2 @@
-obj-y += sun4m.o leon3.o
+obj-$(CONFIG_SUN4M) += sun4m.o
+obj-$(CONFIG_LEON3) += leon3.o
-- 
1.8.1.2

[Qemu-devel] [v2 14/71] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/lm32/Makefile.objs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index ea6418a..c394186 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -1,3 +1,3 @@
 # LM32 boards
-obj-y += lm32_boards.o
-obj-y += milkymist.o
+obj-$(CONFIG_LM32) += lm32_boards.o
+obj-$(CONFIG_MILKYMIST) += milkymist.o
-- 
1.8.1.2

[Qemu-devel] [v2 15/71] hw/s390x/Makefile.objs: Create CONFIG_S390_VIRTIO and CONFIG_S390_CCW

[Ákos Kovács]

Conditionally build s390-virtio-*.o and s390-virtio-ccw.o boards

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/s390x/Makefile.objs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index 77e1218..a381cc9 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -1,9 +1,9 @@
-obj-y = s390-virtio-bus.o s390-virtio.o
-obj-y += s390-virtio-hcall.o
+obj-$(CONFIG_S390_VIRTIO) = s390-virtio-bus.o s390-virtio.o
+obj-$(CONFIG_S390_VIRTIO) += s390-virtio-hcall.o
 obj-y += sclp.o
 obj-y += event-facility.o
 obj-y += sclpquiesce.o
 obj-y += ipl.o
 obj-y += css.o
-obj-y += s390-virtio-ccw.o
+obj-$(CONFIG_S390_CCW) += s390-virtio-ccw.o
 obj-y += virtio-ccw.o
-- 
1.8.1.2

[Qemu-devel] [v2 16/71] hw/s390x/Kconfig: Add s390x Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/s390x/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 hw/s390x/Kconfig

diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig
new file mode 100644
index 0000000..39fd62a
--- /dev/null
+++ b/hw/s390x/Kconfig
@@ -0,0 +1,12 @@
+menu "s390x"
+    config S390_VIRTIO
+        bool "s390x virtio"
+        select SCLPCONSOLE
+        default y
+
+    config S390_CCW
+        bool "s390x virtio ccw"
+        select SCLPCONSOLE
+        select S390_VIRTIO
+        default y
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 17/71] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_lx60 conditionally

[Ákos Kovács]

Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/xtensa-softmmu.mak   | 3 +++
 default-configs/xtensaeb-softmmu.mak | 3 +++
 hw/xtensa/Makefile.objs              | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
index 9d8899c..0ca02cf 100644
--- a/default-configs/xtensa-softmmu.mak
+++ b/default-configs/xtensa-softmmu.mak
@@ -3,3 +3,6 @@
 CONFIG_SERIAL=y
 CONFIG_OPENCORES_ETH=y
 CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_LX60=y
diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak
index 9d8899c..0ca02cf 100644
--- a/default-configs/xtensaeb-softmmu.mak
+++ b/default-configs/xtensaeb-softmmu.mak
@@ -3,3 +3,6 @@
 CONFIG_SERIAL=y
 CONFIG_OPENCORES_ETH=y
 CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_LX60=y
diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
index 6ead782..d85af3b 100644
--- a/hw/xtensa/Makefile.objs
+++ b/hw/xtensa/Makefile.objs
@@ -1,3 +1,3 @@
 obj-y += pic_cpu.o
-obj-y += xtensa_sim.o
-obj-y += xtensa_lx60.o
+obj-$(CONFIG_XTENSA_SIM) += xtensa_sim.o
+obj-$(CONFIG_XTENSA_LX60) += xtensa_lx60.o
-- 
1.8.1.2

[Qemu-devel] [v2 18/71] hw/intc/Makefile.objs: Make CONFIG_ARMV7_NVIC

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/intc/Kconfig       | 32 ++++++++++++++++++++++++++++++++
 hw/intc/Makefile.objs |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 hw/intc/Kconfig

diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
new file mode 100644
index 0000000..40d8ebc
--- /dev/null
+++ b/hw/intc/Kconfig
@@ -0,0 +1,32 @@
+config HEATHROW_PIC
+    bool
+
+config I8259
+    bool
+
+config PL190
+    bool
+
+config APIC
+    bool
+    select IOAPIC
+
+config ARM_GIC
+    bool
+
+config ARM_GIC_KVM
+    bool
+    depends on KVM
+
+config IOAPIC
+    bool
+
+config OPENPICS
+    bool
+
+config OPENPIC_KVM
+    bool
+
+config ARMV7M_NVIC
+    bool
+    select ARM_GIC
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index 2851eed..07f8302 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -15,7 +15,7 @@ common-obj-$(CONFIG_OPENPIC) += openpic.o
 
 obj-$(CONFIG_APIC) += apic.o apic_common.o
 obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
-obj-$(CONFIG_STELLARIS) += armv7m_nvic.o
+obj-$(CONFIG_ARMV7M_NVIC) += armv7m_nvic.o
 obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o
 obj-$(CONFIG_GRLIB) += grlib_irqmp.o
 obj-$(CONFIG_IOAPIC) += ioapic.o
-- 
1.8.1.2

[Qemu-devel] [v2 19/71] hw/9pfs/Kconfig: Add 9pfs Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/9pfs/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 hw/9pfs/Kconfig

diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig
new file mode 100644
index 0000000..f16ffed
--- /dev/null
+++ b/hw/9pfs/Kconfig
@@ -0,0 +1,2 @@
+config OPEN_BY_HANDLE
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 20/71] hw/arm/Kconfig: Add ARM Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/arm/Kconfig | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 hw/arm/Kconfig

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
new file mode 100644
index 0000000..5548656
--- /dev/null
+++ b/hw/arm/Kconfig
@@ -0,0 +1,237 @@
+menu "ARM" 
+    config ARMV7M
+        bool
+        default y
+
+    config EXYNOS4
+        bool "Samsung Exynos4210 SoC"
+        select A9MPCORE
+        select A9SCU # snoop controll unit
+        select ARMV7M
+        select ARMV7M_NVIC
+        select ARM_GIC
+        select ARM_MPTIMER
+        select LAN9118
+        select PL310 # cache controller
+        select USB_EHCI
+        select USB_EHCI_SYSBUS
+        default y
+
+    config HIGHBANK
+        bool "Calxeda Highbank SoC"
+        select A15MPCORE
+        select A9MPCORE
+        select A9SCU # snoop controll unit
+        select AHCI
+        select ARMV7M_NVIC
+        select ARM_MPTIMER
+        select ARM_TIMER # sp804
+        select PCI
+        select PL011 # UART
+        select PL022 # Serial port
+        select PL031 # RTC
+        select PL061 # GPIO
+        select PL310 # cache controller
+        select XGMAC # ethernet
+        default y
+
+    config INTEGRATORCP
+        bool "ARM Integrator CP"
+        select SMC91C111
+        select ARM_TIMER
+        select ARMV7M_NVIC
+        select PL011 # UART
+        select PL031 # RTC
+        select PL050 # keyboard/mouse
+        select PL110 # pl111 LCD controller
+        select PL181 # display
+        default y
+
+    config KZM
+        bool "Kzm"
+        select SERIAL
+        select IMX
+        select LAN9118
+        select ARMV7M_NVIC
+        default y
+
+    config MUSICPAL
+        bool "Marvell MV88W8618 / Freecom MusicPal"
+        select PFLASH_CFI02
+        select PTIMER
+        select BITBANG_I2C
+        select MARVELL_88W8618
+        select ARMV7M_NVIC
+        select WM8750
+        select SERIAL
+        default y
+
+    config OMAP
+        bool
+        select SERIAL
+        select PFLASH_CFI01
+        select PCI
+        select ARMV7M_NVIC
+
+    config NSERIES
+        bool "Nokia N-Series tablets"
+        select TMP105   # tempature sensor
+        select BLIZZARD # LCD/TV controller
+        select ONENAND 
+        select TSC210X  # touchscreen/sensors/audio
+        select TSC2005  # touchscreen/sensors/keypad
+        select LM832X   # GPIO keyboard chip
+        select TWL92230 # energy-management
+        select OMAP
+        default y
+
+    config PALM
+        bool "PalmOne PDAs"
+        select TSC210X
+        select OMAP
+        default y
+
+    config STELLARIS
+        bool "Stellaris"
+        select PL011 # UART
+        select PL022 # Serial port
+        select PL061 # GPIO
+        select STELLARIS_INPUT
+        select STELLARIS_ENET # ethernet
+        select SSD0303 # OLED display
+        select SSD0323 # OLED display
+        select SSI_SD
+        select ARMV7M_NVIC
+        default y
+
+    config REALVIEW
+        bool "ARM Realview baseboard"
+        select LAN9118
+        select SMC91C111
+
+        select VERSATILE_PCI
+        select WM8750 # audio codec
+        select PL011  # UART
+        select PL041  # audio codec
+        select PL050  # keyboard/mouse
+        select PL061  # GPIO
+        select PL080  # DMA controller
+        select PL110  # display
+        select VERSATILE_I2C
+        select DS1338 # I2C RTC+NVRAM
+        select USB_OHCI
+        select ARM_GIC
+        select ARMV7M_NVIC
+        select ARM_TIMER
+        select ARM15MPCORE
+        select ARM11MPCORE
+        select ARM9MPCORE
+    
+    config VERSATILEPB
+        bool "ARM Versatile platform"
+        select PFLASH_CFI01
+        select PL031  # RTC
+        select PL050  # keyboard/mouse
+        select PL080  # DMA controller
+        select PL181  # display
+        select PL190  # Vector PIC
+        select ARM_TIMER # sp804
+        select USB_OHCI
+        select LSI_SCSI_PCI
+        select REALVIEW
+        default y
+
+    config VXPRESS
+        bool "ARM Versatile Express"
+        select PFLASH_CFI01
+        select LAN9118
+        select PL011 # UART
+        select PL031  # RTC
+        select PL041 # audio codec
+        select PL110 # pl111 LCD controller
+        select PL181  # display
+        select PL310 # cache controller
+        select A9SCU # snoop controll unit
+        select ARM_TIMER # sp804
+        select ARM_MPTIMER
+        select ARM15MPCORE
+        select ARM9MPCORE
+        select REALVIEW
+        default y
+
+    config ZYNQ
+        bool "Xilinx Zynq Baseboard"
+        select ARM9MPCORE
+        select CADENCE # UART
+        select PCI
+        select PFLASH_CFI02
+        select SDHCI
+        select USB_EHCI
+        select XILINX # UART
+        select XILINX_SPI
+        select XILINX_SPISS
+        default y
+
+    config PXA2XX
+        bool "Intel XScale PXA255/270"
+        select SERIAL
+        select PCI
+        select USB_OHCI
+        select SSI
+        default y
+
+    config GUMSTIX
+        bool "Gumstix platform"
+        select PFLASH_CFI01
+        select SMC91C111
+        depends on PXA2XX
+        default y
+
+    config TOSA
+        bool "PXA255 Sharp Zaurus SL-6000 PDA platform"
+        select ZAURUS  # scoop
+        select MICRODRIVE
+        depends on PXA2XX
+        default y
+
+    config MAINSTONE
+        bool "PXA270-based Intel Mainstone"
+        depends on PXA2XX
+        select PFLASH_CFI01
+        select SMC91C111
+        default y
+
+    config SPITZ
+        bool "PXA270-based Clamshell PDA platforms"
+        select ADS7846 # display
+        select MAX111X # A/D converter
+        select WM8750  # audio codec
+        select MAX7310 # GPIO expander
+        select ZAURUS  # scoop
+        select NAND    # memory
+        select ECC     # Error-correcting for NAND
+        select MICRODRIVE
+        depends on PXA2XX
+        default y
+
+    config Z2
+        bool "Zipit Z2"
+        select PFLASH_CFI01
+        select WM8750
+        select PL011 # UART
+        depends on PXA2XX
+        default y
+
+    config STRONGARM
+       bool 
+       select PXA2XX
+
+    config COLLIE
+        bool "Sharp Zaurus SL-5500"
+        select PFLASH_CFI01
+        select ZAURUS  # scoop
+        select STRONGARM
+        default y
+        help
+            SA-1110-based Sharp Zaurus SL-5500 platform.
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 21/71] hw/audio/Kconfig: Add audio Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/audio/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 hw/audio/Kconfig

diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig
new file mode 100644
index 0000000..bb6c31d
--- /dev/null
+++ b/hw/audio/Kconfig
@@ -0,0 +1,41 @@
+menu "Audio devices"
+    config SB16
+        bool
+        #select ISA
+    
+    config ES1370
+        bool "ES1370"
+        depends on PCI
+
+    config AC97
+        bool "AC97 sound card"
+        default y
+        depends on PCI
+
+    config ADLIB
+        bool
+        #select ISA
+
+    config CS4231A
+        bool
+
+    config HDA
+        bool
+        #select ISA
+
+    config PCSPK
+        bool
+        select I8254
+
+    config WM8750
+        bool
+
+    config PL041
+        bool
+
+    config CS4231
+        bool
+
+    config MARVELL_88W8618
+        bool
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 22/71] hw/block/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/block/Kconfig | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 hw/block/Kconfig

diff --git a/hw/block/Kconfig b/hw/block/Kconfig
new file mode 100644
index 0000000..d7a7e61
--- /dev/null
+++ b/hw/block/Kconfig
@@ -0,0 +1,31 @@
+config FDC
+    bool
+    select I8257 if !SUN4M
+    #depends on ISA
+
+config SSI_M25P80
+    bool
+    depends on SSI
+
+config NAND
+    bool
+
+config PFLASH_CFI01
+    bool
+
+config PFLASH_CFI02
+    bool
+
+config ECC
+    bool
+
+config ONENAND
+    bool
+
+config PC_SYSFW
+    bool
+    #depends on ISA
+
+config NVME_PCI
+    bool
+    depends on PCI
-- 
1.8.1.2

Re: [Qemu-devel] [v2 22/71] hw/block/Kconfig: Add Kconfig file

[Stefan Hajnoczi]

On Fri, Sep 27, 2013 at 04:30:43AM +0200, Ákos Kovács wrote:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/block/Kconfig | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>  create mode 100644 hw/block/Kconfig
> 
> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
> new file mode 100644
> index 0000000..d7a7e61
> --- /dev/null
> +++ b/hw/block/Kconfig
> @@ -0,0 +1,31 @@
> +config FDC
> +    bool
> +    select I8257 if !SUN4M
> +    #depends on ISA
> +
> +config SSI_M25P80
> +    bool
> +    depends on SSI
> +
> +config NAND
> +    bool
> +
> +config PFLASH_CFI01
> +    bool
> +
> +config PFLASH_CFI02
> +    bool
> +
> +config ECC
> +    bool
> +
> +config ONENAND
> +    bool
> +
> +config PC_SYSFW
> +    bool
> +    #depends on ISA
> +
> +config NVME_PCI
> +    bool
> +    depends on PCI
> -- 
> 1.8.1.2

Where is virtio-blk?

Stefan

Re: [Qemu-devel] [v2 22/71] hw/block/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 27/09/2013 13:14, Stefan Hajnoczi ha scritto:
> On Fri, Sep 27, 2013 at 04:30:43AM +0200, Ákos Kovács wrote:
>> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
>> ---
>>  hw/block/Kconfig | 31 +++++++++++++++++++++++++++++++
>>  1 file changed, 31 insertions(+)
>>  create mode 100644 hw/block/Kconfig
>>
>> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
>> new file mode 100644
>> index 0000000..d7a7e61
>> --- /dev/null
>> +++ b/hw/block/Kconfig
>> @@ -0,0 +1,31 @@
>> +config FDC
>> +    bool
>> +    select I8257 if !SUN4M
>> +    #depends on ISA
>> +
>> +config SSI_M25P80
>> +    bool
>> +    depends on SSI
>> +
>> +config NAND
>> +    bool
>> +
>> +config PFLASH_CFI01
>> +    bool
>> +
>> +config PFLASH_CFI02
>> +    bool
>> +
>> +config ECC
>> +    bool
>> +
>> +config ONENAND
>> +    bool
>> +
>> +config PC_SYSFW
>> +    bool
>> +    #depends on ISA
>> +
>> +config NVME_PCI
>> +    bool
>> +    depends on PCI
>> -- 
>> 1.8.1.2
> 
> Where is virtio-blk?

Because of the proxy virtio-*-pci devices that are all defined in a
single file, all virtio devices are currently keyed by a single
CONFIG_VIRTIO symbol.  It could be indeed possible to split it and use
"select" dependencies, though.

Paolo

[Qemu-devel] [v2 23/71] hw/char/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/char/Kconfig | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 hw/char/Kconfig

diff --git a/hw/char/Kconfig b/hw/char/Kconfig
new file mode 100644
index 0000000..7ec1d6d
--- /dev/null
+++ b/hw/char/Kconfig
@@ -0,0 +1,24 @@
+config IPACK 
+    bool
+    depends on PCI
+
+config ESCC
+    bool
+
+config PARALLEL
+    bool
+    #depends on ISA
+
+config SERIAL
+    bool
+    #depends on ISA
+
+config SERIAL_PCI
+    bool
+    depends on PCI
+
+config SCLPCONSOLE
+    bool
+
+config PL011
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 24/71] hw/core/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/core/Kconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 hw/core/Kconfig

diff --git a/hw/core/Kconfig b/hw/core/Kconfig
new file mode 100644
index 0000000..8c275f7
--- /dev/null
+++ b/hw/core/Kconfig
@@ -0,0 +1,11 @@
+config EMPTY_SLOT
+    bool
+
+config XILINX_AXI
+    bool
+
+config PTIMER
+    bool
+
+config SOFTMMU
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 25/71] hw/cpu/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/cpu/Kconfig | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 hw/cpu/Kconfig

diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig
new file mode 100644
index 0000000..bd208bf
--- /dev/null
+++ b/hw/cpu/Kconfig
@@ -0,0 +1,18 @@
+config ARM11MPCORE
+    bool
+    select ARM_GIC
+    select ARM_MPTIMER
+    select REALVIEW
+
+config A9MPCORE
+    bool 
+    select ARM_GIC
+    select ARM_MPTIMER
+    select A9SCU
+
+config A15MPCORE
+    bool
+    select ARM_GIC
+
+config ICC_BUS
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 26/71] hw/display/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/display/Kconfig | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 hw/display/Kconfig

diff --git a/hw/display/Kconfig b/hw/display/Kconfig
new file mode 100644
index 0000000..1f6f386
--- /dev/null
+++ b/hw/display/Kconfig
@@ -0,0 +1,84 @@
+config ADS7846
+    bool
+    select SSI
+
+config VGA_CIRRUS
+    bool
+    depends on PCI
+    select VGA
+    #select ISA
+
+config G364FB
+    bool
+
+config JAZZ_LED
+    bool
+
+config PL110
+    bool
+    select FRAMEBUFFER
+
+config SSD0303
+    bool
+    #select I2C
+
+config SSD0323
+    bool
+    select SSI
+
+config VGA_PCI
+    bool
+    select VGA
+    depends on PCI
+
+config VGA_ISA
+    bool
+    select VGA
+    #select ISA
+
+config VGA_ISA_MM
+    bool
+    select VGA
+
+config VMWARE_VGA
+    bool
+    select VGA
+    depends on PCI
+
+config BLIZZARD
+    bool
+
+config FRAMEBUFFER
+    bool
+
+config MILKYMIST
+    bool
+    select FRAMEBUFFER
+
+config ZAURUS
+    bool
+    select NAND
+    select ECC
+
+config OMAP
+    bool
+    select FRAMEBUFFER
+
+config PXA2XX
+    bool
+    select FRAMEBUFFER
+
+config MILKYMIST_TMU2
+    bool
+
+config SM501
+    bool
+
+config TCX
+    bool
+
+config VGA
+    bool
+
+config QXL
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 27/71] hw/dma/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/dma/Kconfig | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 hw/dma/Kconfig

diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
new file mode 100644
index 0000000..65e1707
--- /dev/null
+++ b/hw/dma/Kconfig
@@ -0,0 +1,24 @@
+config RC4030
+    bool
+
+config PL080
+    bool
+
+config PL330
+    bool
+
+config I82374
+    bool
+    select I8257
+    #depends on ISA
+
+config I8257
+    bool
+    #depends on ISA
+
+config XILINX_AXI
+    bool
+    select PTIMER
+
+config STP2000
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 28/71] hw/gpio/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/gpio/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 hw/gpio/Kconfig

diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig
new file mode 100644
index 0000000..820c76f
--- /dev/null
+++ b/hw/gpio/Kconfig
@@ -0,0 +1,5 @@
+config MAX7310
+    bool
+
+config PL061
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 29/71] hw/i2c/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/i2c/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 hw/i2c/Kconfig

diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig
new file mode 100644
index 0000000..eaf17cc
--- /dev/null
+++ b/hw/i2c/Kconfig
@@ -0,0 +1,10 @@
+config VERSATILE_I2C
+    bool
+    select BITBANG_I2C
+
+config ACPI
+    bool
+    depends on PCI
+    
+config BITBANG_I2C
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 30/71] hw/ide/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/ide/Kconfig | 50 +++++++++++++++++++++++++++++++++++++++
 hw/net/Kconfig | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 hw/ide/Kconfig
 create mode 100644 hw/net/Kconfig

diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
new file mode 100644
index 0000000..a3217b8
--- /dev/null
+++ b/hw/ide/Kconfig
@@ -0,0 +1,50 @@
+config IDE_CORE
+    bool
+    #depends on ISA
+
+config IDE_QDEV
+    bool
+    select IDE_CORE
+
+config IDE_PCI
+    bool
+    select IDE_QDEV
+    select USB_XHCI
+
+config IDE_ISA
+    bool
+    #depends on ISA
+    select IDE_QDEV
+
+config IDE_PIIX
+    bool
+    select IDE_PCI
+    depends on PCI
+
+config IDE_CMD646
+    bool
+    #depends on ISA
+    depends on PCI
+    select IDE_QDEV
+
+config IDE_MACIO
+    bool
+    select IDE_QDEV
+
+config IDE_MMIO
+    bool
+    select IDE_QDEV
+
+config IDE_VIA
+    bool
+    select IDE_QDEV
+    select IDE_PIIX
+
+config MICRODRIVE
+    bool
+    select IDE_CORE
+
+config AHCI
+    bool
+    select IDE_QDEV
+    depends on PCI
diff --git a/hw/net/Kconfig b/hw/net/Kconfig
new file mode 100644
index 0000000..19ca549
--- /dev/null
+++ b/hw/net/Kconfig
@@ -0,0 +1,74 @@
+menu "Network devices"
+    config DP8393X
+        bool
+
+    config XEN_BACKEND
+        bool
+
+    config NE2000_PCI
+        bool "NE2000 ethernet card"
+        depends on PCI
+
+    config EEPRO100_PCI
+        bool "Intel EEPRO100"
+        depends on PCI
+
+    config PCNET_COMMON
+        bool
+
+    config PCNET_PCI
+        bool
+        depends on PCI
+        select PCNET_COMMON
+
+    config E1000_PCI
+        bool "Intel Gigabit E1000 ethernet"
+        depends on PCI
+
+    config RTL8139_PCI
+        bool "Realtek RTL8139 ethernet"
+        depends on PCI
+
+    config VMXNET3_PCI
+        bool "VmWare paravirtual Ethernet v3"
+        depends on PCI
+
+    config SMC91C111
+        bool
+
+    config LAN9118
+        bool
+        select PTIMER
+
+    config NE2000_ISA
+        bool
+        select NE2000_PCI
+
+    config OPENCORES_ETH
+        bool
+
+    config XGMAC
+        bool
+
+    config MIPSNET
+        bool 
+
+    config XILINX_AXI
+        bool
+
+    config STELLARIS_ENET
+        bool
+
+    config LANCE
+        bool
+        select PCNET_COMMON
+
+    config COLDFIRE
+        bool
+
+    config XILINX_ETHLITE
+        bool
+
+    config VIRTIO
+        bool
+endmenu
-- 
1.8.1.2

Re: [Qemu-devel] [v2 30/71] hw/ide/Kconfig: Add Kconfig file

[Stefan Hajnoczi]

On Fri, Sep 27, 2013 at 04:30:51AM +0200, Ákos Kovács wrote:
> diff --git a/hw/net/Kconfig b/hw/net/Kconfig
> new file mode 100644
> index 0000000..19ca549
> --- /dev/null
> +++ b/hw/net/Kconfig

This should be a separate patch.

> @@ -0,0 +1,74 @@
> +menu "Network devices"
> +    config DP8393X
> +        bool
> +
> +    config XEN_BACKEND
> +        bool

Should all devices have a "depends on $BUS" so they can only be
configured if the bus is also configured?

Re: [Qemu-devel] [v2 30/71] hw/ide/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 27/09/2013 13:11, Stefan Hajnoczi ha scritto:
> On Fri, Sep 27, 2013 at 04:30:51AM +0200, Ákos Kovács wrote:
>> diff --git a/hw/net/Kconfig b/hw/net/Kconfig
>> new file mode 100644
>> index 0000000..19ca549
>> --- /dev/null
>> +++ b/hw/net/Kconfig
> 
> This should be a separate patch.
> 
>> @@ -0,0 +1,74 @@
>> +menu "Network devices"
>> +    config DP8393X
>> +        bool
>> +
>> +    config XEN_BACKEND
>> +        bool
> 
> Should all devices have a "depends on $BUS" so they can only be
> configured if the bus is also configured?

Yes, but DP8393X is not qdevified.

That said, XEN_BACKEND should be in hw/xen, not here.

Paolo

[Qemu-devel] [v2 31/71] hw/input/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/input/Kconfig | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 hw/input/Kconfig

diff --git a/hw/input/Kconfig b/hw/input/Kconfig
new file mode 100644
index 0000000..9114433
--- /dev/null
+++ b/hw/input/Kconfig
@@ -0,0 +1,23 @@
+config ADB
+    bool
+
+config LM832X
+    bool
+
+config PCKBD
+    bool
+
+config PL050
+    bool
+
+config STELLARIS_INPUT
+    bool
+
+config TSC2005
+    bool
+
+config TSC210X
+    bool
+
+config VMMOUSE
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 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 33/71] hw/isa/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/isa/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 hw/isa/Kconfig

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
new file mode 100644
index 0000000..8f4beda
--- /dev/null
+++ b/hw/isa/Kconfig
@@ -0,0 +1,39 @@
+#config ISA
+#   bool
+
+config APM
+    bool
+
+config I82378
+    bool    
+    #depends on ISA
+    select I8259  # irq
+    select PCSPK
+    select I82374 # DMA
+    select MC146818RTC # timer
+    depends on PCI
+
+config PC87312
+    bool
+    #depends on ISA 
+    select SERIAL
+    select PARALLEL
+    select FDC
+    select IDE_ISA
+
+config PIIX4
+    bool
+    #depends on ISA 
+    depends on PCI
+
+config VT82C686
+    bool
+    #depends on ISA 
+    depends on PCI
+    depends on ACPI
+
+config LPC_ICH9
+    bool
+    #depends on ISA 
+    depends on PCI 
+    select APM
-- 
1.8.1.2

Re: [Qemu-devel] [v2 33/71] hw/isa/Kconfig: Add Kconfig file

[Stefan Hajnoczi]

On Fri, Sep 27, 2013 at 04:30:54AM +0200, Ákos Kovács wrote:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/isa/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
>  create mode 100644 hw/isa/Kconfig
> 
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> new file mode 100644
> index 0000000..8f4beda
> --- /dev/null
> +++ b/hw/isa/Kconfig
> @@ -0,0 +1,39 @@
> +#config ISA
> +#   bool

Why is ISA commented out and all "depends on ISA" are also commented
out?

Re: [Qemu-devel] [v2 33/71] hw/isa/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 27/09/2013 13:13, Stefan Hajnoczi ha scritto:
> On Fri, Sep 27, 2013 at 04:30:54AM +0200, Ákos Kovács wrote:
>> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
>> ---
>>  hw/isa/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 39 insertions(+)
>>  create mode 100644 hw/isa/Kconfig
>>
>> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
>> new file mode 100644
>> index 0000000..8f4beda
>> --- /dev/null
>> +++ b/hw/isa/Kconfig
>> @@ -0,0 +1,39 @@
>> +#config ISA
>> +#   bool
> 
> Why is ISA commented out and all "depends on ISA" are also commented
> out?
> 
> 

I've been asking Akos about that for about a month. :)

Paolo

[Qemu-devel] [v2 34/71] hw/misc/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/misc/Kconfig | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 hw/misc/Kconfig

diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
new file mode 100644
index 0000000..6642a74
--- /dev/null
+++ b/hw/misc/Kconfig
@@ -0,0 +1,67 @@
+config APPLESMC
+    bool
+    #depends on ISA
+    
+config MAX111X
+    bool
+    depends on SSI
+
+config TMP105
+    bool
+    #depends on I2C
+
+config ISA_DEBUG
+    bool
+    #depends on ISA
+
+config SGA
+    bool
+    #depends on PCI
+
+config ISA_TESTDEV
+    bool
+    #depends on ISA
+
+config PCI_TESTDEV
+    bool
+    depends on PCI
+
+config VMPORT
+    bool
+    #depends on ISA
+
+config PL310
+    bool
+
+config PUV3
+    bool
+
+config MACIO
+    bool
+    depends on PCI
+    select MAC_NVRAM
+
+config CUDA
+    bool
+    select MACIO
+
+config MAC_DBDMA
+    bool   
+    select MACIO
+    select ADB
+    #depends on ISA
+
+config A9SCU
+    bool
+
+config ECCMEMCTL
+    bool
+    select ECC
+
+config OMAP
+    bool
+    select ECCMEMCTL
+    select NAND
+    
+config PVPANIC
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 35/71] hw/mips/Kconfig: Add Kconfig for MIPS

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/mips/Kconfig | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 hw/mips/Kconfig

diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
new file mode 100644
index 0000000..d565af7
--- /dev/null
+++ b/hw/mips/Kconfig
@@ -0,0 +1,73 @@
+menu "MIPS"
+    config GT64XXX_PCI
+        bool
+        select PCI
+
+    config R4K
+        bool "MIPS pseudo-board"
+        default y
+        select I8254 # RTC
+        select I8259 # int. controller
+        select IDE_ISA
+        select PCKBD
+        select PFLASH_CFI01
+        select PCI   # for PIIX4
+        select PIIX4
+        select SERIAL
+        help
+            Emulates a simple machine with ISA-like bus.
+
+    config JAZZ
+        bool "MIPS Jazz board"
+        default y
+        select DP8393X
+        select ESP
+        select FDC
+        select I8254 # RTC
+        select I8259 # int. controller
+        select PARALLEL
+        select PCKBD
+        select PCI   # for PIIX4
+        select PIIX4
+        select RC4030
+        select SERIAL
+        select VGA_ISA_MM
+
+    config MALTA
+        bool "MIPS Malta board"
+        default y
+        select GT64XXX_PCI
+        select ACPI
+        select EMPTY_SLOT
+        select FDC
+        select I8259 # int. controller
+        select MC146818RTC
+        select PFLASH_CFI01
+        select PIIX4
+        select IDE_PIIX
+        select SERIAL
+
+    config FULONG
+        bool "Fulong 2e mini pc"
+        default y
+        select IDE_VIA
+        select SERIAL
+        select I8259 # int. controller
+        select I8254 # RTC
+        select I8257 # DMA
+        select PCI   # for VT82C686
+        select ACPI  # for VT82C686
+        select VT82C686
+        help
+            Fulong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 800MHz)
+
+    config MIPSSIM
+        bool "MIPSsim-like machine emulation"
+        default y
+        select I8259 # int. controller
+        select PCI   # for PIIX4
+        select PIIX4
+        select SERIAL
+        help
+            Emulates a very simple machine model similar to the one used by the proprietary MIPS emulator.
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 36/71] hw/nvram/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/nvram/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 hw/nvram/Kconfig

diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig
new file mode 100644
index 0000000..1235c6e
--- /dev/null
+++ b/hw/nvram/Kconfig
@@ -0,0 +1,5 @@
+config DS1225Y
+    bool
+
+config MAC_NVRAM
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 37/71] hw/pci/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/pci/Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 hw/pci/Kconfig

diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig
new file mode 100644
index 0000000..31a755d
--- /dev/null
+++ b/hw/pci/Kconfig
@@ -0,0 +1,8 @@
+config PCI
+    bool
+
+menu "PCI"
+    config PCI_HOTPLUG
+        bool "Enable hotplugging for PCI devices"
+        depends on PCI
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 38/71] hw/pci-bridge/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/pci-bridge/Kconfig | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 hw/pci-bridge/Kconfig

diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
new file mode 100644
index 0000000..1d23483
--- /dev/null
+++ b/hw/pci-bridge/Kconfig
@@ -0,0 +1,3 @@
+config DEC_PCI
+    bool
+    select PCI
-- 
1.8.1.2

[Qemu-devel] [v2 39/71] hw/pci-host/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/pci-host/Kconfig | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 hw/pci-host/Kconfig

diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
new file mode 100644
index 0000000..12014f5
--- /dev/null
+++ b/hw/pci-host/Kconfig
@@ -0,0 +1,36 @@
+config PREP_PCI
+    bool
+    select PCI
+
+config GRACKLE_PCI
+    bool
+    select PCI
+
+config UNIN_PCI
+    bool
+    select PCI
+
+config PPCE500_PCI
+    bool
+    select PCI
+
+config VERSATILE_PCI
+    bool
+    select PCI
+
+config PCI_APB
+    bool
+    select PCI
+
+config FULONG
+    bool
+    select PCI
+
+config PCI_PIIX
+    bool
+    select PCI
+    #select ISA
+
+config PCI_Q35
+    bool
+    select PCI
-- 
1.8.1.2

[Qemu-devel] [v2 40/71] hw/scsi/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/scsi/Kconfig | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 hw/scsi/Kconfig

diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig
new file mode 100644
index 0000000..5e493a6
--- /dev/null
+++ b/hw/scsi/Kconfig
@@ -0,0 +1,21 @@
+menu "SCSI devices"
+    config LSI_SCSI_PCI
+        bool "LSI53C895A SCSI Host Bus Adapter"
+        depends on PCI
+
+    config MEGASAS_SCSI_PCI
+        bool "MegaRAID SAS 8708EM2 Host Bus Adapter"
+        depends on PCI
+
+    config VMW_PVSCSI_SCSI_PCI
+        bool "VMware PVSCSI paravirtual SCSI bus"
+        depends on PCI
+
+    config ESP
+        bool
+
+    config ESP_PCI
+        bool "ESP/NCR53C9x"
+        depends on PCI
+        select ESP
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 41/71] hw/sd/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/sd/Kconfig | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 hw/sd/Kconfig

diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
new file mode 100644
index 0000000..595686f
--- /dev/null
+++ b/hw/sd/Kconfig
@@ -0,0 +1,27 @@
+config SD
+    bool
+
+config PL181
+    bool
+    select SD
+
+config SSI_SD
+    bool
+    select SD
+    select SSI
+
+config SDHCI
+    bool
+    select SD
+
+config MILKYMIST
+    bool
+    select SD
+
+config PXA2XX
+    bool
+    select SD
+
+config OMAP
+    bool
+    select SD
-- 
1.8.1.2

[Qemu-devel] [v2 42/71] hw/ssi/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/ssi/Kconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 hw/ssi/Kconfig

diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig
new file mode 100644
index 0000000..4f89fd2
--- /dev/null
+++ b/hw/ssi/Kconfig
@@ -0,0 +1,14 @@
+config SSI
+    bool
+
+config PL022
+    bool
+    select SSI
+
+config XILINX_SPI
+    bool
+    select SSI
+
+config XILINX_SPIPS
+    bool
+    select SSI
-- 
1.8.1.2

[Qemu-devel] [v2 43/71] hw/timer/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/timer/Kconfig | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 hw/timer/Kconfig

diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
new file mode 100644
index 0000000..f4d81cf
--- /dev/null
+++ b/hw/timer/Kconfig
@@ -0,0 +1,81 @@
+config ARM_TIMER
+    bool
+    select PTIMER
+
+config CADENCE
+    bool
+
+config DS1338
+    bool
+
+config HPET
+    bool
+
+config I8254
+    bool
+    select MC146818RTC
+    #depends on ISA
+
+config M48T59
+    bool
+    #depends on ISA
+
+config PL031
+    bool
+
+config PUV3
+    bool
+    select PTIMER
+
+config TWL92230
+    bool
+
+config XILINX
+    bool
+    select PTIMER
+
+config SLAVIO
+    bool
+    select PTIMER
+
+config ETRAXFS
+    bool
+    select PTIMER
+
+config GRLIB
+    bool
+    select PTIMER
+
+config IMX
+    bool
+    select PTIMER
+
+config LM32
+    bool
+    select PTIMER
+
+config MILKYMIST
+    bool
+    select PTIMER
+
+config EXYNOS4
+    bool
+    select PTIMER
+
+config SH4
+    bool
+    select PTIMER
+
+config TUSB6010
+    bool
+    select USB_MUSB
+
+config ARM_MPTIMER
+    bool
+    select PTIMER
+
+config MC146818RTC
+    bool
+    select PTIMER
+    #depends on APIC
+    #depends on ISA
-- 
1.8.1.2

[Qemu-devel] [v2 44/71] hw/tpm/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/tpm/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 hw/tpm/Kconfig

diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig
new file mode 100644
index 0000000..8c9fb24
--- /dev/null
+++ b/hw/tpm/Kconfig
@@ -0,0 +1,6 @@
+config TPM_TIS
+    bool
+    #select ISA
+
+config TPM_PASSTHROUGH
+    bool
-- 
1.8.1.2

[Qemu-devel] [v2 45/71] hw/alpha/Kconfig: Add Kconfig for Alpha

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/alpha/Kconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 hw/alpha/Kconfig

diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig
new file mode 100644
index 0000000..e2ae17e
--- /dev/null
+++ b/hw/alpha/Kconfig
@@ -0,0 +1,13 @@
+config CLIPPER
+    bool
+    select PCI
+    select VGA_PCI
+    select SERIAL
+    select IDE_ISA
+    select I8259
+    select IDE_PIIX
+    select I8254
+    select PCKBD
+    select MC146818RTC
+    select IDE_CMD646
+    default y
-- 
1.8.1.2

[Qemu-devel] [v2 46/71] hw/cris/Kconfig: Added Cris kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/cris/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 hw/cris/Kconfig

diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig
new file mode 100644
index 0000000..e0d39f4
--- /dev/null
+++ b/hw/cris/Kconfig
@@ -0,0 +1,7 @@
+config CRIS
+    bool
+    select ETRAXFS
+    select NAND
+    select PTIMER
+    select PFLASH_CFI02
+    default y
-- 
1.8.1.2

[Qemu-devel] [v2 47/71] hw/lm32/Kconfig: Added kconfig for lm32

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/lm32/Kconfig | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 hw/lm32/Kconfig

diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
new file mode 100644
index 0000000..8be386e
--- /dev/null
+++ b/hw/lm32/Kconfig
@@ -0,0 +1,17 @@
+menu "Verilog LatticeMicro32"
+    config MILKYMIST
+        bool "Milkymist System-on-Chip"
+        select FRAMEBUFFER
+        select PTIMER
+        select PFLASH_CFI01
+        select SD
+        select MILKYMIST_TMU2
+        select LM32
+        default y
+
+    config LM32
+        bool
+        select FRAMEBUFFER
+        select PFLASH_CFI02
+        default y
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 48/71] hw/m68k/Kconfig: m68k kconfig file added

[Ákos Kovács]

---
 hw/m68k/Kconfig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 hw/m68k/Kconfig

diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig
new file mode 100644
index 0000000..6731a1a
--- /dev/null
+++ b/hw/m68k/Kconfig
@@ -0,0 +1,22 @@
+menu "Motorola 68xxx"
+    config AN5206
+        bool "Arnewsh 5206 ColdFire"
+        select MCF5206
+        default y
+
+    config DUMMY_M68K
+        bool "Dummy m68k board"
+        default y
+
+    config MCF5206
+        bool
+        select PTIMER
+        select COLDFIRE
+
+    config MCF5208
+        bool "Motorola ColdFire MCF5208 SoC emulation"
+        select PTIMER
+        select COLDFIRE
+        default y
+endmenu
+
-- 
1.8.1.2

[Qemu-devel] [v2 49/71] hw/usb/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/usb/Kconfig | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 hw/usb/Kconfig

diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
new file mode 100644
index 0000000..9f4b8dc
--- /dev/null
+++ b/hw/usb/Kconfig
@@ -0,0 +1,61 @@
+menu "USB devices"
+    config USB_UHCI
+        bool "USB UHCI support"
+        depends on PCI
+        default y
+        
+    config USB_OHCI
+        bool "USB OHCI support"
+        depends on PCI
+        default y
+
+    config USB_EHCI
+        bool "USB EHCI support"
+        default y
+
+    config USB_XHCI
+        bool "USB XHCI support"
+        default y
+        depends on PCI
+
+    config USB_MUSB
+        bool "USB MUSB support"
+        default y
+
+    config USB_TABLET_WACOM
+        bool "Wacom tablet USB"
+        default y
+
+    config USB_STORAGE_BOT
+        bool "USB harddrive support"
+        default y
+
+    config USB_STORAGE_UAS
+        bool "UAS storage"
+        default y
+
+    config USB_AUDIO
+        bool "USB audio"
+        default y
+
+    config USB_SERIAL
+        bool "USB serial port adapter"
+        default y
+
+    config USB_NETWORK
+        bool "USB networking"
+
+    config USB_BLUETOOTH
+        bool "USB bluetooth"
+        default y
+
+    config USB_SMARTCARD
+        bool "USB Smart Card"
+        default y
+
+    config USB_SMARTCARD_NSS
+        bool "Emulated USB Smart Card"
+
+    config USB_REDIR
+        bool "USB redirection device"
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 50/71] hw/watchdog/Kconfig: Add Kconfig file

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/watchdog/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 hw/watchdog/Kconfig

diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig
new file mode 100644
index 0000000..d579e32
--- /dev/null
+++ b/hw/watchdog/Kconfig
@@ -0,0 +1,7 @@
+config WDT_IB6300ESB
+    bool
+    depends on PCI
+
+config WDT_IB700
+    bool
+    #depends on ISA
-- 
1.8.1.2

[Qemu-devel] [v2 51/71] hw/Kconfig: Add the main Kconfig for hw/

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/Kconfig | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 hw/Kconfig

diff --git a/hw/Kconfig b/hw/Kconfig
new file mode 100644
index 0000000..23e062b
--- /dev/null
+++ b/hw/Kconfig
@@ -0,0 +1,27 @@
+source "hw/9pfs/Kconfig"
+source "hw/audio/Kconfig"
+source "hw/block/Kconfig"
+source "hw/char/Kconfig"
+source "hw/core/Kconfig"
+source "hw/cpu/Kconfig"
+source "hw/display/Kconfig"
+source "hw/dma/Kconfig"
+source "hw/gpio/Kconfig"
+source "hw/i2c/Kconfig"
+source "hw/input/Kconfig"
+source "hw/intc/Kconfig"
+source "hw/ide/Kconfig"
+source "hw/isa/Kconfig"
+source "hw/misc/Kconfig"
+source "hw/net/Kconfig"
+source "hw/nvram/Kconfig"
+source "hw/pci-bridge/Kconfig"
+source "hw/pci-host/Kconfig"
+source "hw/pci/Kconfig"
+source "hw/scsi/Kconfig"
+source "hw/sd/Kconfig"
+source "hw/ssi/Kconfig"
+source "hw/timer/Kconfig"
+source "hw/tpm/Kconfig"
+source "hw/usb/Kconfig"
+source "hw/watchdog/Kconfig"
-- 
1.8.1.2

[Qemu-devel] [v2 52/71] hw/moxie/Kconfig: Add Kconfig for moxie

[Ákos Kovács]

---
 hw/moxie/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 hw/moxie/Kconfig

diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig
new file mode 100644
index 0000000..a7f1703
--- /dev/null
+++ b/hw/moxie/Kconfig
@@ -0,0 +1,4 @@
+config MOXIESIM
+    select MC146818RTC
+    select SERIAL
+    select VGA
-- 
1.8.1.2

[Qemu-devel] [v2 53/71] hw/unicore32/Kconfig: Add Unicore32 Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/unicore32/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 hw/unicore32/Kconfig

diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig
new file mode 100644
index 0000000..5f8b9d9
--- /dev/null
+++ b/hw/unicore32/Kconfig
@@ -0,0 +1,5 @@
+config PUV3
+    bool
+    select PTIMER
+    select PCKBD
+    default y
-- 
1.8.1.2

[Qemu-devel] [v2 54/71] hw/moxie/Kconfig: Make the board default and bool

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/moxie/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig
index a7f1703..d34c3c3 100644
--- a/hw/moxie/Kconfig
+++ b/hw/moxie/Kconfig
@@ -1,4 +1,6 @@
 config MOXIESIM
+    bool
     select MC146818RTC
     select SERIAL
     select VGA
+    default y
-- 
1.8.1.2

[Qemu-devel] [v2 55/71] hw/xtensa/Kconfig: Kconfig for xtensa added

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/xtensa/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 hw/xtensa/Kconfig

diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig
new file mode 100644
index 0000000..0285ff3
--- /dev/null
+++ b/hw/xtensa/Kconfig
@@ -0,0 +1,10 @@
+config XTENSA_SIM
+    bool "Xtensa simulator"
+    default y
+
+config XTENSA_LX60
+    bool "Xtensa lx60"
+    select SERIAL
+    select PFLASH_CFI01
+    select OPENCORES_ETH
+    default y
-- 
1.8.1.2

[Qemu-devel] [v2 56/71] hw/openrisc/Makefile.objs: Add CONFIG_ prefix for OPENRISC_SIM

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/openrisc/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs
index 61246b1..60ac7d2 100644
--- a/hw/openrisc/Makefile.objs
+++ b/hw/openrisc/Makefile.objs
@@ -1,2 +1,2 @@
 obj-y = pic_cpu.o cputimer.o
-obj-y += openrisc_sim.o 
+obj-$(CONFIG_OPENRISC_SIM) += openrisc_sim.o 
-- 
1.8.1.2

[Qemu-devel] [v2 57/71] hw/openrisc/Kconfig: Add Kconfig for OpenRISC

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/openrisc/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 hw/openrisc/Kconfig

diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig
new file mode 100644
index 0000000..36eb9eb
--- /dev/null
+++ b/hw/openrisc/Kconfig
@@ -0,0 +1,7 @@
+menu "OpenRISC"
+    config OPENRISC_SIM    
+        bool
+        select SERIAL
+        select OPENCORES_ETH
+        default y
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 58/71] hw/sparc64/Kconfig: Kconfig added for Sparc64

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/sparc64/Kconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 hw/sparc64/Kconfig

diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig
new file mode 100644
index 0000000..f711075
--- /dev/null
+++ b/hw/sparc64/Kconfig
@@ -0,0 +1,14 @@
+config SUN4M
+    bool
+    select ISA_MMIO
+    select M48T59
+    select PTIMER
+    select VGA_PCI
+    select SERIAL
+    select PARALLEL
+    select PCKBD
+    select FDC
+    select IDE_CMD646
+    select PCI_APB
+    select MC146818RTC
+    select ISA_TESTDEV
-- 
1.8.1.2

[Qemu-devel] [v2 59/71] configure: Generate Kconfig.targets with --target-list

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 configure | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure b/configure
index cd01f05..8b94d2a 100755
--- a/configure
+++ b/configure
@@ -4288,6 +4288,7 @@ case "$target_name" in
   ;;
   sparc64)
     TARGET_BASE_ARCH=sparc
+    kconfig_subdirs="$kconfig_subdirs sparc64"
   ;;
   sparc32plus)
     TARGET_ARCH=sparc64
@@ -4311,6 +4312,7 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then
   TARGET_BASE_ARCH=$TARGET_ARCH
 fi
 
+kconfig_subdirs="$kconfig_subdirs $TARGET_BASE_ARCH"
 symlink "$source_path/Makefile.target" "$target_dir/Makefile"
 
 upper() {
@@ -4494,6 +4496,15 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
 
 done # for target in $targets
 
+# Generate Kconfig.targets
+kconfig_targets="Kconfig.targets"
+kconfig_subdirs=$(echo $kconfig_subdirs | tr ' ' '\n' | sort -u | tr '\n' ' ')
+echo "# Automatically generated by configure - do not modify" > $kconfig_targets
+
+for i in $kconfig_subdirs ; do
+  echo "source \"hw/$i/Kconfig\"" >> $kconfig_targets
+done
+
 if [ "$pixman" = "internal" ]; then
   echo "config-host.h: subdir-pixman" >> $config_host_mak
 fi
-- 
1.8.1.2

[Qemu-devel] [v2 60/71] Kconfig: Main kconfig file added

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 Kconfig

diff --git a/Kconfig b/Kconfig
new file mode 100644
index 0000000..e2c9814
--- /dev/null
+++ b/Kconfig
@@ -0,0 +1,10 @@
+mainmenu "QEMU Configuration"
+
+# Include the user-selected Kconfigs
+menu "Boards"
+    source "Kconfig.targets"
+endmenu
+
+# Device and bus configurations
+source "hw/Kconfig"
+
-- 
1.8.1.2

[Qemu-devel] [v2 61/71] hw/usb/hcd-ohci.c: Move sysbus and PCI code to new files

[Ákos Kovács]

Move the existing sysbus and PCI logic to hcd-ohci-sysbus.c and
hcd-ohci-pci.c from hcd-ohci.c. Create a new hcd-ohci.h header for the
shared declarations and macros.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/usb/hcd-ohci-pci.c    |  96 +++++++++++++++
 hw/usb/hcd-ohci-sysbus.c |  84 +++++++++++++
 hw/usb/hcd-ohci.h        | 311 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 491 insertions(+)
 create mode 100644 hw/usb/hcd-ohci-pci.c
 create mode 100644 hw/usb/hcd-ohci-sysbus.c
 create mode 100644 hw/usb/hcd-ohci.h

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
new file mode 100644
index 0000000..ac50951
--- /dev/null
+++ b/hw/usb/hcd-ohci-pci.c
@@ -0,0 +1,96 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO:
+ *  o Isochronous transfers
+ *  o Allocate bandwidth in frames properly
+ *  o Disable timers when nothing needs to be done, or remove timer usage
+ *    all together.
+ *  o BIOS work to boot from USB storage
+*/
+
+#include "hw/usb/hcd-ohci.h"
+
+#define TYPE_PCI_OHCI "pci-ohci"
+#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)
+
+typedef struct {
+    /*< private >*/
+    PCIDevice parent_obj;
+    /*< public >*/
+
+    OHCIState state;
+    char *masterbus;
+    uint32_t num_ports;
+    uint32_t firstport;
+} OHCIPCIState;
+
+static Property ohci_pci_properties[] = {
+    DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),
+    DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),
+    DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static int usb_ohci_initfn_pci(PCIDevice *dev)
+{
+    OHCIPCIState *ohci = PCI_OHCI(dev);
+
+    dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */
+    dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
+
+    if (usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,
+                      ohci->masterbus, ohci->firstport,
+                      pci_get_address_space(dev)) != 0) {
+        return -1;
+    }
+    ohci->state.irq = dev->irq[0];
+
+    pci_register_bar(dev, 0, 0, &ohci->state.mem);
+    return 0;
+}
+
+static void ohci_pci_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+    k->init = usb_ohci_initfn_pci;
+    k->vendor_id = PCI_VENDOR_ID_APPLE;
+    k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
+    k->class_id = PCI_CLASS_SERIAL_USB;
+    k->no_hotplug = 1;
+    set_bit(DEVICE_CATEGORY_USB, dc->categories);
+    dc->desc = "Apple USB Controller";
+    dc->props = ohci_pci_properties;
+}
+
+static const TypeInfo ohci_pci_info = {
+    .name          = TYPE_PCI_OHCI,
+    .parent        = TYPE_PCI_DEVICE,
+    .instance_size = sizeof(OHCIPCIState),
+    .class_init    = ohci_pci_class_init,
+};
+
+static void ohci_pci_register_type(void)
+{
+    type_register_static(&ohci_pci_info);
+}
+
+type_init(ohci_pci_register_type)
diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c
new file mode 100644
index 0000000..b9d15db
--- /dev/null
+++ b/hw/usb/hcd-ohci-sysbus.c
@@ -0,0 +1,84 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO:
+ *  o Isochronous transfers
+ *  o Allocate bandwidth in frames properly
+ *  o Disable timers when nothing needs to be done, or remove timer usage
+ *    all together.
+ *  o BIOS work to boot from USB storage
+*/
+
+#include "hw/sysbus.h"
+#include "hw/usb/hcd-ohci.h"
+
+#define TYPE_SYSBUS_OHCI "sysbus-ohci"
+#define SYSBUS_OHCI(obj) OBJECT_CHECK(OHCISysBusState, (obj), TYPE_SYSBUS_OHCI)
+
+typedef struct {
+    /*< private >*/
+    SysBusDevice parent_obj;
+    /*< public >*/
+
+    OHCIState ohci;
+    uint32_t num_ports;
+    dma_addr_t dma_offset;
+} OHCISysBusState;
+
+static Property ohci_sysbus_properties[] = {
+    DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3),
+    DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 3),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void ohci_realize_pxa(DeviceState *dev, Error **errp)
+{
+    OHCISysBusState *s = SYSBUS_OHCI(dev);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+
+    /* Cannot fail as we pass NULL for masterbus */
+    usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, NULL, 0,
+                  &address_space_memory);
+    sysbus_init_irq(sbd, &s->ohci.irq);
+    sysbus_init_mmio(sbd, &s->ohci.mem);
+}
+
+static void ohci_sysbus_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+
+    dc->realize = ohci_realize_pxa;
+    set_bit(DEVICE_CATEGORY_USB, dc->categories);
+    dc->desc = "OHCI USB Controller";
+    dc->props = ohci_sysbus_properties;
+}
+
+static const TypeInfo ohci_sysbus_info = {
+    .name          = TYPE_SYSBUS_OHCI,
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(OHCISysBusState),
+    .class_init    = ohci_sysbus_class_init,
+};
+
+static void ohci_sysbus_register_type(void)
+{
+    type_register_static(&ohci_sysbus_info);
+}
+
+type_init(ohci_sysbus_register_type)
diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h
new file mode 100644
index 0000000..8be00f2
--- /dev/null
+++ b/hw/usb/hcd-ohci.h
@@ -0,0 +1,311 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * TODO:
+ *  o Isochronous transfers
+ *  o Allocate bandwidth in frames properly
+ *  o Disable timers when nothing needs to be done, or remove timer usage
+ *    all together.
+ *  o BIOS work to boot from USB storage
+*/
+
+#ifndef HW_USB_OHCI_H
+#define HW_USB_OHCI_H 1
+
+#include "hw/hw.h"
+#include "qemu/timer.h"
+#include "hw/usb.h"
+#include "hw/qdev-dma.h"
+#include "hw/pci/pci.h"
+
+//#define DEBUG_OHCI
+/* Dump packet contents.  */
+//#define DEBUG_PACKET
+//#define DEBUG_ISOCH
+/* This causes frames to occur 1000x slower */
+//#define OHCI_TIME_WARP 1
+
+#ifdef DEBUG_OHCI
+#define DPRINTF printf
+#else
+#define DPRINTF(...)
+#endif
+
+/* Number of Downstream Ports on the root hub.  */
+
+#define OHCI_MAX_PORTS 15
+
+typedef struct OHCIPort {
+    USBPort port;
+    uint32_t ctrl;
+} OHCIPort;
+
+typedef struct {
+    USBBus bus;
+    qemu_irq irq;
+    MemoryRegion mem;
+    AddressSpace *as;
+    int num_ports;
+    const char *name;
+
+    QEMUTimer *eof_timer;
+    int64_t sof_time;
+
+    /* OHCI state */
+    /* Control partition */
+    uint32_t ctl, status;
+    uint32_t intr_status;
+    uint32_t intr;
+
+    /* memory pointer partition */
+    uint32_t hcca;
+    uint32_t ctrl_head, ctrl_cur;
+    uint32_t bulk_head, bulk_cur;
+    uint32_t per_cur;
+    uint32_t done;
+    int done_count;
+
+    /* Frame counter partition */
+    uint32_t fsmps:15;
+    uint32_t fit:1;
+    uint32_t fi:14;
+    uint32_t frt:1;
+    uint16_t frame_number;
+    uint16_t padding;
+    uint32_t pstart;
+    uint32_t lst;
+
+    /* Root Hub partition */
+    uint32_t rhdesc_a, rhdesc_b;
+    uint32_t rhstatus;
+    OHCIPort rhport[OHCI_MAX_PORTS];
+
+    /* PXA27x Non-OHCI events */
+    uint32_t hstatus;
+    uint32_t hmask;
+    uint32_t hreset;
+    uint32_t htest;
+
+    /* SM501 local memory offset */
+    dma_addr_t localmem_base;
+
+    /* Active packets.  */
+    uint32_t old_ctl;
+    USBPacket usb_packet;
+    uint8_t usb_buf[8192];
+    uint32_t async_td;
+    int async_complete;
+
+} OHCIState;
+
+/* Host Controller Communications Area */
+struct ohci_hcca {
+    uint32_t intr[32];
+    uint16_t frame, pad;
+    uint32_t done;
+};
+#define HCCA_WRITEBACK_OFFSET   offsetof(struct ohci_hcca, frame)
+#define HCCA_WRITEBACK_SIZE     8 /* frame, pad, done */
+
+#define ED_WBACK_OFFSET offsetof(struct ohci_ed, head)
+#define ED_WBACK_SIZE   4
+
+/* Bitfields for the first word of an Endpoint Desciptor.  */
+#define OHCI_ED_FA_SHIFT  0
+#define OHCI_ED_FA_MASK   (0x7f<<OHCI_ED_FA_SHIFT)
+#define OHCI_ED_EN_SHIFT  7
+#define OHCI_ED_EN_MASK   (0xf<<OHCI_ED_EN_SHIFT)
+#define OHCI_ED_D_SHIFT   11
+#define OHCI_ED_D_MASK    (3<<OHCI_ED_D_SHIFT)
+#define OHCI_ED_S         (1<<13)
+#define OHCI_ED_K         (1<<14)
+#define OHCI_ED_F         (1<<15)
+#define OHCI_ED_MPS_SHIFT 16
+#define OHCI_ED_MPS_MASK  (0x7ff<<OHCI_ED_MPS_SHIFT)
+
+/* Flags in the head field of an Endpoint Desciptor.  */
+#define OHCI_ED_H         1
+#define OHCI_ED_C         2
+
+/* Bitfields for the first word of a Transfer Desciptor.  */
+#define OHCI_TD_R         (1<<18)
+#define OHCI_TD_DP_SHIFT  19
+#define OHCI_TD_DP_MASK   (3<<OHCI_TD_DP_SHIFT)
+#define OHCI_TD_DI_SHIFT  21
+#define OHCI_TD_DI_MASK   (7<<OHCI_TD_DI_SHIFT)
+#define OHCI_TD_T0        (1<<24)
+#define OHCI_TD_T1        (1<<25)
+#define OHCI_TD_EC_SHIFT  26
+#define OHCI_TD_EC_MASK   (3<<OHCI_TD_EC_SHIFT)
+#define OHCI_TD_CC_SHIFT  28
+#define OHCI_TD_CC_MASK   (0xf<<OHCI_TD_CC_SHIFT)
+
+/* Bitfields for the first word of an Isochronous Transfer Desciptor.  */
+/* CC & DI - same as in the General Transfer Desciptor */
+#define OHCI_TD_SF_SHIFT  0
+#define OHCI_TD_SF_MASK   (0xffff<<OHCI_TD_SF_SHIFT)
+#define OHCI_TD_FC_SHIFT  24
+#define OHCI_TD_FC_MASK   (7<<OHCI_TD_FC_SHIFT)
+
+/* Isochronous Transfer Desciptor - Offset / PacketStatusWord */
+#define OHCI_TD_PSW_CC_SHIFT 12
+#define OHCI_TD_PSW_CC_MASK  (0xf<<OHCI_TD_PSW_CC_SHIFT)
+#define OHCI_TD_PSW_SIZE_SHIFT 0
+#define OHCI_TD_PSW_SIZE_MASK  (0xfff<<OHCI_TD_PSW_SIZE_SHIFT)
+
+#define OHCI_PAGE_MASK    0xfffff000
+#define OHCI_OFFSET_MASK  0xfff
+
+#define OHCI_DPTR_MASK    0xfffffff0
+
+#define OHCI_BM(val, field) \
+  (((val) & OHCI_##field##_MASK) >> OHCI_##field##_SHIFT)
+
+#define OHCI_SET_BM(val, field, newval) do { \
+    val &= ~OHCI_##field##_MASK; \
+    val |= ((newval) << OHCI_##field##_SHIFT) & OHCI_##field##_MASK; \
+    } while(0)
+
+/* endpoint descriptor */
+struct ohci_ed {
+    uint32_t flags;
+    uint32_t tail;
+    uint32_t head;
+    uint32_t next;
+};
+
+/* General transfer descriptor */
+struct ohci_td {
+    uint32_t flags;
+    uint32_t cbp;
+    uint32_t next;
+    uint32_t be;
+};
+
+/* Isochronous transfer descriptor */
+struct ohci_iso_td {
+    uint32_t flags;
+    uint32_t bp;
+    uint32_t next;
+    uint32_t be;
+    uint16_t offset[8];
+};
+
+#define USB_HZ                      12000000
+
+/* OHCI Local stuff */
+#define OHCI_CTL_CBSR         ((1<<0)|(1<<1))
+#define OHCI_CTL_PLE          (1<<2)
+#define OHCI_CTL_IE           (1<<3)
+#define OHCI_CTL_CLE          (1<<4)
+#define OHCI_CTL_BLE          (1<<5)
+#define OHCI_CTL_HCFS         ((1<<6)|(1<<7))
+#define  OHCI_USB_RESET       0x00
+#define  OHCI_USB_RESUME      0x40
+#define  OHCI_USB_OPERATIONAL 0x80
+#define  OHCI_USB_SUSPEND     0xc0
+#define OHCI_CTL_IR           (1<<8)
+#define OHCI_CTL_RWC          (1<<9)
+#define OHCI_CTL_RWE          (1<<10)
+
+#define OHCI_STATUS_HCR       (1<<0)
+#define OHCI_STATUS_CLF       (1<<1)
+#define OHCI_STATUS_BLF       (1<<2)
+#define OHCI_STATUS_OCR       (1<<3)
+#define OHCI_STATUS_SOC       ((1<<6)|(1<<7))
+
+#define OHCI_INTR_SO          (1<<0) /* Scheduling overrun */
+#define OHCI_INTR_WD          (1<<1) /* HcDoneHead writeback */
+#define OHCI_INTR_SF          (1<<2) /* Start of frame */
+#define OHCI_INTR_RD          (1<<3) /* Resume detect */
+#define OHCI_INTR_UE          (1<<4) /* Unrecoverable error */
+#define OHCI_INTR_FNO         (1<<5) /* Frame number overflow */
+#define OHCI_INTR_RHSC        (1<<6) /* Root hub status change */
+#define OHCI_INTR_OC          (1<<30) /* Ownership change */
+#define OHCI_INTR_MIE         (1<<31) /* Master Interrupt Enable */
+
+#define OHCI_HCCA_SIZE        0x100
+#define OHCI_HCCA_MASK        0xffffff00
+
+#define OHCI_EDPTR_MASK       0xfffffff0
+
+#define OHCI_FMI_FI           0x00003fff
+#define OHCI_FMI_FSMPS        0xffff0000
+#define OHCI_FMI_FIT          0x80000000
+
+#define OHCI_FR_RT            (1<<31)
+
+#define OHCI_LS_THRESH        0x628
+
+#define OHCI_RHA_RW_MASK      0x00000000 /* Mask of supported features.  */
+#define OHCI_RHA_PSM          (1<<8)
+#define OHCI_RHA_NPS          (1<<9)
+#define OHCI_RHA_DT           (1<<10)
+#define OHCI_RHA_OCPM         (1<<11)
+#define OHCI_RHA_NOCP         (1<<12)
+#define OHCI_RHA_POTPGT_MASK  0xff000000
+
+#define OHCI_RHS_LPS          (1<<0)
+#define OHCI_RHS_OCI          (1<<1)
+#define OHCI_RHS_DRWE         (1<<15)
+#define OHCI_RHS_LPSC         (1<<16)
+#define OHCI_RHS_OCIC         (1<<17)
+#define OHCI_RHS_CRWE         (1<<31)
+
+#define OHCI_PORT_CCS         (1<<0)
+#define OHCI_PORT_PES         (1<<1)
+#define OHCI_PORT_PSS         (1<<2)
+#define OHCI_PORT_POCI        (1<<3)
+#define OHCI_PORT_PRS         (1<<4)
+#define OHCI_PORT_PPS         (1<<8)
+#define OHCI_PORT_LSDA        (1<<9)
+#define OHCI_PORT_CSC         (1<<16)
+#define OHCI_PORT_PESC        (1<<17)
+#define OHCI_PORT_PSSC        (1<<18)
+#define OHCI_PORT_OCIC        (1<<19)
+#define OHCI_PORT_PRSC        (1<<20)
+#define OHCI_PORT_WTC         (OHCI_PORT_CSC|OHCI_PORT_PESC|OHCI_PORT_PSSC \
+                               |OHCI_PORT_OCIC|OHCI_PORT_PRSC)
+
+#define OHCI_TD_DIR_SETUP     0x0
+#define OHCI_TD_DIR_OUT       0x1
+#define OHCI_TD_DIR_IN        0x2
+#define OHCI_TD_DIR_RESERVED  0x3
+
+#define OHCI_CC_NOERROR             0x0
+#define OHCI_CC_CRC                 0x1
+#define OHCI_CC_BITSTUFFING         0x2
+#define OHCI_CC_DATATOGGLEMISMATCH  0x3
+#define OHCI_CC_STALL               0x4
+#define OHCI_CC_DEVICENOTRESPONDING 0x5
+#define OHCI_CC_PIDCHECKFAILURE     0x6
+#define OHCI_CC_UNDEXPETEDPID       0x7
+#define OHCI_CC_DATAOVERRUN         0x8
+#define OHCI_CC_DATAUNDERRUN        0x9
+#define OHCI_CC_BUFFEROVERRUN       0xc
+#define OHCI_CC_BUFFERUNDERRUN      0xd
+
+#define OHCI_HRESET_FSBIR       (1 << 0)
+
+int usb_ohci_init(OHCIState *ohci, DeviceState *dev,
+                         int num_ports, dma_addr_t localmem_base,
+                         char *masterbus, uint32_t firstport,
+                         AddressSpace *as);
+
+#endif /* HW_USB_OHCI_H */
-- 
1.8.1.2

[Qemu-devel] [v2 62/71] hw/usb/Makefile.objs: Make config options for USB_OHCI_*

[Ákos Kovács]

Create CONFIG_USB_OHCI_PCI and CONFIG_USB_OHCI_SYSBUS configuration
options for the new hcd-ohci-pci.c and hcd-ohci-sysbus.c files.

Add CONFIG_USB_OHCI_PCI to default-configs/{arm,sh4}-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/arm-softmmu.mak | 1 +
 default-configs/sh4-softmmu.mak | 1 +
 hw/usb/Makefile.objs            | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 885b0c1..93e74bd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -74,6 +74,7 @@ CONFIG_NSERIES=y
 CONFIG_REALVIEW=y
 CONFIG_ZAURUS=y
 CONFIG_ZYNQ=y
+CONFIG_USB_OHCI_SYSBUS=y
 
 CONFIG_VERSATILE_PCI=y
 CONFIG_VERSATILE_I2C=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 6eb62d7..cb5e8a4 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -19,3 +19,4 @@ CONFIG_MC146818RTC=y
 
 CONFIG_R2D=y
 CONFIG_SHIX=y
+CONFIG_USB_OHCI_SYSBUS=y
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index f9695e7..2eba141 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -5,6 +5,8 @@ common-obj-y += libhw.o
 # usb host adapters
 common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
 common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
+common-obj-$(CONFIG_USB_OHCI_SYSBUS) += hcd-ohci-sysbus.o
+common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o
 common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
 common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
 common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
-- 
1.8.1.2

[Qemu-devel] [v2 63/71] Makefile.objs: Split CONFIG_USB_EHCI

[Ákos Kovács]

Create new configuration variables, CONFIG_USB_EHCI_SYSBUS and
CONFIG_USB_EHCI_PCI for hcd-ehci-sysbus.o and hcd-ehci-pci.o.

Make them default at default-configs/pci.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 default-configs/pci.mak | 2 ++
 hw/usb/Makefile.objs    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 91b1e92..c31715f 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -4,6 +4,8 @@ CONFIG_VIRTIO=y
 CONFIG_USB_UHCI=y
 CONFIG_USB_OHCI=y
 CONFIG_USB_EHCI=y
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_SYSBUS=y
 CONFIG_USB_XHCI=y
 CONFIG_NE2000_PCI=y
 CONFIG_EEPRO100_PCI=y
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 2eba141..3e0526e 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -7,7 +7,9 @@ common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
 common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
 common-obj-$(CONFIG_USB_OHCI_SYSBUS) += hcd-ohci-sysbus.o
 common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o
-common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
+common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
+common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o
+common-obj-$(CONFIG_USB_EHCI_PCI) += hcd-ehci-pci.o
 common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
 common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
 
-- 
1.8.1.2

[Qemu-devel] [v2 65/71] hw/ppc/Kconfig: Add Kconfig for PPC

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/ppc/Kconfig | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 hw/ppc/Kconfig

diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
new file mode 100644
index 0000000..e3c3857
--- /dev/null
+++ b/hw/ppc/Kconfig
@@ -0,0 +1,98 @@
+menu "PowerPc (PPC)"
+    config PSERIES
+        bool "PowerPC pSeries Logical Partition"
+        default n
+        select VGA_PCI
+        select NVRAM
+        select PFLASH_CFI02
+        select PCI_OHCI
+        # error: ‘CPUPPCState’ has no member named ‘sps’
+
+    config PPC4XX 
+        bool
+
+    config PPC405_UC
+        bool
+        select PPC4XX
+        select SERIAL
+        # for monitor.c
+        select PCI
+        select I8259
+
+    config PPC405
+        bool "PowerPC 405EP reference board"
+        default y
+        select PFLASH_CFI02
+        select M48T59
+        select PPC405_UC
+
+    config PPC440
+        bool "PowerPC 440 Bamboo"
+        default y
+        select PPC405_UC
+
+    config VIRTEX
+        bool "Xilinx Virtex5 ML507"
+        default y
+        select SERIAL
+        select PFLASH_CFI01
+        select XILINX
+        select PPC405_UC
+
+    config PREP
+        bool "PowerPC Reference Platform (PReP)"
+        default y
+        select FDC
+        select PC87312
+        select I82378
+        select MC146818RTC
+        select PREP_PCI
+        select IDE_ISA
+        select M48T59
+        select PCI_OHCI
+        select IDE_CORE
+        select PCKBD
+        select PPC405_UC
+
+    config MAC_OLDWORLD
+        bool "OldWorld PowerMac"
+        default y
+        select ADB
+        select ISA_MMIO
+        select HEATHROW_PIC
+        select GRACKLE_PCI
+        select ESCC
+        select IDE_CORE
+        select IDE_MACIO
+        select PCI_OHCI
+        select VGA_PCI
+        select CUDA
+        select MAC_DBDMA
+        select PPC405_UC
+
+    config MAC_NEWWORLD
+        bool "NewWorld PowerMac"
+        default y
+        select ADB
+        select M48T59
+        select OPENPIC
+        select ESCC
+        select ISA_MMIO
+        select UNIN_PCI
+        select VGA_PCI
+        select IDE_MACIO
+        select IDE_CORE
+        select CUDA
+        select USB_OHCI
+        select MAC_DBDMA
+        select OPENPIC
+        select PPC405_UC
+
+    config E500
+        bool "PowerPC e500-based platforms"
+        default y
+        select OPENPIC
+        select SERIAL
+        select PPCE500_PCI
+        select PPC405_UC
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 66/71] hw/usb/Kconfig: Add the new USB_(O|U)HCI_(PCI|SYSBUS)

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/usb/Kconfig | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index 9f4b8dc..85e845e 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -9,10 +9,26 @@ menu "USB devices"
         depends on PCI
         default y
 
+    config USB_OHCI_SYSBUS
+        bool
+        select USB_OHCI
+
+    config USB_OHCI_PCI
+        bool
+        select USB_OHCI
+
     config USB_EHCI
         bool "USB EHCI support"
         default y
 
+    config USB_EHCI_SYSBUS
+        bool
+        select USB_EHCI
+
+    config USB_EHCI_PCI
+        bool
+        select USB_EHCI
+
     config USB_XHCI
         bool "USB XHCI support"
         default y
-- 
1.8.1.2

[Qemu-devel] [v2 67/71] hw/i386/Kconfig: Add i386 Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/i386/Kconfig | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 hw/i386/Kconfig

diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
new file mode 100644
index 0000000..c9a782d
--- /dev/null
+++ b/hw/i386/Kconfig
@@ -0,0 +1,54 @@
+menu "i386"
+    config KVM
+        bool
+        select I8254
+        select PIIX
+        select LINUX
+
+    config PIIX
+       bool "Pentium IIx board" 
+       select ACPI
+       select APM
+       select FDC
+       select IDE_ISA
+       select IDE_PIIX
+       select MC146818RTC
+       select PCI_PIIX
+       select PCKBD
+       select PFLASH_CFI01
+       select SERIAL
+       select USB_UHCI
+       # interrupt controllers
+       select I8259
+       select APIC
+       select IOAPIC
+       #
+       #select ISA
+       select PVPANIC
+       select ICC_BUS
+       select PCSPK
+       select VMPORT
+
+    config Q35
+        bool "Q36 chipset based PC"
+        select ACPI
+        select AHCI
+        select APIC
+        select FDC
+        select I8254
+        select I8259
+        select ICC_BUS
+        select IDE_MMIO
+        select LPC_ICH9
+        select PCI_Q35
+        select PCKBD
+        select PCSPK
+        select PFLASH_CFI01
+        select PVPANIC
+        select SERIAL
+        select USB_EHCI_PCI
+        select VMPORT
+
+    config XEN
+        bool
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 68/71] hw/acpi/Kconfig: Create ACPI Kconfig

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/Kconfig      | 1 +
 hw/acpi/Kconfig | 4 ++++
 hw/i2c/Kconfig  | 4 ----
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 hw/acpi/Kconfig

diff --git a/hw/Kconfig b/hw/Kconfig
index 23e062b..90bba75 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -1,5 +1,6 @@
 source "hw/9pfs/Kconfig"
 source "hw/audio/Kconfig"
+source "hw/acpi/Kconfig"
 source "hw/block/Kconfig"
 source "hw/char/Kconfig"
 source "hw/core/Kconfig"
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
new file mode 100644
index 0000000..51e8291
--- /dev/null
+++ b/hw/acpi/Kconfig
@@ -0,0 +1,4 @@
+config ACPI
+    bool
+    select APM
+    depends on PCI
diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig
index eaf17cc..21a14f6 100644
--- a/hw/i2c/Kconfig
+++ b/hw/i2c/Kconfig
@@ -1,10 +1,6 @@
 config VERSATILE_I2C
     bool
     select BITBANG_I2C
-
-config ACPI
-    bool
-    depends on PCI
     
 config BITBANG_I2C
     bool
-- 
1.8.1.2

[Qemu-devel] [v2 69/71] hw/microblaze/Kconfig: Kconfig added for microblaze

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/microblaze/Kconfig | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 hw/microblaze/Kconfig

diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig
new file mode 100644
index 0000000..9088dc7
--- /dev/null
+++ b/hw/microblaze/Kconfig
@@ -0,0 +1,19 @@
+menu "Xilinx MicroBlaze"
+    config PETALOGIX_S3ADSP1800
+        bool "Petalogix board for Spartan S3ADSP-1800"
+        select PCI
+        select PFLASH_CFI01
+        select XILINX
+        select XILINX_ETHLITE
+
+    config PETALOGIX_ML605
+        bool "Petalogix board for Spartan ML605"
+        select PFLASH_CFI01
+        select SERIAL
+        select SSI
+        select XILINX
+        select XILINX_ETHLITE
+        select XILINX_AXI
+        select XILINX_SPI
+        select SSI_M25P80
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 70/71] hw/sh4/Kconfig: Kconfig for SH4 added

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/sh4/Kconfig | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 hw/sh4/Kconfig

diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig
new file mode 100644
index 0000000..33c84d9
--- /dev/null
+++ b/hw/sh4/Kconfig
@@ -0,0 +1,17 @@
+menu "SH4"
+    config SH4
+        bool
+        default y
+
+    config R2D
+        bool "Renesas SH7751R R2D-PLUS"
+        select PFLASH_CFI02
+        select PCI
+        select SM501
+        select SERIAL
+        select IDE_MMIO
+
+    config SHIX
+        bool "SHIX 2.0 board"
+        select PCI
+endmenu
-- 
1.8.1.2

[Qemu-devel] [v2 71/71] hw/sparc/Kconfig: Kconfig for Sparc added

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 hw/sparc/Kconfig | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 hw/sparc/Kconfig

diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig
new file mode 100644
index 0000000..52cd04e
--- /dev/null
+++ b/hw/sparc/Kconfig
@@ -0,0 +1,18 @@
+menu "Sparc"
+    config SUN4M
+        bool "Sun4m & Sun4d & Sun4c"
+        select EMPTY_SLOT
+        select ESCC
+        select ESP
+        select M48T59
+        select SLAVIO
+        select FDC
+        default y
+
+    config LEON3
+        bool "Leon3"
+        select GRLIB
+        select SUN4M
+        select STP2000
+        default y
+endmenu
-- 
1.8.1.2

Re: [Qemu-devel] [v2 00/71] Integrating Kconfig to Qemu

[Antony Pavlov]

On Fri, 27 Sep 2013 04:30:21 +0200
Ákos Kovács <akoskovacs@gmx.com> wrote:

I have just tryed 'kconfig' branch from your qemu github repo.

Great work!

But I have found new generated Kconfig.targets file in 'git status' 'Untracked files' section.

Can we add it to the .gitignore file?

> This patchset contains the necessary changes in the build system to
> enable interactive build configuration with Kconfig.
> 
> It also contains the Kconfig files for each hw/* subdirectory, including the boards.
> 
> The most significant change is that the Makefile is now capable to include the generated
> kconfig-devices.mak or exclude it with the 'make defconfig' command.
> 
> Ákos Kovács (71):
>   rules.mak: New logical functions
>   Makefile.target: CONFIG_NO_* variables removed
>   default-configs/: CONFIG_GDBSTUB_XML removed
>   scripts/kconfig: kconfig-frontends submodule added
>   Makefile: Clone kconfig git submodule in Makefile
>   hw/arm/Makefile.objs: CONFIG_* created for each board
>   hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards condtionally
>   hw/m68k/Makefile.objs: Conditionally build boards
>   hw/microblaze/Makefile.objs: Create configs for petalogix boards
>   hw/mips/Makefile.objs: Create CONFIG_* for mips boards
>   hw/ppc/Makefile.objs: Build all boards conditinally
>   hw/sh4/Makefile.objs: Build sh4 boards conditionally
>   hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created
>   hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst
>   hw/s390x/Makefile.objs: Create CONFIG_S390_VIRTIO and CONFIG_S390_CCW
>   hw/s390x/Kconfig: Add s390x Kconfig
>   hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_lx60
>     conditionally
>   hw/intc/Makefile.objs: Make CONFIG_ARMV7_NVIC
>   hw/9pfs/Kconfig: Add 9pfs Kconfig
>   hw/arm/Kconfig: Add ARM Kconfig
>   hw/audio/Kconfig: Add audio Kconfig
>   hw/block/Kconfig: Add Kconfig file
>   hw/char/Kconfig: Add Kconfig file
>   hw/core/Kconfig: Add Kconfig file
>   hw/cpu/Kconfig: Add Kconfig file
>   hw/display/Kconfig: Add Kconfig file
>   hw/dma/Kconfig: Add Kconfig file
>   hw/gpio/Kconfig: Add Kconfig file
>   hw/i2c/Kconfig: Add Kconfig file
>   hw/ide/Kconfig: Add Kconfig file
>   hw/input/Kconfig: Add Kconfig file
>   hw/intc/Kconfig: Add Kconfig file
>   hw/isa/Kconfig: Add Kconfig file
>   hw/misc/Kconfig: Add Kconfig file
>   hw/mips/Kconfig: Add Kconfig for MIPS
>   hw/nvram/Kconfig: Add Kconfig file
>   hw/pci/Kconfig: Add Kconfig file
>   hw/pci-bridge/Kconfig: Add Kconfig file
>   hw/pci-host/Kconfig: Add Kconfig file
>   hw/scsi/Kconfig: Add Kconfig file
>   hw/sd/Kconfig: Add Kconfig file
>   hw/ssi/Kconfig: Add Kconfig file
>   hw/timer/Kconfig: Add Kconfig file
>   hw/tpm/Kconfig: Add Kconfig file
>   hw/alpha/Kconfig: Add Kconfig for Alpha
>   hw/cris/Kconfig: Added Cris kconfig file
>   hw/lm32/Kconfig: Added kconfig for lm32
>   hw/m68k/Kconfig: m68k kconfig file added
>   hw/usb/Kconfig: Add Kconfig file
>   hw/watchdog/Kconfig: Add Kconfig file
>   hw/Kconfig: Add the main Kconfig for hw/
>   hw/moxie/Kconfig: Add Kconfig for moxie
>   hw/unicore32/Kconfig: Add Unicore32 Kconfig
>   hw/moxie/Kconfig: Make the board default and bool
>   hw/xtensa/Kconfig: Kconfig for xtensa added
>   hw/openrisc/Makefile.objs: Add CONFIG_ prefix for OPENRISC_SIM
>   hw/openrisc/Kconfig: Add Kconfig for OpenRISC
>   hw/sparc64/Kconfig: Kconfig added for Sparc64
>   configure: Generate Kconfig.targets with --target-list
>   Kconfig: Main kconfig file added
>   hw/usb/hcd-ohci.c: Move sysbus and PCI code to new files
>   hw/usb/Makefile.objs: Make config options for USB_OHCI_*
>   Makefile.objs: Split CONFIG_USB_EHCI
>   hw/ppc/Makefile.objs: Create PPC405_UC for ppc405_uc.c
>   hw/ppc/Kconfig: Add Kconfig for PPC
>   hw/usb/Kconfig: Add the new USB_(O|U)HCI_(PCI|SYSBUS)
>   hw/i386/Kconfig: Add i386 Kconfig
>   hw/acpi/Kconfig: Create ACPI Kconfig
>   hw/microblaze/Kconfig: Kconfig added for microblaze
>   hw/sh4/Kconfig: Kconfig for SH4 added
>   hw/sparc/Kconfig: Kconfig for Sparc added
> 
>  .gitmodules                               |   3 +
>  Kconfig                                   |  10 +
>  Makefile                                  |  97 +++++++++-
>  Makefile.target                           |  12 +-
>  configure                                 |  14 ++
>  default-configs/arm-linux-user.mak        |   2 -
>  default-configs/arm-softmmu.mak           |  15 +-
>  default-configs/armeb-linux-user.mak      |   2 -
>  default-configs/i386-softmmu.mak          |   3 +
>  default-configs/m68k-linux-user.mak       |   2 -
>  default-configs/m68k-softmmu.mak          |   4 +-
>  default-configs/microblaze-softmmu.mak    |   3 +
>  default-configs/microblazeel-softmmu.mak  |   3 +
>  default-configs/mips-softmmu.mak          |   6 +
>  default-configs/mips64-softmmu.mak        |   6 +
>  default-configs/mips64el-softmmu.mak      |   6 +
>  default-configs/mipsel-softmmu.mak        |   6 +
>  default-configs/pci.mak                   |   2 +
>  default-configs/ppc-linux-user.mak        |   2 -
>  default-configs/ppc-softmmu.mak           |   9 +-
>  default-configs/ppc64-linux-user.mak      |   2 -
>  default-configs/ppc64-softmmu.mak         |  10 +-
>  default-configs/ppc64abi32-linux-user.mak |   2 -
>  default-configs/ppcemb-softmmu.mak        |   9 +-
>  default-configs/sh4-softmmu.mak           |   4 +
>  default-configs/sh4eb-softmmu.mak         |   3 +
>  default-configs/sparc-softmmu.mak         |   2 +
>  default-configs/x86_64-softmmu.mak        |   3 +
>  default-configs/xtensa-softmmu.mak        |   3 +
>  default-configs/xtensaeb-softmmu.mak      |   3 +
>  hw/9pfs/Kconfig                           |   2 +
>  hw/Kconfig                                |  28 +++
>  hw/acpi/Kconfig                           |   4 +
>  hw/alpha/Kconfig                          |  13 ++
>  hw/arm/Kconfig                            | 237 +++++++++++++++++++++++
>  hw/arm/Makefile.objs                      |  35 +++-
>  hw/audio/Kconfig                          |  41 ++++
>  hw/block/Kconfig                          |  31 +++
>  hw/char/Kconfig                           |  24 +++
>  hw/core/Kconfig                           |  11 ++
>  hw/cpu/Kconfig                            |  18 ++
>  hw/cris/Kconfig                           |   7 +
>  hw/display/Kconfig                        |  84 ++++++++
>  hw/dma/Kconfig                            |  24 +++
>  hw/gpio/Kconfig                           |   5 +
>  hw/i2c/Kconfig                            |   6 +
>  hw/i386/Kconfig                           |  54 ++++++
>  hw/i386/Makefile.objs                     |   5 +-
>  hw/ide/Kconfig                            |  50 +++++
>  hw/input/Kconfig                          |  23 +++
>  hw/intc/Kconfig                           |  38 ++++
>  hw/intc/Makefile.objs                     |   2 +-
>  hw/isa/Kconfig                            |  39 ++++
>  hw/lm32/Kconfig                           |  17 ++
>  hw/lm32/Makefile.objs                     |   4 +-
>  hw/m68k/Kconfig                           |  22 +++
>  hw/m68k/Makefile.objs                     |   7 +-
>  hw/microblaze/Kconfig                     |  19 ++
>  hw/microblaze/Makefile.objs               |   7 +-
>  hw/mips/Kconfig                           |  73 +++++++
>  hw/mips/Makefile.objs                     |   8 +-
>  hw/misc/Kconfig                           |  67 +++++++
>  hw/moxie/Kconfig                          |   6 +
>  hw/net/Kconfig                            |  74 +++++++
>  hw/nvram/Kconfig                          |   5 +
>  hw/openrisc/Kconfig                       |   7 +
>  hw/openrisc/Makefile.objs                 |   2 +-
>  hw/pci-bridge/Kconfig                     |   3 +
>  hw/pci-host/Kconfig                       |  36 ++++
>  hw/pci/Kconfig                            |   8 +
>  hw/pci/Makefile.objs                      |   2 +-
>  hw/ppc/Kconfig                            |  98 ++++++++++
>  hw/ppc/Makefile.objs                      |  14 +-
>  hw/s390x/Kconfig                          |  12 ++
>  hw/s390x/Makefile.objs                    |   6 +-
>  hw/scsi/Kconfig                           |  21 ++
>  hw/sd/Kconfig                             |  27 +++
>  hw/sh4/Kconfig                            |  17 ++
>  hw/sh4/Makefile.objs                      |   4 +-
>  hw/sparc/Kconfig                          |  18 ++
>  hw/sparc/Makefile.objs                    |   3 +-
>  hw/sparc64/Kconfig                        |  14 ++
>  hw/ssi/Kconfig                            |  14 ++
>  hw/timer/Kconfig                          |  81 ++++++++
>  hw/tpm/Kconfig                            |   6 +
>  hw/unicore32/Kconfig                      |   5 +
>  hw/usb/Kconfig                            |  77 ++++++++
>  hw/usb/Makefile.objs                      |   6 +-
>  hw/usb/hcd-ohci-pci.c                     |  96 +++++++++
>  hw/usb/hcd-ohci-sysbus.c                  |  84 ++++++++
>  hw/usb/hcd-ohci.h                         | 311 ++++++++++++++++++++++++++++++
>  hw/watchdog/Kconfig                       |   7 +
>  hw/xtensa/Kconfig                         |  10 +
>  hw/xtensa/Makefile.objs                   |   4 +-
>  rules.mak                                 |  16 ++
>  scripts/kconfig                           |   1 +
>  96 files changed, 2283 insertions(+), 65 deletions(-)
>  create mode 100644 Kconfig
>  create mode 100644 hw/9pfs/Kconfig
>  create mode 100644 hw/Kconfig
>  create mode 100644 hw/acpi/Kconfig
>  create mode 100644 hw/alpha/Kconfig
>  create mode 100644 hw/arm/Kconfig
>  create mode 100644 hw/audio/Kconfig
>  create mode 100644 hw/block/Kconfig
>  create mode 100644 hw/char/Kconfig
>  create mode 100644 hw/core/Kconfig
>  create mode 100644 hw/cpu/Kconfig
>  create mode 100644 hw/cris/Kconfig
>  create mode 100644 hw/display/Kconfig
>  create mode 100644 hw/dma/Kconfig
>  create mode 100644 hw/gpio/Kconfig
>  create mode 100644 hw/i2c/Kconfig
>  create mode 100644 hw/i386/Kconfig
>  create mode 100644 hw/ide/Kconfig
>  create mode 100644 hw/input/Kconfig
>  create mode 100644 hw/intc/Kconfig
>  create mode 100644 hw/isa/Kconfig
>  create mode 100644 hw/lm32/Kconfig
>  create mode 100644 hw/m68k/Kconfig
>  create mode 100644 hw/microblaze/Kconfig
>  create mode 100644 hw/mips/Kconfig
>  create mode 100644 hw/misc/Kconfig
>  create mode 100644 hw/moxie/Kconfig
>  create mode 100644 hw/net/Kconfig
>  create mode 100644 hw/nvram/Kconfig
>  create mode 100644 hw/openrisc/Kconfig
>  create mode 100644 hw/pci-bridge/Kconfig
>  create mode 100644 hw/pci-host/Kconfig
>  create mode 100644 hw/pci/Kconfig
>  create mode 100644 hw/ppc/Kconfig
>  create mode 100644 hw/s390x/Kconfig
>  create mode 100644 hw/scsi/Kconfig
>  create mode 100644 hw/sd/Kconfig
>  create mode 100644 hw/sh4/Kconfig
>  create mode 100644 hw/sparc/Kconfig
>  create mode 100644 hw/sparc64/Kconfig
>  create mode 100644 hw/ssi/Kconfig
>  create mode 100644 hw/timer/Kconfig
>  create mode 100644 hw/tpm/Kconfig
>  create mode 100644 hw/unicore32/Kconfig
>  create mode 100644 hw/usb/Kconfig
>  create mode 100644 hw/usb/hcd-ohci-pci.c
>  create mode 100644 hw/usb/hcd-ohci-sysbus.c
>  create mode 100644 hw/usb/hcd-ohci.h
>  create mode 100644 hw/watchdog/Kconfig
>  create mode 100644 hw/xtensa/Kconfig
>  create mode 160000 scripts/kconfig
> 
> -- 
> 1.8.1.2
> 
> 


-- 
-- 
Best regards,
  Antony Pavlov