[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 92/92] hw/net/can: Correct Kconfig dependencies
From: |
Paolo Bonzini |
Subject: |
[PULL 92/92] hw/net/can: Correct Kconfig dependencies |
Date: |
Thu, 24 Sep 2020 05:23:14 -0400 |
From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
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.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Message-Id:
<dd332de687bfe52bbec37f5de1d861fb8e620d74.1600069689.git.pisa@cmp.felk.cvut.cz>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
--
2.26.2
- [PULL 78/92] hw/xen: Split x86-specific declaration from generic hardware ones, (continued)
- [PULL 78/92] hw/xen: Split x86-specific declaration from generic hardware ones, Paolo Bonzini, 2020/09/24
- [PULL 77/92] stubs: Split accelerator / hardware related stubs, Paolo Bonzini, 2020/09/24
- [PULL 85/92] target/i386: kvm: do not use kvm_check_extension to find paravirtual capabilities, Paolo Bonzini, 2020/09/24
- [PULL 86/92] net/can: Initial host SocketCan support for CAN FD., Paolo Bonzini, 2020/09/24
- [PULL 79/92] typedefs: Restrict PCMachineState to 'hw/i386/pc.h', Paolo Bonzini, 2020/09/24
- [PULL 82/92] target/i386: Fix VM migration when interrupt based APF is enabled, Paolo Bonzini, 2020/09/24
- [PULL 83/92] target/i386: always create kvmclock device, Paolo Bonzini, 2020/09/24
- [PULL 81/92] helper_syscall x86_64: clear exception_is_int, Paolo Bonzini, 2020/09/24
- [PULL 88/92] net/can: Add can_dlc2len and can_len2dlc for CAN FD., Paolo Bonzini, 2020/09/24
- [PULL 84/92] bios-tables-test: Remove kernel-irqchip=off option, Paolo Bonzini, 2020/09/24
- [PULL 92/92] hw/net/can: Correct Kconfig dependencies,
Paolo Bonzini <=
- [PULL 89/92] hw/net/can/ctucafd: Add CTU CAN FD core register definitions., Paolo Bonzini, 2020/09/24
- [PULL 91/92] hw/net/can: Documentation for CTU CAN FD IP open hardware core emulation., Paolo Bonzini, 2020/09/24
- [PULL 90/92] hw/net/can: CTU CAN FD IP open hardware core emulation., Paolo Bonzini, 2020/09/24
- Re: [PULL 00/92] Misc patches for 2020-09-24, no-reply, 2020/09/24
- Re: [PULL 00/92] Misc patches for 2020-09-24, Peter Maydell, 2020/09/25