Add sddf zig build dependency

au-ts · May 22, 2024 · a13651f · a13651f
1 parent e07dbe5
commit a13651f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/dep/sddf b/dep/sddf
diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile
@@ -115,11 +115,12 @@ SDDF_BLK_UTIL := $(SDDF_DIR)/blk/util
 
 SDDF_SERIAL_COMPONENTS := $(SDDF_DIR)/serial/components
 
-SDDF_SERIAL_DRIVER_qemu_arm_virt := $(SDDF_DIR)/drivers/serial/arm
-SDDF_SERIAL_DRIVER_odroidc4 := $(SDDF_DIR)/drivers/serial/meson
-SDDF_SERIAL_DRIVER := ${SDDF_SERIAL_DRIVER_${BOARD}}
+SDDF_SERIAL_DRIVER_NAME_qemu_arm_virt := arm
+SDDF_SERIAL_DRIVER_NAME_odroidc4 := meson
+SDDF_SERIAL_DRIVER_NAME := $(SDDF_SERIAL_DRIVER_NAME_${BOARD})
+SDDF_SERIAL_DRIVER := $(SDDF_DIR)/drivers/serial/$(SDDF_SERIAL_DRIVER_NAME)
 
-ELFS := client_vmm_1.elf client_vmm_2.elf blk_driver_vmm.elf serial_virt_tx.elf serial_virt_rx.elf uart_driver.elf blk_virt.elf
+ELFS := client_1_vmm.elf client_2_vmm.elf blk_driver_vmm.elf serial_virt_tx.elf serial_virt_rx.elf driver_uart_$(SDDF_SERIAL_DRIVER_NAME).elf blk_virt.elf
 
 BLK_DRIVER_VM_USERLEVEL_qemu_arm_virt := uio_blk_driver
 BLK_DRIVER_VM_USERLEVEL_odroidc4 := uio_blk_driver
@@ -358,7 +359,7 @@ $(BUILD_DIR)/serial_virt_tx.elf: $(addprefix $(BUILD_DIR)/, $(SERIAL_VIRT_TX_OBJ
 $(BUILD_DIR)/serial_virt_rx.elf: $(addprefix $(BUILD_DIR)/, $(SERIAL_VIRT_RX_OBJS))
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
-$(BUILD_DIR)/uart_driver.elf: $(addprefix $(BUILD_DIR)/, $(SERIAL_DRIVER_OBJS))
+$(BUILD_DIR)/driver_uart_$(SDDF_SERIAL_DRIVER_NAME).elf: $(addprefix $(BUILD_DIR)/, $(SERIAL_DRIVER_OBJS))
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
 $(BUILD_DIR)/postmark: $(LINUX_BLK_DIR)/postmark.c

diff --git a/examples/virtio/board/odroidc4/virtio.system b/examples/virtio/board/odroidc4/virtio.system
@@ -146,7 +146,7 @@
 
     <!-- The driver for talking to the hardware serial device, in this case UART -->
     <protection_domain name="uart_driver" priority="100" pp="true">
-        <program_image path="uart_driver.elf" />
+        <program_image path="driver_uart_meson.elf" />
         <map mr="uart" vaddr="0x5_000_000" perms="rw" cached="false" setvar_vaddr="uart_base" />
         <!-- Data region -->
         <map mr="tx_data_driver" vaddr="0x2_200_000" perms="rw" cached="true" />

diff --git a/examples/virtio/board/qemu_arm_virt/virtio.system b/examples/virtio/board/qemu_arm_virt/virtio.system
@@ -145,7 +145,7 @@
 
     <!-- The driver for talking to the hardware serial device, in this case UART -->
     <protection_domain name="uart_driver" priority="100" pp="true">
-        <program_image path="uart_driver.elf" />
+        <program_image path="driver_uart_arm.elf" />
         <map mr="uart" vaddr="0x5_000_000" perms="rw" cached="false" setvar_vaddr="uart_base" />
         <!-- Data region -->
         <map mr="tx_data_driver" vaddr="0x2_200_000" perms="rw" cached="true" />