diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2010-05-23 10:19:03 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2010-05-23 10:19:03 -0400 |
| commit | 2515a72267612bd644cadd9ef481230065dd2d2a (patch) | |
| tree | c8c1ee368112d7acabeec2d1b90bbbeef7d06771 | |
| parent | c4fe135074cc48e7215e6eed04b4ae958c412ee4 (diff) | |
| download | seabios-2515a72267612bd644cadd9ef481230065dd2d2a.tar.gz | |
Make sure virtio-blk is fully compiled out if not wanted.
Add check for CONFIG_VIRTIO_BLK in process_virtio_op.
Don't enable virtio when coreboot enabled.
| -rw-r--r-- | 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 7f9b3d2f..16d9ad86 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"); |