[Qemu-devel] [RFC PATCH 00/47] Describing patchset

[Qemu-devel] [RFC PATCH 00/47] Describing patchset

[Ákos Kovács]

This is a request-for-comments patchset on the kconfig integration. The patchset 
contains a 'scripts/kconfig' git submodule (PATCH 5, kconfig-frontends v3.10) with 
the necessary modifications in the Makefile.objs (PATCHES 6-16).

It also contains the Kconfig files themselves (PATCHES 17-45) for the devices and boards.
At the time I only included ARM, which is works nicely.

The main Kconfig file includes the devices' Kconfig file (hw/Kconfig) and the Kconfig.targets
which is generated by the configure script, according to '--target-list'.

At the time the patchset does not contain any way to build binaries with the new configuration,
but it can be 'imitated' with a single 'include ../.config' line in the target's 
*-softmmu/config-devices.mak or default-configs/*-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>

[Qemu-devel] [PATCH 01/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 01/47] rules.mak: New logical functions

[Peter Maydell]

On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
> 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>

Hi; I like the general idea here but I think there
are some issues with your implementation.

> ---
>  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

I think we should be clear here about the input
and output ranges of these functions, ie that
the inputs should always be "y", "n" or "" (with
either "n" or the empty string being false).

> +lnot = $(if $(subst n,,$1),n,y)
> +
> +land-yy = y
> +land = $(land-$1$2)

This means that $(call land,y,n) would expand
to the empty string, not 'y' or 'n', right?
I think we should make all these functions always
expand to either 'y' or 'n'.

land = $(if $(findstring yy,$1$2),y,n)

will do this.

> +lor = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)

This can't be correct for both 'lor' and 'eq'.
In fact it works as 'eq'. A working lor would be:

lor = $(if $(findstring y,$1$2),y,n)

> +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)

These give the wrong answer for comparisons
of 'n' with ''. Working versions:

eq = $(if $(filter $(call lnot,$1),$(call lnot,$2)),y,n)
ne = $(if $(filter $(call lnot,$1),$(call lnot,$2)),n,y)

> +isempty = $(call eq,$1,)
> +notempty = $(call ne,$1,)

These are wrong assuming we want 'n' eq '' semantics,
and we can directly implement them with $if anyway:

isempty = $(if $1,n,y)
notempty = $(if $1,y,n)

Below is the test makefile I used to check these:
===begin===
# insert function definitions here

yes=y
no=n
full=full
empty=
# change this to whichever fn you are looking at
testfn=ne


.PHONY: all

all:
    @echo "$(testfn) yes,yes = $(call $(testfn),$(yes),$(yes))"
    @echo "$(testfn) yes,no = $(call $(testfn),$(yes),$(no))"
    @echo "$(testfn) no,yes = $(call $(testfn),$(no),$(yes))"
    @echo "$(testfn) no,no = $(call $(testfn),$(no),$(no))"
    @echo "$(testfn) yes,empty = $(call $(testfn),$(yes),$(empty))"
    @echo "$(testfn) empty,yes = $(call $(testfn),$(empty),$(yes))"
    @echo "$(testfn) empty,no = $(call $(testfn),$(empty),$(no))"
    @echo "$(testfn) no,empty = $(call $(testfn),$(no),$(empty))"
    @echo "$(testfn) empty,empty = $(call $(testfn),$(empty),$(empty))"
    @echo "isempty($(empty)) = $(call isempty,$(empty))"
    @echo "isempty($(full)) = $(call isempty,$(full))"
    @echo "notempty($(empty)) = $(call notempty,$(empty))"
    @echo "notempty($(full)) = $(call notempty,$(full))"
===endit===

Since I've effectively rewritten all your patch here :-)
I'll put together a patch plus your patches 2 and 3
from this series since I think they make a nice standalone
cleanup.

Thanks
-- PMM

Re: [Qemu-devel] [PATCH 01/47] rules.mak: New logical functions

[Paolo Bonzini]

Il 13/09/2013 15:43, Peter Maydell ha scritto:
> On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
>> 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>
> 
> Hi; I like the general idea here but I think there
> are some issues with your implementation.
> 
>> ---
>>  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
> 
> I think we should be clear here about the input
> and output ranges of these functions, ie that
> the inputs should always be "y", "n" or "" (with
> either "n" or the empty string being false).
> 
>> +lnot = $(if $(subst n,,$1),n,y)
>> +
>> +land-yy = y
>> +land = $(land-$1$2)
> 
> This means that $(call land,y,n) would expand
> to the empty string, not 'y' or 'n', right?
> I think we should make all these functions always
> expand to either 'y' or 'n'.
> 
> land = $(if $(findstring yy,$1$2),y,n)
> 
> will do this.
> 
>> +lor = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)
> 
> This can't be correct for both 'lor' and 'eq'.
> In fact it works as 'eq'. A working lor would be:
> 
> lor = $(if $(findstring y,$1$2),y,n)
> 
>> +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)
> 
> These give the wrong answer for comparisons
> of 'n' with ''. Working versions:
> 
> eq = $(if $(filter $(call lnot,$1),$(call lnot,$2)),y,n)
> ne = $(if $(filter $(call lnot,$1),$(call lnot,$2)),n,y)

isempty/notempty are clearly string functions, where only the output is
of the y/n form.  Seeing Akos's implementation of isempty/notempty, I
think the desired semantics for eq/ne/isempty/notempty are also those of
string functions.

I would call your functions leqv/lxor, not eq/ne.

Your patch is fine if you either rename eq/ne like this, or revert them
to Akos's version.

Paolo

>> +isempty = $(call eq,$1,)
>> +notempty = $(call ne,$1,)
> 
> These are wrong assuming we want 'n' eq '' semantics,
> and we can directly implement them with $if anyway:
> 
> isempty = $(if $1,n,y)
> notempty = $(if $1,y,n)

Re: [Qemu-devel] [PATCH 01/47] rules.mak: New logical functions

[Peter Maydell]

On 13 September 2013 15:55, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 13/09/2013 15:43, Peter Maydell ha scritto:
>> On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
>>> +eq = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)
>>> +ne = $(if $(subst $2,,$1)$(subst $1,,$2),y,n)
>>
>> These give the wrong answer for comparisons
>> of 'n' with ''. Working versions:
>>
>> eq = $(if $(filter $(call lnot,$1),$(call lnot,$2)),y,n)
>> ne = $(if $(filter $(call lnot,$1),$(call lnot,$2)),n,y)
>
> isempty/notempty are clearly string functions, where only the output is
> of the y/n form.  Seeing Akos's implementation of isempty/notempty, I
> think the desired semantics for eq/ne/isempty/notempty are also those of
> string functions.
>
> I would call your functions leqv/lxor, not eq/ne.

Sounds reasonable -- I was led a little astray by
them all being in a patch whose only documentation
was the phrase "logical functions"...

> Your patch is fine if you either rename eq/ne like this,
> or revert them to Akos's version.

It sounds like we probably want two patches:
1. logical functions: land/lor/leqv/lxor/lnot
2. string functions: eq/ne/isempty/notempty

I assume we do end up using eq/ne somewhere?

-- PMM

Re: [Qemu-devel] [PATCH 01/47] rules.mak: New logical functions

[Paolo Bonzini]

Il 13/09/2013 17:02, Peter Maydell ha scritto:
> On 13 September 2013 15:55, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> Il 13/09/2013 15:43, Peter Maydell ha scritto:
>>> On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
>>>> +eq = $(if $(subst $2,,$1)$(subst $1,,$2),n,y)
>>>> +ne = $(if $(subst $2,,$1)$(subst $1,,$2),y,n)
>>>
>>> These give the wrong answer for comparisons
>>> of 'n' with ''. Working versions:
>>>
>>> eq = $(if $(filter $(call lnot,$1),$(call lnot,$2)),y,n)
>>> ne = $(if $(filter $(call lnot,$1),$(call lnot,$2)),n,y)
>>
>> isempty/notempty are clearly string functions, where only the output is
>> of the y/n form.  Seeing Akos's implementation of isempty/notempty, I
>> think the desired semantics for eq/ne/isempty/notempty are also those of
>> string functions.
>>
>> I would call your functions leqv/lxor, not eq/ne.
> 
> Sounds reasonable -- I was led a little astray by
> them all being in a patch whose only documentation
> was the phrase "logical functions"...
> 
>> Your patch is fine if you either rename eq/ne like this,
>> or revert them to Akos's version.
> 
> It sounds like we probably want two patches:
> 1. logical functions: land/lor/leqv/lxor/lnot
> 2. string functions: eq/ne/isempty/notempty
> 
> I assume we do end up using eq/ne somewhere?

I cannot think off-hand of a place where I'd use eq/ne directly rather
than isempty/notempty.  Or for that matter leqv/lxor.  :)

But since we're discussing the issue and the implementation of eq/ne is
not entirely trivial, I think it's simplest to have them even if they
are unused for now.

Paolo

[Qemu-devel] [PATCH 02/47] 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 ++------
 1 file changed, 2 insertions(+), 6 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)
-- 
1.7.10.4

[Qemu-devel] [PATCH 03/47] 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.7.10.4

[Qemu-devel] [PATCH 04/47] 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.7.10.4

[Qemu-devel] [PATCH 05/47] Makefile: Clone kconfig git submodule in Makefile

[Ákos Kovács]

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Makefile |  150 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 88 insertions(+), 62 deletions(-)

diff --git a/Makefile b/Makefile
index 4d257f1..9e7d815 100644
--- a/Makefile
+++ b/Makefile
@@ -56,8 +56,8 @@ 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
+	
 $(call set-vpath, $(SRC_PATH))
 
 LIBS+=-lz $(LIBS_TOOLS)
@@ -146,11 +146,10 @@ $(SRC_PATH)/pixman/configure:
 	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
 
 DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
-DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
-DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
+DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
 
 subdir-dtc:dtc/libfdt dtc/tests
-	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
+	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
 
 dtc/%:
 	mkdir -p $@
@@ -167,8 +166,11 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
 
 bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
 
-$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
-$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
+version.o: $(SRC_PATH)/version.rc config-host.h | version.lo
+version.lo: $(SRC_PATH)/version.rc config-host.h
+
+version-obj-$(CONFIG_WIN32) += version.o
+version-lobj-$(CONFIG_WIN32) += version.lo
 
 Makefile: $(version-obj-y) $(version-lobj-y)
 
@@ -180,6 +182,85 @@ libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o
 
 ######################################################################
 
+######################################################################
+# Kconfig rules
+#
+#KCONFIG_PATH:=$(SRC_PATH)/scripts/kconfig
+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_PATH)/bootstrap:
+	@echo Cloning kconfig-frontends...
+	$(call quiet-command,git submodule --init $(KCONFIG_PATH))
+
+$(KCONFIG_PATH)/Makefile: $(KCONFIG_PATH)/bootstrap
+	@(cd $(KCONFIG_PATH) ; ./bootstrap ; ./configure)
+
+$(foreach i, conf nconf mconf gconf qconf, \
+	$(KCONFIG_FRONTENDS)/$i/$i): $(KCONFIG_PATH)/Makefile config-host.mak
+	$(MAKE) -C $(KCONFIG_PATH)
+
+config: $(KCONFIG_CONF)
+	$< --oldaskconfig $(Kconfig)
+
+nconfig: $(KCONFIG_FRONTENDS)/nconfig/nconfig
+	$< $(Kconfig)
+
+xconfig: $(KCONFIG_FRONTENDS)/xconf/xconf
+	$< $(Kconfig)
+
+gconfig: $(KCONFIG_FRONTENDS)/gconf/gconf
+	$< $(Kconfig)
+
+oldconfig: $(KCONFIG_CONF)
+	$< --$@ $(Kconfig)
+
+menuconfig: $(KCONFIG_FRONTENDS)/mconf/mconf
+	$< $(Kconfig)
+
+localyesconfig:
+# TODO
+
+silentoldconfig: $(KCONFIG_CONF)
+	@echo "  Build Kconfig config file"
+	mkdir -p include/config
+	$< --$@ $(Kconfig)
+
+defconfig:
+# have it
+
+savedefconfig: $(obj)/conf
+	$< --$@=defconfig $(Kconfig)
+
+%config: $(KCONFIG_CONF)
+	$< --$@ $(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  '  localmodconfig  - Update current config disabling modules not loaded'
+	@echo  '  localyesconfig  - Update current config converting local mods to core'
+	@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  '  allmodconfig	  - New config selecting modules when possible'
+	@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
@@ -434,61 +515,6 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
 	qemu-img.texi qemu-nbd.texi qemu-options.texi \
 	qemu-monitor.texi qemu-img-cmds.texi
 
-ifdef CONFIG_WIN32
-
-INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
-
-nsisflags = -V2 -NOCD
-
-ifneq ($(wildcard $(SRC_PATH)/dll),)
-ifeq ($(ARCH),x86_64)
-# 64 bit executables
-DLL_PATH = $(SRC_PATH)/dll/w64
-nsisflags += -DW64
-else
-# 32 bit executables
-DLL_PATH = $(SRC_PATH)/dll/w32
-endif
-endif
-
-.PHONY: installer
-installer: $(INSTALLER)
-
-INSTDIR=/tmp/qemu-nsis
-
-$(INSTALLER): $(SRC_PATH)/qemu.nsi
-	make install prefix=${INSTDIR}
-ifdef SIGNCODE
-	(cd ${INSTDIR}; \
-         for i in *.exe; do \
-           $(SIGNCODE) $${i}; \
-         done \
-        )
-endif # SIGNCODE
-	(cd ${INSTDIR}; \
-         for i in qemu-system-*.exe; do \
-           arch=$${i%.exe}; \
-           arch=$${arch#qemu-system-}; \
-           echo Section \"$$arch\" Section_$$arch; \
-           echo SetOutPath \"\$$INSTDIR\"; \
-           echo File \"\$${BINDIR}\\$$i\"; \
-           echo SectionEnd; \
-         done \
-        ) >${INSTDIR}/system-emulations.nsh
-	makensis $(nsisflags) \
-                $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION="y") \
-                $(if $(CONFIG_GTK),-DCONFIG_GTK="y") \
-                -DBINDIR="${INSTDIR}" \
-                $(if $(DLL_PATH),-DDLLDIR="$(DLL_PATH)") \
-                -DSRCDIR="$(SRC_PATH)" \
-                -DOUTFILE="$(INSTALLER)" \
-                $(SRC_PATH)/qemu.nsi
-	rm -r ${INSTDIR}
-ifdef SIGNCODE
-	$(SIGNCODE) $(INSTALLER)
-endif # SIGNCODE
-endif # CONFIG_WIN
-
 # Add a dependency on the generated files, so that they are always
 # rebuilt before other object files
 ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 05/47] Makefile: Clone kconfig git submodule in Makefile

[Andreas Färber]

Am 26.08.2013 00:58, schrieb Ákos Kovács:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  Makefile |  150 ++++++++++++++++++++++++++++++++++++--------------------------
>  1 file changed, 88 insertions(+), 62 deletions(-)

Something went wrong here, you're reverting Stefan's win32 changes, and
dtc changes seem unintentional, too.

Less severe there's a stray trailing tab.

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Ákos Kovács]

Set CONFIG_CLIPPER as default for default-configs/alpha-softmmu.mak

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

diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index bc07600..1e8bbff 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -15,3 +15,5 @@ CONFIG_IDE_CMD646=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
+
+CONFIG_CLIPPER=y
diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
index 5c74275..0a6ade5 100644
--- a/hw/alpha/Makefile.objs
+++ b/hw/alpha/Makefile.objs
@@ -1 +1 @@
-obj-y += dp264.o pci.o typhoon.o
+obj-$(CONFIG_CLIPPER) += dp264.o pci.o typhoon.o
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Richard Henderson]

On 08/25/2013 03:58 PM, Ákos Kovács wrote:
> Set CONFIG_CLIPPER as default for default-configs/alpha-softmmu.mak
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  default-configs/alpha-softmmu.mak |    2 ++
>  hw/alpha/Makefile.objs            |    2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
> index bc07600..1e8bbff 100644
> --- a/default-configs/alpha-softmmu.mak
> +++ b/default-configs/alpha-softmmu.mak
> @@ -15,3 +15,5 @@ CONFIG_IDE_CMD646=y
>  CONFIG_I8259=y
>  CONFIG_MC146818RTC=y
>  CONFIG_ISA_TESTDEV=y
> +
> +CONFIG_CLIPPER=y
> diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
> index 5c74275..0a6ade5 100644
> --- a/hw/alpha/Makefile.objs
> +++ b/hw/alpha/Makefile.objs
> @@ -1 +1 @@
> -obj-y += dp264.o pci.o typhoon.o
> +obj-$(CONFIG_CLIPPER) += dp264.o pci.o typhoon.o
> 

I don't understand the point of this.  There is one alpha emulation;
if you disable it you're left with a program that's not useful.  So
why the configuration for it at all?


r~

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Paolo Bonzini]

Il 26/08/2013 16:41, Richard Henderson ha scritto:
> On 08/25/2013 03:58 PM, Ákos Kovács wrote:
>> Set CONFIG_CLIPPER as default for default-configs/alpha-softmmu.mak
>>
>> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
>> ---
>>  default-configs/alpha-softmmu.mak |    2 ++
>>  hw/alpha/Makefile.objs            |    2 +-
>>  2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
>> index bc07600..1e8bbff 100644
>> --- a/default-configs/alpha-softmmu.mak
>> +++ b/default-configs/alpha-softmmu.mak
>> @@ -15,3 +15,5 @@ CONFIG_IDE_CMD646=y
>>  CONFIG_I8259=y
>>  CONFIG_MC146818RTC=y
>>  CONFIG_ISA_TESTDEV=y
>> +
>> +CONFIG_CLIPPER=y
>> diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
>> index 5c74275..0a6ade5 100644
>> --- a/hw/alpha/Makefile.objs
>> +++ b/hw/alpha/Makefile.objs
>> @@ -1 +1 @@
>> -obj-y += dp264.o pci.o typhoon.o
>> +obj-$(CONFIG_CLIPPER) += dp264.o pci.o typhoon.o
>>
> 
> I don't understand the point of this.  There is one alpha emulation;
> if you disable it you're left with a program that's not useful.  So
> why the configuration for it at all?

I think this was just for consistency with other targets.  Either this
patch can be left out completely, or the symbol can be made default on
and unchangeable by the user.

Paolo

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Richard Henderson]

On 08/26/2013 09:59 AM, Paolo Bonzini wrote:
>> I don't understand the point of this.  There is one alpha emulation;
>> if you disable it you're left with a program that's not useful.  So
>> why the configuration for it at all?
> 
> I think this was just for consistency with other targets.  Either this
> patch can be left out completely, or the symbol can be made default on
> and unchangeable by the user.

Yeah, maybe.  I'll be interested to see the v2 cover-letter with your requested
description of what the series brings to the table.

This isn't the kernel, where non-pagable code size is a concern, so I don't see
how full configuration of machine emulations and devices is helpful.  I'd be
more inclined to go the other way, where all qemu-system-cpu images always
build in all devices (compiled once of course).

I guess I'll wait and see.


r~

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Lluís Vilanova]

Richard Henderson writes:

> On 08/26/2013 09:59 AM, Paolo Bonzini wrote:
>>> I don't understand the point of this.  There is one alpha emulation;
>>> if you disable it you're left with a program that's not useful.  So
>>> why the configuration for it at all?
>> 
>> I think this was just for consistency with other targets.  Either this
>> patch can be left out completely, or the symbol can be made default on
>> and unchangeable by the user.

> Yeah, maybe.  I'll be interested to see the v2 cover-letter with your requested
> description of what the series brings to the table.

Didn't look much into the patches, so I'm not sure if this includes both the
configuration and build system for Linux, but the kernel's build system might
provide a more robust and flexible build system.


> This isn't the kernel, where non-pagable code size is a concern, so I don't see
> how full configuration of machine emulations and devices is helpful.  I'd be
> more inclined to go the other way, where all qemu-system-cpu images always
> build in all devices (compiled once of course).

Which reminds me of some older discussion about having a single QEMU binary able
to emulate a system with CPUs from different architectures (with a future^2
version of qom'ified CPUs).

Such fine-grained compilation would deviate even more from that goal (assuming
it's a goal).


Lluis

-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Peter Maydell]

On 26 August 2013 19:44, Lluís Vilanova <vilanova@ac.upc.edu> wrote:
> Richard Henderson writes:
>> This isn't the kernel, where non-pagable code size is a concern, so I don't see
>> how full configuration of machine emulations and devices is helpful.  I'd be
>> more inclined to go the other way, where all qemu-system-cpu images always
>> build in all devices (compiled once of course).
>
> Which reminds me of some older discussion about having a single QEMU binary able
> to emulate a system with CPUs from different architectures (with a future^2
> version of qom'ified CPUs).
>
> Such fine-grained compilation would deviate even more from that goal (assuming
> it's a goal).

I think "aspiration" is perhaps more accurate than "goal", but yes :-)
In general I'm not convinced it's wise to give end-users and distros
even more config options to shoot themselves in the foot with
(and every distro is going to end up wanting to build an "everything"
config anyway, and hopefully most people use distro builds, so
what's the use case for anything else?)

-- PMM

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Paolo Bonzini]

Il 26/08/2013 21:47, Peter Maydell ha scritto:
> In general I'm not convinced it's wise to give end-users and distros
> even more config options to shoot themselves in the foot with

Note that the Kconfig project is about giving end users _less_ config
options.  default-configs/ does not capture dependencies (except in a
very elementary way through pci.mak and usb.mak), while Kconfig does.

Kconfig basically makes configuration of builtin devices automatic just
by choosing the desired boards.

> (and every distro is going to end up wanting to build an "everything"
> config anyway, and hopefully most people use distro builds, so
> what's the use case for anything else?)

Not every distro, as mentioned in my answer to rth.

Paolo

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Paolo Bonzini]

Il 26/08/2013 19:30, Richard Henderson ha scritto:
> This isn't the kernel, where non-pagable code size is a concern, so I don't see
> how full configuration of machine emulations and devices is helpful.  I'd be
> more inclined to go the other way, where all qemu-system-cpu images always
> build in all devices (compiled once of course).

This is useful for different usecases.  One is QEMU that is bundled into
development platform such as the Android emulator.  Making it easier to
build limited versions of QEMU is one small step towards encouraging
working in-tree instead of having out-of-tree patches which quickly
become forks.

The second is in distros that only want to distribute the subset of
features that are going to be supported (aka RHEL).  This includes both
devices (all of PCI, ISA, USB) and boards (-M isapc is removed nowadays,
perhaps one day goldfish or similar will be available too; for ARM and
PPC we surely would want to compile out almost all the boards).

The third is that in the future some of the devices could be compiled as
modules, too.  This would help the "other" set of distros, those that
include everything.  QEMU now has an insane set of dependencies, and
having modules for e.g. SPICE or RBD or Gluster would help making them
optional.

Paolo

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Richard Henderson]

On 08/26/2013 03:33 PM, Paolo Bonzini wrote:
> Il 26/08/2013 19:30, Richard Henderson ha scritto:
>> This isn't the kernel, where non-pagable code size is a concern, so I don't see
>> how full configuration of machine emulations and devices is helpful.  I'd be
>> more inclined to go the other way, where all qemu-system-cpu images always
>> build in all devices (compiled once of course).
> 
> This is useful for different usecases.  One is QEMU that is bundled into
> development platform such as the Android emulator.  Making it easier to
> build limited versions of QEMU is one small step towards encouraging
> working in-tree instead of having out-of-tree patches which quickly
> become forks.
> 
> The second is in distros that only want to distribute the subset of
> features that are going to be supported (aka RHEL).  This includes both
> devices (all of PCI, ISA, USB) and boards (-M isapc is removed nowadays,
> perhaps one day goldfish or similar will be available too; for ARM and
> PPC we surely would want to compile out almost all the boards).
> 
> The third is that in the future some of the devices could be compiled as
> modules, too.  This would help the "other" set of distros, those that
> include everything.  QEMU now has an insane set of dependencies, and
> having modules for e.g. SPICE or RBD or Gluster would help making them
> optional.

All reasonable.  Thanks for the rationale.


r~

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Peter Maydell]

On 26 August 2013 23:33, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 26/08/2013 19:30, Richard Henderson ha scritto:
>> This isn't the kernel, where non-pagable code size is a concern, so I don't see
>> how full configuration of machine emulations and devices is helpful.  I'd be
>> more inclined to go the other way, where all qemu-system-cpu images always
>> build in all devices (compiled once of course).
>
> This is useful for different usecases.  One is QEMU that is bundled into
> development platform such as the Android emulator.  Making it easier to
> build limited versions of QEMU is one small step towards encouraging
> working in-tree instead of having out-of-tree patches which quickly
> become forks.

I simply don't believe that this is anything remotely approaching a
major reason why the Android emulator is out of tree, or that merging
this patchset would have any visible effect in moving the Android emulator
into the tree. Anybody from Google is of course welcome to contradict me
on this point.

> The second is in distros that only want to distribute the subset of
> features that are going to be supported (aka RHEL).  This includes both
> devices (all of PCI, ISA, USB) and boards (-M isapc is removed nowadays,
> perhaps one day goldfish or similar will be available too; for ARM and
> PPC we surely would want to compile out almost all the boards).

Hrm. Yeah, I can see the security argument for wanting a very
stripped down build for the KVM/production use.

> The third is that in the future some of the devices could be compiled as
> modules, too.  This would help the "other" set of distros, those that
> include everything.  QEMU now has an insane set of dependencies, and
> having modules for e.g. SPICE or RBD or Gluster would help making them
> optional.

I thought the plan was to address that by having a module system,
not by having a huge config system. You still build everything all
at once, you just split the binaries/shared objects you ship as a
distro into multiple packages.

> Note that the Kconfig project is about giving end users _less_ config
> options.

>From my perspective it seems to be giving users more options,
because at the moment there are none -- you just compile QEMU
and you get everything. Nobody should (IMHO) be editing
default-configs/ (despite the slightly confusing name). Providing a
config system is providing knobs we don't have at the moment.

-- PMM

Re: [Qemu-devel] [PATCH 06/47] hw/alpha/Makefile.objs: Build objects depending on CLIPPER

[Paolo Bonzini]

Il 27/08/2013 01:17, Peter Maydell ha scritto:
> On 26 August 2013 23:33, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> Il 26/08/2013 19:30, Richard Henderson ha scritto:
>>> This isn't the kernel, where non-pagable code size is a concern, so I don't see
>>> how full configuration of machine emulations and devices is helpful.  I'd be
>>> more inclined to go the other way, where all qemu-system-cpu images always
>>> build in all devices (compiled once of course).
>>
>> This is useful for different usecases.  One is QEMU that is bundled into
>> development platform such as the Android emulator.  Making it easier to
>> build limited versions of QEMU is one small step towards encouraging
>> working in-tree instead of having out-of-tree patches which quickly
>> become forks.
> 
> I simply don't believe that this is anything remotely approaching a
> major reason why the Android emulator is out of tree, or that merging
> this patchset would have any visible effect in moving the Android emulator
> into the tree. Anybody from Google is of course welcome to contradict me
> on this point.

No, it's not anything remotely approaching a major reason.  But still,
modifying default-configs/ is one of the out-of-tree patches that any
external emulator has to include.

>> The second is in distros that only want to distribute the subset of
>> features that are going to be supported (aka RHEL).  This includes both
>> devices (all of PCI, ISA, USB) and boards (-M isapc is removed nowadays,
>> perhaps one day goldfish or similar will be available too; for ARM and
>> PPC we surely would want to compile out almost all the boards).
> 
> Hrm. Yeah, I can see the security argument for wanting a very
> stripped down build for the KVM/production use.
> 
>> The third is that in the future some of the devices could be compiled as
>> modules, too.  This would help the "other" set of distros, those that
>> include everything.  QEMU now has an insane set of dependencies, and
>> having modules for e.g. SPICE or RBD or Gluster would help making them
>> optional.
> 
> I thought the plan was to address that by having a module system,
> not by having a huge config system. You still build everything all
> at once, you just split the binaries/shared objects you ship as a
> distro into multiple packages.

Sure.  But the above stripped-down build might just as well be
monolithic, so you need to configure what is a module and what is not.

>> Note that the Kconfig project is about giving end users _less_ config
>> options.
> 
> From my perspective it seems to be giving users more options,
> because at the moment there are none -- you just compile QEMU
> and you get everything. Nobody should (IMHO) be editing
> default-configs/ (despite the slightly confusing name).

At least RHEL is doing so (and RHEL originally motivated the first big
Makefile reorganization by Juan around 4 years ago, and the introduction
of default-configs).  Even though this is a summer of code project, my
proposal was driven by an actual need (and curiosity of course).

Paolo

[Qemu-devel] [PATCH 07/47] 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..fa0eabf 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) += 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_VXPRESS)     += vexpress.o
+obj-$(CONFIG_ZYNQ) += xilinx_zynq.o 
+obj-$(CONFIG_ARMV7M) += armv7m.o
+obj-$(CONFIG_PXA2XX) += pxa2xx.o
+obj-$(CONFIG_PXA2XX) += 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_STRONARM) += strongarm.o
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 07/47] hw/arm/Makefile.objs: CONFIG_* created for each board

[Max Filippov]

On Mon, Aug 26, 2013 at 2:58 AM, Ákos Kovács <akoskovacs@gmx.com> wrote:
> 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(-)

[...]

> +obj-$(CONFIG_STRONARM) += strongarm.o

Typo in config symbol name.

-- 
Thanks.
-- Max

Re: [Qemu-devel] [PATCH 07/47] hw/arm/Makefile.objs: CONFIG_* created for each board

[Peter Maydell]

On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
> 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

VEXPRESS.

> +CONFIG_Z2=y
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 3671b42..fa0eabf 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) += omap_sx1.o

This is a board -- why is it sharing a config with OMAP
rather than getting its own?

> +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_VXPRESS)     += vexpress.o
> +obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
> +obj-$(CONFIG_ARMV7M) += armv7m.o
> +obj-$(CONFIG_PXA2XX) += pxa2xx.o
> +obj-$(CONFIG_PXA2XX) += z2.o

Why didn't this board get its own CONFIG_Z2 ?

> +obj-$(CONFIG_PXA2XX) += pxa2xx_gpio.o
> +obj-$(CONFIG_PXA2XX) += pxa2xx_pic.o
> +obj-$(CONFIG_OMAP) += omap1.o
> +obj-$(CONFIG_OMAP) += omap2.o
> +obj-$(CONFIG_STRONARM) += strongarm.o

Typo, as Max points out.

thanks
-- PMM

[Qemu-devel] [PATCH 09/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 09/47] hw/m68k/Makefile.objs: Conditionally build boards

[Max Filippov]

On Mon, Aug 26, 2013 at 2:58 AM, Ákos Kovács <akoskovacs@gmx.com> wrote:
> CONFIG_AN5206, CONFIG_DUMMY_M68K, CONFIG_MCF5206, CONFIG_MCF5208

Looks like CONFIG_MCF5206 is missing.

> 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

-- 
Thanks.
-- Max

[Qemu-devel] [PATCH 10/47] 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.7.10.4

[Qemu-devel] [PATCH 11/47] 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..304902b 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_FULONG) += mips_fulong2e.o
 obj-y += 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-$(CONFIG_MIPSSIM) += mips_mipssim.o
-- 
1.7.10.4

[Qemu-devel] [PATCH 12/47] 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.7.10.4

[Qemu-devel] [PATCH 13/47] 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.7.10.4

[Qemu-devel] [PATCH 14/47] 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.7.10.4

[Qemu-devel] [PATCH 15/47] 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.7.10.4

[Qemu-devel] [PATCH 16/47] 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.7.10.4

[Qemu-devel] [PATCH 17/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 17/47] hw/9pfs/Kconfig: Add 9pfs Kconfig

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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
> 

This is defined by config-host.mak, so it is not needed here.

However, you may want a CONFIG_VIRTIO_9P, controlling compilation of
virtio-9p-device.o.

Paolo

[Qemu-devel] [PATCH 18/47] hw/arm/Kconfig: Add ARM Kconfig

[Ákos Kovács]

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

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
new file mode 100644
index 0000000..c72b949
--- /dev/null
+++ b/hw/arm/Kconfig
@@ -0,0 +1,235 @@
+config ARM
+    bool
+#    select ARM_NVIC
+    default y
+
+menu "ARM" 
+    config EXYNOS4
+        bool "Samsung Exynos4210 SoC"
+        select A9SCU # snoop controll unit
+        select USB_EHCI
+        select LAN9118
+        select PL310 # cache controller
+        select PCI
+        select ARM_GIC
+        select ARM_NVIC
+        select ARM9MPCORE
+        select ARM_MPTIMER
+        default y
+
+    config HIGHBANK
+        bool "Calxeda Highbank SoC"
+        select A9SCU # snoop controll unit
+        select AHCI
+        select PL011 # UART
+        select PL022 # Serial port
+        select PL031 # RTC
+        select PL061 # GPIO
+        select PL310 # cache controller
+        select XGMAC # ethernet
+        select ARM_TIMER # sp804
+        select ARM_NVIC
+        select ARM_MPTIMER
+        select ARM9MPCORE
+        select PCI
+        default y
+
+    config INTEGRATORCP
+        bool "ARM Integrator CP"
+        select SMC91C111
+        select ARM_TIMER
+        select PL011 # UART
+        select PL031 # RTC
+        select PL050 # keyboard/mouse
+        select PL110 # pl111 LCD controller
+        select PL181 # display
+        select PCI
+        default y
+
+    config KZM
+        bool "Kzm"
+        select SERIAL
+        select IMX
+        select LAN9118
+        select PCI
+        default y
+
+    config MUSICPAL
+        bool "Marvell MV88W8618 / Freecom MusicPal"
+        select PFLASH_CFI02
+        select PTIMER
+        select PCI
+        select BITBANG_I2C
+        select MARVELL_88W8618
+        select WM8750
+        select SERIAL
+        default y
+
+    config OMAP
+        bool "Texas Instruments Open Multimedia Applications Platform"
+        select SERIAL
+        select PFLASH_CFI01
+        select PCI
+        default y
+
+    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
+        depends on OMAP
+        default y
+
+    config PALM
+        bool "PalmOne PDAs"
+        select TSC210X
+        depends on OMAP
+        default y
+
+    config STELLARIS
+        bool
+        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
+        default y    # for armv7m_nvic_*
+
+    config REALVIEW
+        bool "ARM Realview baseboard"
+        # networking
+        select SMC91C111
+        select LAN9118
+        select RTL8139_PCI
+
+        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 VERSATILE_I2C
+        select DS1338 # I2C RTC+NVRAM
+        select USB_OHCI
+        select ARM_GIC
+        select ARM_MPTIMER
+        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.7.10.4

Re: [Qemu-devel] [PATCH 18/47] hw/arm/Kconfig: Add ARM Kconfig

[Peter Maydell]

On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/arm/Kconfig |  235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 235 insertions(+)
>  create mode 100644 hw/arm/Kconfig
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> new file mode 100644
> index 0000000..c72b949
> --- /dev/null
> +++ b/hw/arm/Kconfig
> @@ -0,0 +1,235 @@
> +config ARM
> +    bool
> +#    select ARM_NVIC

Why is this here but commented out?

> +    default y
> +
> +menu "ARM"
> +    config EXYNOS4
> +        bool "Samsung Exynos4210 SoC"
> +        select A9SCU # snoop controll unit
> +        select USB_EHCI
> +        select LAN9118
> +        select PL310 # cache controller
> +        select PCI

No PCI on this board (well, there is, but not modelled).

> +        select ARM_GIC
> +        select ARM_NVIC

This is wrong -- this CPU doesn't have an NVIC.

> +        select ARM9MPCORE

This is misnamed: should be A9MPCORE.

> +        select ARM_MPTIMER

Each Cortex-A9 platform shouldn't have to individually
select all of the components of the A9 individually
(GIC, mpcore container, mp timer, SCU) -- A9MPCORE
should just pull them all in.

> +        default y
> +
> +    config HIGHBANK
> +        bool "Calxeda Highbank SoC"
> +        select A9SCU # snoop controll unit
> +        select AHCI
> +        select PL011 # UART
> +        select PL022 # Serial port
> +        select PL031 # RTC
> +        select PL061 # GPIO
> +        select PL310 # cache controller
> +        select XGMAC # ethernet
> +        select ARM_TIMER # sp804
> +        select ARM_NVIC
> +        select ARM_MPTIMER
> +        select ARM9MPCORE
> +        select PCI

No PCI (yet).

> +        default y
> +
> +    config INTEGRATORCP
> +        bool "ARM Integrator CP"
> +        select SMC91C111
> +        select ARM_TIMER
> +        select PL011 # UART
> +        select PL031 # RTC
> +        select PL050 # keyboard/mouse
> +        select PL110 # pl111 LCD controller
> +        select PL181 # display
> +        select PCI

No PCI.

> +        default y
> +
> +    config KZM
> +        bool "Kzm"
> +        select SERIAL
> +        select IMX
> +        select LAN9118
> +        select PCI

No PCI.

> +        default y
> +
> +    config MUSICPAL
> +        bool "Marvell MV88W8618 / Freecom MusicPal"
> +        select PFLASH_CFI02
> +        select PTIMER
> +        select PCI
> +        select BITBANG_I2C
> +        select MARVELL_88W8618
> +        select WM8750
> +        select SERIAL
> +        default y
> +
> +    config OMAP
> +        bool "Texas Instruments Open Multimedia Applications Platform"

Don't we want separate configs for OMAP1 and OMAP2?

> +        select SERIAL
> +        select PFLASH_CFI01
> +        select PCI

No PCI.

> +        default y
> +
> +    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
> +        depends on OMAP

Why 'depends on' rather than 'select' ?

> +        default y
> +
> +    config PALM
> +        bool "PalmOne PDAs"
> +        select TSC210X
> +        depends on OMAP
> +        default y
> +
> +    config STELLARIS
> +        bool
> +        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
> +        default y    # for armv7m_nvic_*

What is this comment trying to say?

> +
> +    config REALVIEW
> +        bool "ARM Realview baseboard"
> +        # networking
> +        select SMC91C111
> +        select LAN9118
> +        select RTL8139_PCI

This doesn't make any sense. Any board with PCI
should be compiled with all the PCI card models, so
there shouldn't be any need to manually select one here.

> +
> +        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 VERSATILE_I2C
> +        select DS1338 # I2C RTC+NVRAM
> +        select USB_OHCI

This is just a PCI card too, right?

> +        select ARM_GIC
> +        select ARM_MPTIMER
> +        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

Why does this board select the realview board?

> +        default y
> +
> +    config VXPRESS

"VEXPRESS".

> +        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

Why does this board select realview?

> +        default y
> +
> +    config ZYNQ
> +        bool "Xilinx Zynq Baseboard"
> +        select ARM9MPCORE
> +        select CADENCE # UART
> +        select PCI

Don't think this board has PCI either

> +        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"

This is a CPU -- why does it get a config when other
CPUs don't?

> +        select SERIAL
> +        select PCI

No PCI here.

> +        select USB_OHCI
> +        select SSI
> +        default y
> +
> +    config GUMSTIX
> +        bool "Gumstix platform"
> +        select PFLASH_CFI01
> +        select SMC91C111
> +        depends on PXA2XX

Again, why depends?

> +        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

Why does this 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.7.10.4

thanks
-- PMM

Re: [Qemu-devel] [PATCH 18/47] hw/arm/Kconfig: Add ARM Kconfig

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/arm/Kconfig |  235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 235 insertions(+)
>  create mode 100644 hw/arm/Kconfig
> 
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> new file mode 100644
> index 0000000..c72b949
> --- /dev/null
> +++ b/hw/arm/Kconfig
> @@ -0,0 +1,235 @@
> +config ARM
> +    bool
> +#    select ARM_NVIC
> +    default y

Why is this item needed?

Paolo

> +menu "ARM" 
> +    config EXYNOS4
> +        bool "Samsung Exynos4210 SoC"
> +        select A9SCU # snoop controll unit
> +        select USB_EHCI
> +        select LAN9118
> +        select PL310 # cache controller
> +        select PCI
> +        select ARM_GIC
> +        select ARM_NVIC
> +        select ARM9MPCORE
> +        select ARM_MPTIMER
> +        default y
> +
> +    config HIGHBANK
> +        bool "Calxeda Highbank SoC"
> +        select A9SCU # snoop controll unit
> +        select AHCI
> +        select PL011 # UART
> +        select PL022 # Serial port
> +        select PL031 # RTC
> +        select PL061 # GPIO
> +        select PL310 # cache controller
> +        select XGMAC # ethernet
> +        select ARM_TIMER # sp804
> +        select ARM_NVIC
> +        select ARM_MPTIMER
> +        select ARM9MPCORE
> +        select PCI
> +        default y
> +
> +    config INTEGRATORCP
> +        bool "ARM Integrator CP"
> +        select SMC91C111
> +        select ARM_TIMER
> +        select PL011 # UART
> +        select PL031 # RTC
> +        select PL050 # keyboard/mouse
> +        select PL110 # pl111 LCD controller
> +        select PL181 # display
> +        select PCI
> +        default y
> +
> +    config KZM
> +        bool "Kzm"
> +        select SERIAL
> +        select IMX
> +        select LAN9118
> +        select PCI
> +        default y
> +
> +    config MUSICPAL
> +        bool "Marvell MV88W8618 / Freecom MusicPal"
> +        select PFLASH_CFI02
> +        select PTIMER
> +        select PCI
> +        select BITBANG_I2C
> +        select MARVELL_88W8618
> +        select WM8750
> +        select SERIAL
> +        default y
> +
> +    config OMAP
> +        bool "Texas Instruments Open Multimedia Applications Platform"
> +        select SERIAL
> +        select PFLASH_CFI01
> +        select PCI
> +        default y
> +
> +    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
> +        depends on OMAP
> +        default y
> +
> +    config PALM
> +        bool "PalmOne PDAs"
> +        select TSC210X
> +        depends on OMAP
> +        default y
> +
> +    config STELLARIS
> +        bool
> +        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
> +        default y    # for armv7m_nvic_*
> +
> +    config REALVIEW
> +        bool "ARM Realview baseboard"
> +        # networking
> +        select SMC91C111
> +        select LAN9118
> +        select RTL8139_PCI
> +
> +        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 VERSATILE_I2C
> +        select DS1338 # I2C RTC+NVRAM
> +        select USB_OHCI
> +        select ARM_GIC
> +        select ARM_MPTIMER
> +        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
> 

[Qemu-devel] [PATCH 19/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 19/47] hw/audio/Kconfig: Add audio Kconfig

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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

All these should have "depends on 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

Perhaps "depends on I8254"?

> +    config WM8750
> +        bool
> +
> +    config PL041
> +        bool
> +
> +    config CS4231
> +        bool
> +
> +    config MARVELL_88W8618
> +        bool
> +endmenu
> 

[Qemu-devel] [PATCH 20/47] hw/block/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/block/Kconfig b/hw/block/Kconfig
new file mode 100644
index 0000000..400cab3
--- /dev/null
+++ b/hw/block/Kconfig
@@ -0,0 +1,34 @@
+config FDC
+    bool
+    #select ISA
+
+config SSI_M25P80
+    bool
+    select SSI
+
+config NAND
+    bool
+
+config PFLASH_CFI01
+    bool
+
+config PFLASH_CFI02
+    bool
+
+config ECC
+    bool
+
+config ONENAND
+    bool
+
+config PC_SYSFW
+    bool
+    #select ISA
+
+config NVME_PCI
+    bool
+    depends on PCI
+
+config VIRTIO_BLK_DATA_PLANE
+    bool
+    select VIRTIO
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 20/47] hw/block/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/block/Kconfig |   34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 hw/block/Kconfig
> 
> diff --git a/hw/block/Kconfig b/hw/block/Kconfig
> new file mode 100644
> index 0000000..400cab3
> --- /dev/null
> +++ b/hw/block/Kconfig
> @@ -0,0 +1,34 @@
> +config FDC
> +    bool
> +    #select ISA
> +
> +config SSI_M25P80
> +    bool
> +    select SSI
> +
> +config NAND
> +    bool
> +
> +config PFLASH_CFI01
> +    bool
> +
> +config PFLASH_CFI02
> +    bool
> +
> +config ECC
> +    bool
> +
> +config ONENAND
> +    bool
> +
> +config PC_SYSFW
> +    bool
> +    #select ISA

This is not anymore in the tree.

> +config NVME_PCI
> +    bool
> +    depends on PCI
> +
> +config VIRTIO_BLK_DATA_PLANE
> +    bool
> +    select VIRTIO

This is controlled by config-host.mak, so no need for it here.

Perhaps, similar to 9p, you could have

config VIRTIO_BLK
    bool
    default y
    depends on VIRTIO

but it can be added later, too.

Paolo

[Qemu-devel] [PATCH 21/47] 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..7ad0bd3
--- /dev/null
+++ b/hw/char/Kconfig
@@ -0,0 +1,24 @@
+config IPACK 
+    bool
+    depends on PCI
+
+config ESCC
+    bool
+
+config PARALLEL
+    bool
+    #select ISA
+
+config SERIAL
+    bool
+    #select ISA
+
+config SERIAL_PCI
+    bool
+    depends on PCI
+
+config SCLPCONSOLE
+    bool
+
+config PL011
+    bool
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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..7ad0bd3
> --- /dev/null
> +++ b/hw/char/Kconfig
> @@ -0,0 +1,24 @@
> +config IPACK 
> +    bool
> +    depends on PCI

PCI devices are generally configurable, so you need to add prompts to them.

> +config ESCC
> +    bool
> +
> +config PARALLEL
> +    bool
> +    #select ISA

Also "depends on" here.  You probably also want to make all these ISA
devices configurable, so add a prompt.

Paolo

> +config SERIAL
> +    bool
> +    #select ISA
> +
> +config SERIAL_PCI
> +    bool
> +    depends on PCI
> +
> +config SCLPCONSOLE
> +    bool
> +
> +config PL011
> +    bool
> 

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Andreas Färber]

Am 26.08.2013 12:43, schrieb Paolo Bonzini:
> Il 26/08/2013 00:58, Ákos Kovács ha scritto:
>> 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..7ad0bd3
>> --- /dev/null
>> +++ b/hw/char/Kconfig
>> @@ -0,0 +1,24 @@
>> +config IPACK 
>> +    bool
>> +    depends on PCI
> 
> PCI devices are generally configurable, so you need to add prompts to them.

IndustryPack is really misplaced in hw/char/ and I believe I posted
patches to remedy that and let one actually find it in our source tree.
There were no objections against hw/ipack/, alternatively it could go
into hw/gpio/. (Currently my patch series is waiting to be respun due to
changed QOM realize requirements from Anthony.)

That having being said, IndustryPack does not depend on PCI, only the
TPCI2000(?) PCI-IndustryPack bridge does.

Andreas

> 
>> +config ESCC
>> +    bool
>> +
>> +config PARALLEL
>> +    bool
>> +    #select ISA
> 
> Also "depends on" here.  You probably also want to make all these ISA
> devices configurable, so add a prompt.
> 
> Paolo
> 
>> +config SERIAL
>> +    bool
>> +    #select ISA
>> +
>> +config SERIAL_PCI
>> +    bool
>> +    depends on PCI
>> +
>> +config SCLPCONSOLE
>> +    bool
>> +
>> +config PL011
>> +    bool
>>
> 
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 19:15, Andreas Färber ha scritto:
>> > PCI devices are generally configurable, so you need to add prompts to them.
> IndustryPack is really misplaced in hw/char/ and I believe I posted
> patches to remedy that and let one actually find it in our source tree.
> There were no objections against hw/ipack/, alternatively it could go
> into hw/gpio/. (Currently my patch series is waiting to be respun due to
> changed QOM realize requirements from Anthony.)
> 
> That having being said, IndustryPack does not depend on PCI, only the
> TPCI2000(?) PCI-IndustryPack bridge does.

Both of them are under the same symbol right now.  After all any of the
two is basically unusable without the other, and plans for extension
seem not to exist as even Linux has only that one bridge and one device.

I have no objection to hw/ipack, but I have a question.  Would you
follow the SCSI/USB model (with devices under hw/ipack, also followed
for IndustryPack in the Linux kernel) or the virtio model (where the
device remains under hw/char)?  Generally we've tried to follow Linux
for hw/ structure unless maintainers preferred otherwise, so it would
prefer the former.

Paolo

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Andreas Färber]

Am 27.08.2013 00:40, schrieb Paolo Bonzini:
> Il 26/08/2013 19:15, Andreas Färber ha scritto:
>>>> PCI devices are generally configurable, so you need to add prompts to them.
>> IndustryPack is really misplaced in hw/char/ and I believe I posted
>> patches to remedy that and let one actually find it in our source tree.
>> There were no objections against hw/ipack/, alternatively it could go
>> into hw/gpio/. (Currently my patch series is waiting to be respun due to
>> changed QOM realize requirements from Anthony.)
>>
>> That having being said, IndustryPack does not depend on PCI, only the
>> TPCI2000(?) PCI-IndustryPack bridge does.
> 
> Both of them are under the same symbol right now.  After all any of the
> two is basically unusable without the other, and plans for extension
> seem not to exist as even Linux has only that one bridge and one device.
> 
> I have no objection to hw/ipack, but I have a question.  Would you
> follow the SCSI/USB model (with devices under hw/ipack, also followed
> for IndustryPack in the Linux kernel) or the virtio model (where the
> device remains under hw/char)?  Generally we've tried to follow Linux
> for hw/ structure unless maintainers preferred otherwise, so it would
> prefer the former.

My quest is a) consistency and b) easily finding QOM base device classes
for refactorings. PCI and USB were done before your big hw/
reorganization, and the biggest part of devices appears to follow the
categorization by function (which is why I saw the overlap with Marcel's
category markup). ipoctal232 looks correct in hw/char/ to me, so that it
can benefit from any general char device refactorings.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 13/09/2013 16:00, Andreas Färber ha scritto:
>> > I have no objection to hw/ipack, but I have a question.  Would you
>> > follow the SCSI/USB model (with devices under hw/ipack, also followed
>> > for IndustryPack in the Linux kernel) or the virtio model (where the
>> > device remains under hw/char)?  Generally we've tried to follow Linux
>> > for hw/ structure unless maintainers preferred otherwise, so it would
>> > prefer the former.
> My quest is a) consistency and b) easily finding QOM base device classes
> for refactorings. PCI and USB were done before your big hw/
> reorganization, and the biggest part of devices appears to follow the
> categorization by function (which is why I saw the overlap with Marcel's
> category markup). ipoctal232 looks correct in hw/char/ to me, so that it
> can benefit from any general char device refactorings.

Yeah, I agree.  But I'm not sure of the benefit of an hw/ipack directory
if (a) there is only one class providing the bus and (b) all the classes
using the bus (well, there is just one of them) are in the same directory.

If any of the two conditions were not true anymore, I'd ask to
contextually create hw/ipack.  But for now, keeping both ipack files in
hw/char is the most "economic" thing to do.

Paolo

Re: [Qemu-devel] [PATCH 21/47] hw/char/Kconfig: Add Kconfig file

[Alberto Garcia]

On Fri, Sep 13, 2013 at 04:49:48PM +0200, Paolo Bonzini wrote:

> I'm not sure of the benefit of an hw/ipack directory if (a) there is
> only one class providing the bus and (b) all the classes using the
> bus (well, there is just one of them) are in the same directory.
> 
> If any of the two conditions were not true anymore, I'd ask to
> contextually create hw/ipack.  But for now, keeping both ipack files
> in hw/char is the most "economic" thing to do.

I decided to emulate both boards separately because it was not much
more work and it seemed like a better idea to me, but it was the
tpci200/ipoctal combination that I was interested in.

So it sounds reasonable to me to keep both files together.

Berto

[Qemu-devel] [PATCH 22/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 22/47] hw/core/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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

Please make this "config STREAM" and "select" it from XILINX_AXI.

> +config PTIMER
> +    bool

Remember that this should be selected from all devices that use ptimers.

> +config SOFTMMU
> +    bool

This is not needed, it comes from config-target.mak.

Paolo

[Qemu-devel] [PATCH 23/47] hw/cpu/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig
new file mode 100644
index 0000000..d90cbe5
--- /dev/null
+++ b/hw/cpu/Kconfig
@@ -0,0 +1,11 @@
+config ARM11MPCORE
+    bool
+
+config ARM9MPCORE
+    bool 
+
+config ARM15MPCORE
+    bool
+
+config ICC_BUS
+    bool
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 23/47] hw/cpu/Kconfig: Add Kconfig file

[Andreas Färber]

Am 26.08.2013 00:58, schrieb Ákos Kovács:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/cpu/Kconfig |   11 +++++++++++
>  1 file changed, 11 insertions(+)
>  create mode 100644 hw/cpu/Kconfig
> 
> diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig
> new file mode 100644
> index 0000000..d90cbe5
> --- /dev/null
> +++ b/hw/cpu/Kconfig
> @@ -0,0 +1,11 @@
> +config ARM11MPCORE
> +    bool
> +

> +config ARM9MPCORE
> +    bool 
> +
> +config ARM15MPCORE
> +    bool

These naming bugs have been fixed in qemu.git in the meantime. They
should be A9MPCORE and A15MPCORE respectively.

Andreas

> +
> +config ICC_BUS
> +    bool
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 24/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 24/47] hw/display/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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

Similarly this should be "depends on".  To put it more clearly:

- devices that are on a particular bus should "depend on" that bus;

- devices that expose a particular bus (for example a PCI host bridge)
should "select" it so that the user can choose which devices to enable
on that board

- devices can also "select" library features that they use, for example
FRAMEBUFFER or PTIMER, or "sub-devices" that they include, for example
VGA or what you did in I82378

- boards should also "select" devices, but you got that part right so no
need to explain :)

Paolo

> +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
> 

[Qemu-devel] [PATCH 25/47] hw/dma/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
new file mode 100644
index 0000000..1ef6b47
--- /dev/null
+++ b/hw/dma/Kconfig
@@ -0,0 +1,25 @@
+config RC4030
+    bool
+
+config PL080
+    bool
+
+config PL330
+    bool
+
+config I82374
+    bool
+    #select ISA
+    select I8257
+
+config I8257
+    bool
+    #select ISA
+
+config XILINX_AXI
+    bool
+    select PTIMER
+
+config STP2000
+    bool
+    select SUN4M
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 25/47] hw/dma/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/dma/Kconfig |   25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>  create mode 100644 hw/dma/Kconfig
> 
> diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
> new file mode 100644
> index 0000000..1ef6b47
> --- /dev/null
> +++ b/hw/dma/Kconfig
> @@ -0,0 +1,25 @@
> +config RC4030
> +    bool
> +
> +config PL080
> +    bool
> +
> +config PL330
> +    bool
> +
> +config I82374
> +    bool
> +    #select ISA
> +    select I8257
> +
> +config I8257
> +    bool
> +    #select ISA

So, according to the rules in the previous email, "select I8257" is
right, but it must be once more "depends on ISA".

Paolo

> +config XILINX_AXI
> +    bool
> +    select PTIMER
> +
> +config STP2000
> +    bool
> +    select SUN4M
> 

[Qemu-devel] [PATCH 26/47] 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.7.10.4

[Qemu-devel] [PATCH 27/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 27/47] hw/i2c/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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

Please move this to hw/acpi/Kconfig.

Later we can add separate PM_SMBUS and SMBUS_ICH9 symbols with proper
dependencies.

> +config BITBANG_I2C
> +    bool
> 

[Qemu-devel] [PATCH 28/47] hw/ide/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
new file mode 100644
index 0000000..c73af88
--- /dev/null
+++ b/hw/ide/Kconfig
@@ -0,0 +1,49 @@
+config IDE_CORE
+    bool
+    #select ISA
+
+config IDE_QDEV
+    bool
+    select IDE_CORE
+
+config IDE_PCI
+    bool "IDE PCI"
+    select IDE_QDEV
+    select USB_XHCI
+
+config IDE_ISA
+    bool
+    #select ISA
+    select IDE_QDEV
+
+config IDE_PIIX
+    bool
+    select IDE_QDEV
+    depends on PCI
+
+config IDE_CMD646
+    bool
+    #select 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
+    depends on PCI
+
+config MICRODRIVE
+    bool
+    select IDE_CORE
+
+config AHCI
+    bool
+    select IDE_QDEV
-- 
1.7.10.4

[Qemu-devel] [PATCH 29/47] 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.7.10.4

[Qemu-devel] [PATCH 30/47] hw/intc/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
new file mode 100644
index 0000000..c4dec79
--- /dev/null
+++ b/hw/intc/Kconfig
@@ -0,0 +1,28 @@
+config HEATHROW_PIC
+    bool
+
+config I8259
+    bool
+
+config PL190
+    bool
+
+config APIC
+    bool
+
+config ARM_GIC
+    bool
+
+config ARM_GIC_KVM
+    bool
+    depends on KVM
+
+config IOAPIC
+    bool
+
+config OPENPICS
+    bool
+
+config STELLARIS
+    bool
+    select ARM_GIC
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 30/47] hw/intc/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/intc/Kconfig |   28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>  create mode 100644 hw/intc/Kconfig
> 
> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
> new file mode 100644
> index 0000000..c4dec79
> --- /dev/null
> +++ b/hw/intc/Kconfig
> @@ -0,0 +1,28 @@
> +config HEATHROW_PIC
> +    bool
> +
> +config I8259
> +    bool
> +
> +config PL190
> +    bool
> +
> +config APIC
> +    bool
> +
> +config ARM_GIC
> +    bool
> +
> +config ARM_GIC_KVM
> +    bool
> +    depends on KVM

IIRC "KVM" is not available yet in Kconfig, so you need to leave this
dependency out.

> +config IOAPIC
> +    bool
> +
> +config OPENPICS
> +    bool
> +
> +config STELLARIS
> +    bool
> +    select ARM_GIC
> 

Please make this symbol ARMV7M_NVIC, and make STELLARIS select it.

Paolo

[Qemu-devel] [PATCH 31/47] hw/isa/Kconfig: Add Kconfig file

[Ákos Kovács]

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

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

Re: [Qemu-devel] [PATCH 31/47] hw/isa/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/isa/Kconfig |   42 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
>  create mode 100644 hw/isa/Kconfig
> 
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> new file mode 100644
> index 0000000..8b6baaf
> --- /dev/null
> +++ b/hw/isa/Kconfig
> @@ -0,0 +1,42 @@
> +#config ISA
> +#   bool

Why is it commented out?

> +config APM
> +    bool
> +
> +config I82378
> +    bool    
> +    #select ISA
> +    select I8259  # irq
> +    select PCSPK
> +    select I82374 # DMA
> +    select MC146818RTC # timer
> +    depends on PCI
> +
> +config ISA_MMIO
> +    bool
> +    #select ISA 

This doesn't exist anymore.

> +config PC87312
> +    bool
> +    #select ISA 
> +    select SERIAL
> +    select PARALLEL
> +    select FDC
> +    select IDE_ISA
> +
> +config PIIX4
> +    bool
> +    #select ISA 
> +    depends on PCI
> +
> +config VT82C686
> +    bool
> +    #select ISA 
> +    depends on PCI
> +
> +config LPC_ICH9
> +    bool
> +    #select ISA 
> +    depends on PCI 
> +    select APM

"select ISA" is right for this file.

Paolo

[Qemu-devel] [PATCH 32/47] 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..5a6477f
--- /dev/null
+++ b/hw/misc/Kconfig
@@ -0,0 +1,67 @@
+config APPLESMC
+    bool
+    #select ISA
+    
+config MAX111X
+    bool
+    select SSI
+
+config TMP105
+    bool
+    #select I2C
+
+config ISA_DEBUG
+    bool
+    #select ISA
+
+config SGA
+    bool
+    #depends on PCI
+
+config ISA_TESTDEV
+    bool
+    #select ISA
+
+config PCI_TESTDEV
+    bool
+    depends on PCI
+
+config VMPORT
+    bool
+    #select 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
+    #select ISA
+
+config A9SCU
+    bool
+
+config ECCMEMCTL
+    bool
+    select ECC
+
+config OMAP
+    bool
+    select ECCMEMCTL
+    select NAND
+    
+config PVPANIC
+    bool
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 32/47] hw/misc/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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..5a6477f
> --- /dev/null
> +++ b/hw/misc/Kconfig
> @@ -0,0 +1,67 @@
> +config APPLESMC
> +    bool
> +    #select ISA
> +    
> +config MAX111X
> +    bool
> +    select SSI
> +
> +config TMP105
> +    bool
> +    #select I2C
> +
> +config ISA_DEBUG
> +    bool
> +    #select ISA
> +
> +config SGA
> +    bool
> +    #depends on PCI
> +
> +config ISA_TESTDEV
> +    bool
> +    #select ISA
> +
> +config PCI_TESTDEV
> +    bool
> +    depends on PCI
> +
> +config VMPORT
> +    bool
> +    #select ISA
> +
> +config PL310
> +    bool
> +
> +config PUV3
> +    bool
> +
> +config MACIO
> +    bool
> +    depends on PCI
> +    select MAC_NVRAM

Correct: this is a PCI device that embeds an MacIONVRAMState.

But it also embeds a MAC_DBDMA device, so "select MAC_DBDMA" too.

> +config CUDA
> +    bool
> +    select MACIO

Should be "select ADB" since this is a device that exposes an ADB bus.

> +config MAC_DBDMA
> +    bool   
> +    select MACIO
> +    select ADB
> +    #select ISA

Why these?  I think it doesn't need any of the three.

> +config A9SCU
> +    bool
> +
> +config ECCMEMCTL
> +    bool
> +    select ECC
> +
> +config OMAP
> +    bool
> +    select ECCMEMCTL
> +    select NAND
> +    
> +config PVPANIC
> +    bool
> 

[Qemu-devel] [PATCH 33/47] hw/net/Kconfig: Add Kconfig file

[Ákos Kovács]

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

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.7.10.4

[Qemu-devel] [PATCH 34/47] 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.7.10.4

[Qemu-devel] [PATCH 35/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 35/47] hw/pci/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> +
> +menu "PCI"
> +    config PCI_HOTPLUG
> +        bool "Enable hotplugging for PCI devices"
> +        depends on PCI
> +endmenu

This has now been renamed to CONFIG_PCI_HOTPLUG_OLD.  It's a legacy
interface, so perhaps you can leave the prompt out.

Paolo

[Qemu-devel] [PATCH 36/47] 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.7.10.4

[Qemu-devel] [PATCH 37/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 37/47] hw/pci-host/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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

Here finally we have one that should be "select ISA"! :)  This is
because this file actually implements both a PCI bridge (the i440FX
"NorthBridge") and an ISA bridge (the PIIX3 "SouthBridge").

Paolo


> +config PCI_Q35
> +    bool
> +    select PCI
> 

[Qemu-devel] [PATCH 38/47] 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.7.10.4

[Qemu-devel] [PATCH 39/47] hw/sd/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
new file mode 100644
index 0000000..eaef4f7
--- /dev/null
+++ b/hw/sd/Kconfig
@@ -0,0 +1,23 @@
+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
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 39/47] hw/sd/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/sd/Kconfig |   23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>  create mode 100644 hw/sd/Kconfig
> 
> diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
> new file mode 100644
> index 0000000..eaef4f7
> --- /dev/null
> +++ b/hw/sd/Kconfig
> @@ -0,0 +1,23 @@
> +config SD
> +    bool
> +
> +config PL181
> +    bool
> +    select SD

"select SD" is right ("library" code).

> +config SSI_SD
> +    bool
> +    select SD
> +    select SSI

But this needs to be "depends on".  In general, you'll usually have
"select SSI" inside hw/ssi, "select ISA" inside hw/isa, "select PCI"
inside hw/pci-host, etc.

Paolo

> +config SDHCI
> +    bool
> +    select SD
> +
> +config MILKYMIST
> +    bool
> +    select SD
> +
> +config PXA2XX
> +    bool
> +    select SD
> 

[Qemu-devel] [PATCH 40/47] 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.7.10.4

[Qemu-devel] [PATCH 41/47] hw/timer/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
new file mode 100644
index 0000000..5d55137
--- /dev/null
+++ b/hw/timer/Kconfig
@@ -0,0 +1,80 @@
+config ARM_TIMER
+    bool
+    select PTIMER
+
+config CADENCE
+    bool
+
+config DS1338
+    bool
+
+config HPET
+    bool
+
+config I8254
+    bool
+    select MC146818RTC
+    #select ISA
+
+config M48T59
+    bool
+    #select 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
+    #select ISA
-- 
1.7.10.4

[Qemu-devel] [PATCH 42/47] 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.7.10.4

[Qemu-devel] [PATCH 43/47] hw/usb/Kconfig: Add Kconfig file

[Ákos Kovács]

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

diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
new file mode 100644
index 0000000..a39915c
--- /dev/null
+++ b/hw/usb/Kconfig
@@ -0,0 +1,60 @@
+menu "USB devices"
+    config USB_UHCI
+        bool "USB UHCI support"
+        default y
+        
+    config USB_OHCI
+        bool "USB OHCI support"
+        default y
+        depends on PCI
+
+    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.7.10.4

Re: [Qemu-devel] [PATCH 43/47] hw/usb/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  hw/usb/Kconfig |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 60 insertions(+)
>  create mode 100644 hw/usb/Kconfig
> 
> diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
> new file mode 100644
> index 0000000..a39915c
> --- /dev/null
> +++ b/hw/usb/Kconfig
> @@ -0,0 +1,60 @@
> +menu "USB devices"
> +    config USB_UHCI
> +        bool "USB UHCI support"
> +        default y
> +        
> +    config USB_OHCI
> +        bool "USB OHCI support"
> +        default y
> +        depends on PCI
> +
> +    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
> 

You should include the 3 USB patches you sent last week before this one,
please.

Thanks,

Paolo

[Qemu-devel] [PATCH 44/47] 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.7.10.4

Re: [Qemu-devel] [PATCH 44/47] hw/watchdog/Kconfig: Add Kconfig file

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> 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
> 

This one would have been right. :)

Paolo

[Qemu-devel] [PATCH 45/47] 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.7.10.4

[Qemu-devel] [PATCH 46/47] 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 18fa608..353c0cb 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.7.10.4

Re: [Qemu-devel] [PATCH 46/47] configure: Generate Kconfig.targets with --target-list

[Paolo Bonzini]

Il 26/08/2013 00:58, Ákos Kovács ha scritto:
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  configure |   11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/configure b/configure
> index 18fa608..353c0cb 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
> 

There is one issue that we have not solved yet here (pointed out by
Peter Maydell on IRC).  Right now, the presence of a file in
default-configs/ is used to check if a target name is correct.  We need
to figure out a different way to do the same thing.

This needs to cover both softmmu and user targets.  For softmmu, perhaps
there should be a hw/boards/ directory with a subdirectory for each
target.  "source hw/i386/Kconfig" (for Kconfig) or "obj-y += ../i386/"
can be used to recurse back to a common directory from there.

For linux-user, the problem is that we don't have anything to configure
with Kconfig---so no reason to have a Kconfig file or a directory
structure with one directory per target.

Paolo

[Qemu-devel] [PATCH 47/47] Kconfig: Main kconfig file added

[Ákos Kovács]

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

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

Re: [Qemu-devel] [RFC PATCH 00/47] Describing patchset

[Peter Maydell]

On 25 August 2013 23:58, Ákos Kovács <akoskovacs@gmx.com> wrote:
> This is a request-for-comments patchset on the kconfig integration. The patchset
> contains a 'scripts/kconfig' git submodule (PATCH 5, kconfig-frontends v3.10) with
> the necessary modifications in the Makefile.objs (PATCHES 6-16).

Hi; could you describe the general reasons why we want to do this,
please? (ie the benefits we get from reworking our config/build system).

(also for next time round, make sure you write a useful subject in
your cover letter :-))

thanks
-- PMM