From 9caf292924a26cbfb7e46d232a0f32f706254866 Mon Sep 17 00:00:00 2001 From: Danilo de Paula Date: Fri, 7 Dec 2018 14:16:59 +0000 Subject: [PATCH 2/2] Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Danilo de Paula Message-id: <20181207141659.3485-1-ddepaula@redhat.com> Patchwork-id: 83304 O-Subject: [RHEL-8.0/rhel qemu-kvm PATCH] Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000 Bugzilla: 1640042 RH-Acked-by: Thomas Huth RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Stefan Hajnoczi BZ: 1640042 Branch: rhel8/master-2.12.0 Branch: rhel8/master-3.1.0-rc2 Upstream: Downstream only Brew: None We currently compile qemu-kvm with CONFIG_CAN_SJA1000=y and CONFIG_CAN_BUS=y in default-configs/pci.mak. As far as I can see, this has currently no effect, since we already disabled the other CONFIG_CAN_* switches there (which control the inclusion of the emulated CAN devices). Since we do not have any plans to support CAN in downstream, we should also disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000 in our downstream configuration. Signed-off-by: Danilo C. L. de Paula --- default-configs/pci.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 763c375..2277308 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -31,8 +31,8 @@ CONFIG_AHCI=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y CONFIG_SERIAL_PCI=y -CONFIG_CAN_BUS=y -CONFIG_CAN_SJA1000=y +#CONFIG_CAN_BUS=y +#CONFIG_CAN_SJA1000=y #CONFIG_CAN_PCI=y #CONFIG_IPACK=y CONFIG_WDT_IB6300ESB=y -- 1.8.3.1