On 03/09/20 23:48, Pavel Pisa wrote:
> The original CAN_PCI config option enables multiple SJA1000 PCI boards
> emulation build. These boards bridge SJA1000 into I/O or memory
> address space of the host CPU and depend on SJA1000 emulation.
Can you explain how the mistake is related to the meson switch?
The conversion seems good:
diff --git a/hw/net/can/Makefile.objs b/hw/net/can/Makefile.objs
deleted file mode 100644
index 9f0c4ee332..0000000000
--- a/hw/net/can/Makefile.objs
+++ /dev/null
@@ -1,4 +0,0 @@
-common-obj-$(CONFIG_CAN_SJA1000) += can_sja1000.o
-common-obj-$(CONFIG_CAN_PCI) += can_kvaser_pci.o
-common-obj-$(CONFIG_CAN_PCI) += can_pcm3680_pci.o
-common-obj-$(CONFIG_CAN_PCI) += can_mioe3680_pci.o
diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build
new file mode 100644
index 0000000000..c9cfeb7954
--- /dev/null
+++ b/hw/net/can/meson.build
@@ -0,0 +1,4 @@
+softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c'))
+softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'))
I queued the other six patches.
Paolo
> Signed-off-by: Pavel Pisa <p...@cmp.felk.cvut.cz>
> ---
> hw/net/Kconfig | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/net/Kconfig b/hw/net/Kconfig
> index 225d948841..6d795ec752 100644
> --- a/hw/net/Kconfig
> +++ b/hw/net/Kconfig
> @@ -132,16 +132,15 @@ config ROCKER
> config CAN_BUS
> bool
>
> -config CAN_PCI
> +config CAN_SJA1000
> bool
> default y if PCI_DEVICES
> - depends on PCI
> select CAN_BUS
>
> -config CAN_SJA1000
> +config CAN_PCI
> bool
> default y if PCI_DEVICES
> - depends on PCI
> + depends on PCI && CAN_SJA1000
> select CAN_BUS
>
> config CAN_CTUCANFD
