diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile index 9577d6306..9b059aa8e 100644 --- a/examples/virtio/Makefile +++ b/examples/virtio/Makefile @@ -119,6 +119,7 @@ CFLAGS := -mstrict-align \ -I$(SDDF_SERIAL_RINGBUFFER)/include \ -I$(SDDF_SERIAL_DRIVER)/include \ -I$(SDDF) \ + -I$(SDDF)/include \ -DBOARD_$(BOARD) \ -DCONFIG_$(CONFIG) \ -target aarch64-none-elf @@ -173,7 +174,7 @@ $(BUILD_DIR)/%.o: $(VMM_SRC_DIR)/virtio/%.c Makefile $(CC) -c $(CFLAGS) $< -o $@ $(BUILD_DIR)/%.o: $(SDDF_SERIAL_COMPONENTS)/%.c Makefile - $(CC) -c $(CFLAGS) -DNUM_CLIENTS=2 -DTRANSFER_WITH_COLOUR=1 $< -o $@ + $(CC) -c $(CFLAGS) -DSERIAL_NUM_CLIENTS=2 -DSERIAL_TRANSFER_WITH_COLOUR=1 $< -o $@ $(BUILD_DIR)/%.o: $(SDDF_SERIAL_RINGBUFFER)/%.c Makefile $(CC) -c $(CFLAGS) $< -o $@ diff --git a/examples/virtio/vmm.c b/examples/virtio/vmm.c index 22e675f4b..953bb3368 100644 --- a/examples/virtio/vmm.c +++ b/examples/virtio/vmm.c @@ -16,7 +16,7 @@ #include "vcpu.h" #include "virtio/virtio.h" #include "virtio/console.h" -#include "serial/libserialsharedringbuffer/include/shared_ringbuffer.h" +#include /* * As this is just an example, for simplicity we just make the size of the diff --git a/src/virtio/mmio.h b/src/virtio/mmio.h index a3231ec05..c95341906 100644 --- a/src/virtio/mmio.h +++ b/src/virtio/mmio.h @@ -8,7 +8,7 @@ #include #include "util/util.h" #include "virtio/virtq.h" -#include "serial/libserialsharedringbuffer/include/shared_ringbuffer.h" +#include // table 4.1 #define VIRTIO_MMIO_DEV_MAGIC 0x74726976 // "virt"