diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc index 85659aa7..15bb4831 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-arm32.scc @@ -1,14 +1,13 @@ include features/input/input.scc include cfg/timer/no_hz.scc +include cfg/virtio.scc kconf hardware fvp-arm32/fvp-board.cfg kconf hardware fvp-arm32/fvp-features.cfg kconf hardware fvp/fvp-net.cfg kconf hardware fvp/fvp-rtc.cfg kconf hardware fvp/fvp-serial.cfg -kconf hardware fvp/fvp-virtio.cfg kconf hardware fvp/fvp-cfi.cfg kconf hardware fvp/fvp-drm.cfg kconf hardware fvp/fvp-timer.cfg -kconf hardware fvp/fvp-virtio.cfg kconf hardware fvp/fvp-watchdog.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc index 79e3a69a..80b85819 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc @@ -1,14 +1,13 @@ include features/input/input.scc include features/net/net.scc include cfg/timer/no_hz.scc +include cfg/virtio.scc kconf hardware fvp/fvp-board.cfg kconf hardware fvp/fvp-net.cfg kconf hardware fvp/fvp-rtc.cfg kconf hardware fvp/fvp-serial.cfg -kconf hardware fvp/fvp-virtio.cfg kconf hardware fvp/fvp-cfi.cfg kconf hardware fvp/fvp-drm.cfg kconf hardware fvp/fvp-timer.cfg -kconf hardware fvp/fvp-virtio.cfg kconf hardware fvp/fvp-watchdog.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-virtio.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-virtio.cfg deleted file mode 100644 index afc76a09..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-virtio.cfg +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_VIRTIO=y -CONFIG_VIRTIO_MMIO=y -CONFIG_BLOCK=y -CONFIG_VIRTIO_BLK=y