From 3b3008fc244b29a1022c93dd567db73990a8c505 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 16 Jan 2023 18:12:07 -0500 Subject: linux: update virtio-aarch64 kernel configuration Update virtio-aarch64 kernel configuration for QEMU+KVM demo to turn on some CAN and USB device support to allow using some emulated and passthrough devices where there is currently not a workable virtio backend solution. Bug-AGL: SPEC-4618 Change-Id: I9e574f54d1696d5b45e7f04b4d51002eafac5f04 Signed-off-by: Scott Murray (cherry picked from commit e511c8eca18ed0d4895c8e150c8670be45fb608a) --- recipes-kernel/linux/linux/kvm-demo-can-devices.cfg | 5 +++++ recipes-kernel/linux/linux/kvm-demo-usb.cfg | 4 ++++ recipes-kernel/linux/linux/virtio-demo-can-devices.cfg | 5 ----- recipes-kernel/linux/linux_agldemo.inc | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 recipes-kernel/linux/linux/kvm-demo-can-devices.cfg create mode 100644 recipes-kernel/linux/linux/kvm-demo-usb.cfg delete mode 100644 recipes-kernel/linux/linux/virtio-demo-can-devices.cfg diff --git a/recipes-kernel/linux/linux/kvm-demo-can-devices.cfg b/recipes-kernel/linux/linux/kvm-demo-can-devices.cfg new file mode 100644 index 000000000..17cb166a8 --- /dev/null +++ b/recipes-kernel/linux/linux/kvm-demo-can-devices.cfg @@ -0,0 +1,5 @@ +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_SJA1000=y +CONFIG_PCI=y +CONFIG_CAN_KVASER_PCI=m diff --git a/recipes-kernel/linux/linux/kvm-demo-usb.cfg b/recipes-kernel/linux/linux/kvm-demo-usb.cfg new file mode 100644 index 000000000..2fa56a1b7 --- /dev/null +++ b/recipes-kernel/linux/linux/kvm-demo-usb.cfg @@ -0,0 +1,4 @@ +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_PCI=y diff --git a/recipes-kernel/linux/linux/virtio-demo-can-devices.cfg b/recipes-kernel/linux/linux/virtio-demo-can-devices.cfg deleted file mode 100644 index 17cb166a8..000000000 --- a/recipes-kernel/linux/linux/virtio-demo-can-devices.cfg +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_CAN_DEV=m -CONFIG_CAN_CALC_BITTIMING=y -CONFIG_CAN_SJA1000=y -CONFIG_PCI=y -CONFIG_CAN_KVASER_PCI=m diff --git a/recipes-kernel/linux/linux_agldemo.inc b/recipes-kernel/linux/linux_agldemo.inc index 7274364ce..1126c7673 100644 --- a/recipes-kernel/linux/linux_agldemo.inc +++ b/recipes-kernel/linux/linux_agldemo.inc @@ -40,7 +40,9 @@ AGL_KCONFIG_FRAGMENTS_DEMO:append:qemuarm64 = " most_deps.cfg" # We don't want most of the above for the virtio guest kernels, # use an explicit list AGL_KCONFIG_FRAGMENTS_DEMO:virtio-all = " \ - virtio-demo-can-devices.cfg \ + kvm-demo-can-devices.cfg \ + kvm-demo-usb.cfg \ + usbaudio.cfg \ hid.cfg \ " -- cgit 1.2.3-korg