examples/virtio: move make includes after LIBS

Some snippets require LIBS to be defined such as sddf's network_components.mk. Without this, we get linking errors as microkit is not linked. Signed-off-by: Alex Brown <[email protected]>
au-ts · Jul 22, 2024 · 7b62f46 · 7b62f46
1 parent c865e12
commit 7b62f46
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/examples/virtio/virtio.mk b/examples/virtio/virtio.mk
@@ -22,18 +22,6 @@ BLK_DRIVER_VM_USERLEVEL_INIT := blk_driver_init
 
 vpath %.c $(SDDF) $(LIBVMM) $(VIRTIO_EXAMPLE) $(NETWORK_COMPONENTS)
 
-include $(SDDF)/util/util.mk
-include $(UART_DRIVER)/uart_driver.mk
-include $(SERIAL_COMPONENTS)/serial_components.mk
-include $(BLK_COMPONENTS)/blk_components.mk
-include $(LIBVMM)/vmm.mk
-include $(VMM_TOOLS)/linux/uio/uio.mk
-include $(VMM_TOOLS)/linux/blk/blk_init.mk
-include $(VMM_TOOLS)/linux/uio_drivers/blk/uio_blk.mk
-
-IMAGES := client_vmm.elf blk_driver_vmm.elf \
-	$(SERIAL_IMAGES) $(BLK_IMAGES) uart_driver.elf
-
 CFLAGS := \
 	  -mstrict-align \
 	  -ffreestanding \
@@ -63,6 +51,18 @@ CFLAGS_USERLEVEL := \
 LDFLAGS := -L$(BOARD_DIR)/lib
 LIBS := --start-group -lmicrokit -Tmicrokit.ld libsddf_util_debug.a libvmm.a --end-group
 
+include $(SDDF)/util/util.mk
+include $(UART_DRIVER)/uart_driver.mk
+include $(SERIAL_COMPONENTS)/serial_components.mk
+include $(BLK_COMPONENTS)/blk_components.mk
+include $(LIBVMM)/vmm.mk
+include $(VMM_TOOLS)/linux/uio/uio.mk
+include $(VMM_TOOLS)/linux/blk/blk_init.mk
+include $(VMM_TOOLS)/linux/uio_drivers/blk/uio_blk.mk
+
+IMAGES := client_vmm.elf blk_driver_vmm.elf \
+	$(SERIAL_IMAGES) $(BLK_IMAGES) uart_driver.elf
+
 CHECK_FLAGS_BOARD_MD5:=.board_cflags-$(shell echo -- $(CFLAGS) $(BOARD) $(MICROKIT_CONFIG) | shasum | sed 's/ *-//')
 
 $(CHECK_FLAGS_BOARD_MD5):