This device is not user-creatable and currently only used for the
"alpha" target. So if the user does not want to compile alpha-softmmu,
we should also not compile this device. Add a proper config switch to
be able to compile this more flexibly.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 default-configs/alpha-softmmu.mak | 1 +
 hw/isa/Makefile.objs              | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index bbe361f..eb58b40 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -19,3 +19,4 @@ CONFIG_IDE_CMD646=y
 CONFIG_I8259=y
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
+CONFIG_SMC37C669=y
diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
index 83e06f6..9e106df 100644
--- a/hw/isa/Makefile.objs
+++ b/hw/isa/Makefile.objs
@@ -1,9 +1,10 @@
 common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
-common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o
+common-obj-$(CONFIG_ISA_BUS) += isa-superio.o
 common-obj-$(CONFIG_APM) += apm.o
 common-obj-$(CONFIG_I82378) += i82378.o
 common-obj-$(CONFIG_PC87312) += pc87312.o
 common-obj-$(CONFIG_PIIX4) += piix4.o
 common-obj-$(CONFIG_VT82C686) += vt82c686.o
+common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o
 
 obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o
-- 
1.8.3.1

On 19 October 2018 at 14:14, Thomas Huth <thuth@redhat.com> wrote:
> This device is not user-creatable and currently only used for the
> "alpha" target. So if the user does not want to compile alpha-softmmu,
> we should also not compile this device. Add a proper config switch to
> be able to compile this more flexibly.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  default-configs/alpha-softmmu.mak | 1 +
>  hw/isa/Makefile.objs              | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
> index bbe361f..eb58b40 100644
> --- a/default-configs/alpha-softmmu.mak
> +++ b/default-configs/alpha-softmmu.mak
> @@ -19,3 +19,4 @@ CONFIG_IDE_CMD646=y
>  CONFIG_I8259=y
>  CONFIG_MC146818RTC=y
>  CONFIG_ISA_TESTDEV=y
> +CONFIG_SMC37C669=y
> diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
> index 83e06f6..9e106df 100644
> --- a/hw/isa/Makefile.objs
> +++ b/hw/isa/Makefile.objs
> @@ -1,9 +1,10 @@
>  common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
> -common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o
> +common-obj-$(CONFIG_ISA_BUS) += isa-superio.o
>  common-obj-$(CONFIG_APM) += apm.o
>  common-obj-$(CONFIG_I82378) += i82378.o
>  common-obj-$(CONFIG_PC87312) += pc87312.o
>  common-obj-$(CONFIG_PIIX4) += piix4.o
>  common-obj-$(CONFIG_VT82C686) += vt82c686.o
> +common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Should isa-superio.o also go in its own config flag?

thanks
-- PMM

On 19/10/2018 16:46, Peter Maydell wrote:
> On 19 October 2018 at 14:14, Thomas Huth <thuth@redhat.com> wrote:
>> This device is not user-creatable and currently only used for the
>> "alpha" target. So if the user does not want to compile alpha-softmmu,
>> we should also not compile this device. Add a proper config switch to
>> be able to compile this more flexibly.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  default-configs/alpha-softmmu.mak | 1 +
>>  hw/isa/Makefile.objs              | 3 ++-
>>  2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
>> index bbe361f..eb58b40 100644
>> --- a/default-configs/alpha-softmmu.mak
>> +++ b/default-configs/alpha-softmmu.mak
>> @@ -19,3 +19,4 @@ CONFIG_IDE_CMD646=y
>>  CONFIG_I8259=y
>>  CONFIG_MC146818RTC=y
>>  CONFIG_ISA_TESTDEV=y
>> +CONFIG_SMC37C669=y
>> diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
>> index 83e06f6..9e106df 100644
>> --- a/hw/isa/Makefile.objs
>> +++ b/hw/isa/Makefile.objs
>> @@ -1,9 +1,10 @@
>>  common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
>> -common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o
>> +common-obj-$(CONFIG_ISA_BUS) += isa-superio.o
>>  common-obj-$(CONFIG_APM) += apm.o
>>  common-obj-$(CONFIG_I82378) += i82378.o
>>  common-obj-$(CONFIG_PC87312) += pc87312.o
>>  common-obj-$(CONFIG_PIIX4) += piix4.o
>>  common-obj-$(CONFIG_VT82C686) += vt82c686.o
>> +common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o
> 
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> 
> Should isa-superio.o also go in its own config flag?

It could be, but pc87312/smc37c669/vt82c686 inherit of TYPE_ISA_SUPERIO
so would require something like:

common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_PC87312)) \
            += pc87312.o
common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_VT82C686)) \
            += vt82c686.o
common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_SMC37C669)) \
            += smc37c669-superio.o

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> 
> thanks
> -- PMM
> 

On 19 October 2018 at 17:35, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> On 19/10/2018 16:46, Peter Maydell wrote:
>> Should isa-superio.o also go in its own config flag?
>
> It could be, but pc87312/smc37c669/vt82c686 inherit of TYPE_ISA_SUPERIO
> so would require something like:
>
> common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_PC87312)) \
>             += pc87312.o
> common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_VT82C686)) \
>             += vt82c686.o
> common-obj-$(call land,$(CONFIG_ISA_SUPERIO),$(CONFIG_SMC37C669)) \
>             += smc37c669-superio.o

This is where it would be nice to be able to say
"CONFIG_FOO requires CONFIG_BAR", indeed.

thanks
-- PMM