Add check for CONFIG_VIRTIO_BLK in process_virtio_op. Don't enable virtio when coreboot enabled. --- src/virtio-blk.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/virtio-blk.c b/src/virtio-blk.c index 7f9b3d2..16d9ad8 100644 --- a/src/virtio-blk.c +++ b/src/virtio-blk.c @@ -68,6 +68,8 @@ virtio_blk_read(struct disk_op_s *op) int process_virtio_op(struct disk_op_s *op) { + if (! CONFIG_VIRTIO_BLK || CONFIG_COREBOOT) + return 0; switch (op->command) { case CMD_READ: return virtio_blk_read(op); @@ -162,7 +164,7 @@ void virtio_blk_setup(void) { ASSERT32FLAT(); - if (! CONFIG_VIRTIO_BLK) + if (! CONFIG_VIRTIO_BLK || CONFIG_COREBOOT) return;
dprintf(3, "init virtio-blk\n");