reshuffle files for clarity

au-ts · Jan 18, 2024 · da627c3 · da627c3
1 parent 95e03a1
commit da627c3
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 10 deletions.
diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile
@@ -63,18 +63,17 @@ CURRENT_DIR := $(shell pwd)
 
 # BLK_DRIVER_VM_DIR := board/$(BOARD)/blk_driver_vm
 # BLK_DRIVER_VM_DTS_DIR := $(BLK_DRIVER_VM_DIR)/dts
-# BLK_DRIVER_VM_USERLEVEL_DIR := userlevel/blk_driver_vm
+# BLK_DRIVER_VM_USERLEVEL_DIR := $(BLK_DRIVER_VM_DIR)/userlevel
 # BLK_DRIVER_VM_ROOTFS_TMP_DIR := $(BUILD_DIR)/blk_driver_vm_rootfs
 
-CLIENT_VM_DIR := board/$(BOARD)/client_vm
-CLIENT_VM_USERLEVEL_DIR := userlevel/client_vm
-CLIENT_VM_1_DIR := $(CLIENT_VM_DIR)/client_vm_1
+CLIENT_VM_1_DIR := board/$(BOARD)/client_vm_1
 CLIENT_VM_1_DTS_DIR := $(CLIENT_VM_1_DIR)/dts
-CLIENT_VM_1_USERLEVEL_DIR := $(CLIENT_VM_USERLEVEL_DIR)/client_vm_1
+CLIENT_VM_1_USERLEVEL_DIR := $(CLIENT_VM_1_DIR)/userlevel
 CLIENT_VM_1_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_1_rootfs
-CLIENT_VM_2_DIR := $(CLIENT_VM_DIR)/client_vm_2
+
+CLIENT_VM_2_DIR := board/$(BOARD)/client_vm_2
 CLIENT_VM_2_DTS_DIR := $(CLIENT_VM_2_DIR)/dts
-CLIENT_VM_2_USERLEVEL_DIR := $(CLIENT_VM_USERLEVEL_DIR)/client_vm_2
+CLIENT_VM_2_USERLEVEL_DIR := $(CLIENT_VM_2_DIR)/userlevel
 CLIENT_VM_2_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_2_rootfs
 
 # BLK_DRIVER_VM_LINUX := $(BLK_DRIVER_VM_DIR)/linux
@@ -237,7 +236,7 @@ client_vm_2_userlevel: $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_ELFS))
 	(cd $(CLIENT_VM_2_ROOTFS_TMP_DIR) && find . | cpio -o -H newc -R root:root 2> /dev/null | gzip > $(CURRENT_DIR)/$(CLIENT_VM_2_INITRD_OVERLAYED))
 
 # $(BLK_DRIVER_VM_DTB): $(BLK_DRIVER_VM_BASE_DTS) $(BLK_DRIVER_VM_DTS_OVERLAYS)
-# 	sh ../../scripts/dtscat $^ > $(BUILD_DIR)/blk_driver_vm.dts
+# 	sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/blk_driver_vm.dts
 # 	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/blk_driver_vm.dts > $@
 
 # $(BUILD_DIR)/blk_driver_images.o: $(VMM_TOOLS)/package_guest_images.S $(BLK_DRIVER_VM_LINUX) $(BLK_DRIVER_VM_DTB) $(BLK_DRIVER_VM_INITRD_OVERLAYED)
@@ -249,11 +248,11 @@ client_vm_2_userlevel: $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_ELFS))
 # 					$< -o $@
 
 $(CLIENT_VM_1_DTB): $(CLIENT_VM_1_BASE_DTS) $(CLIENT_VM_1_DTS_OVERLAYS)
-	sh ../../scripts/dtscat $^ > $(BUILD_DIR)/client_vm_1.dts
+	sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_1.dts
 	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_1.dts > $@
 
 $(CLIENT_VM_2_DTB): $(CLIENT_VM_2_BASE_DTS) $(CLIENT_VM_2_DTS_OVERLAYS)
-	sh ../../scripts/dtscat $^ > $(BUILD_DIR)/client_vm_2.dts
+	sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_2.dts
 	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_2.dts > $@
 
 $(BUILD_DIR)/client_images_1.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_VM_1_LINUX) $(CLIENT_VM_1_DTB) $(CLIENT_VM_1_INITRD_OVERLAYED)

diff --git a/...irtio/userlevel/blk_driver_vm/cmdq_test.c → ..._virt/blk_driver_vm/userlevel/cmdq_test.c b/...irtio/userlevel/blk_driver_vm/cmdq_test.c → ..._virt/blk_driver_vm/userlevel/cmdq_test.c
diff --git a/...rt/client_vm/client_vm_1/buildroot_config → ...emu_arm_virt/client_vm_1/buildroot_config b/...rt/client_vm/client_vm_1/buildroot_config → ...emu_arm_virt/client_vm_1/buildroot_config
diff --git a/...m_virt/client_vm/client_vm_1/dts/init.dts → ...rd/qemu_arm_virt/client_vm_1/dts/init.dts b/...m_virt/client_vm/client_vm_1/dts/init.dts → ...rd/qemu_arm_virt/client_vm_1/dts/init.dts
diff --git a/..._virt/client_vm/client_vm_1/dts/linux.dts → ...d/qemu_arm_virt/client_vm_1/dts/linux.dts b/..._virt/client_vm/client_vm_1/dts/linux.dts → ...d/qemu_arm_virt/client_vm_1/dts/linux.dts
diff --git a/...virt/client_vm/client_vm_1/dts/virtio.dts → .../qemu_arm_virt/client_vm_1/dts/virtio.dts b/...virt/client_vm/client_vm_1/dts/virtio.dts → .../qemu_arm_virt/client_vm_1/dts/virtio.dts
diff --git a/...qemu_arm_virt/client_vm/client_vm_1/linux → ...tio/board/qemu_arm_virt/client_vm_1/linux b/...qemu_arm_virt/client_vm/client_vm_1/linux → ...tio/board/qemu_arm_virt/client_vm_1/linux
diff --git a/...m_virt/client_vm/client_vm_1/linux_config → ...rd/qemu_arm_virt/client_vm_1/linux_config b/...m_virt/client_vm/client_vm_1/linux_config → ...rd/qemu_arm_virt/client_vm_1/linux_config
diff --git a/...virt/client_vm/client_vm_1/rootfs.cpio.gz → .../qemu_arm_virt/client_vm_1/rootfs.cpio.gz b/...virt/client_vm/client_vm_1/rootfs.cpio.gz → .../qemu_arm_virt/client_vm_1/rootfs.cpio.gz
diff --git a/...erlevel/client_vm/client_vm_1/cmdq_test.c → ...rm_virt/client_vm_1/userlevel/cmdq_test.c b/...erlevel/client_vm/client_vm_1/cmdq_test.c → ...rm_virt/client_vm_1/userlevel/cmdq_test.c
diff --git a/...serlevel/client_vm/client_vm_1/postmark.c → ...arm_virt/client_vm_1/userlevel/postmark.c b/...serlevel/client_vm/client_vm_1/postmark.c → ...arm_virt/client_vm_1/userlevel/postmark.c
diff --git a/...l/client_vm/client_vm_1/virtio_blk_test.c → ...t/client_vm_1/userlevel/virtio_blk_test.c b/...l/client_vm/client_vm_1/virtio_blk_test.c → ...t/client_vm_1/userlevel/virtio_blk_test.c
diff --git a/...rt/client_vm/client_vm_2/buildroot_config → ...emu_arm_virt/client_vm_2/buildroot_config b/...rt/client_vm/client_vm_2/buildroot_config → ...emu_arm_virt/client_vm_2/buildroot_config
diff --git a/...m_virt/client_vm/client_vm_2/dts/init.dts → ...rd/qemu_arm_virt/client_vm_2/dts/init.dts b/...m_virt/client_vm/client_vm_2/dts/init.dts → ...rd/qemu_arm_virt/client_vm_2/dts/init.dts
diff --git a/..._virt/client_vm/client_vm_2/dts/linux.dts → ...d/qemu_arm_virt/client_vm_2/dts/linux.dts b/..._virt/client_vm/client_vm_2/dts/linux.dts → ...d/qemu_arm_virt/client_vm_2/dts/linux.dts
diff --git a/...virt/client_vm/client_vm_2/dts/virtio.dts → .../qemu_arm_virt/client_vm_2/dts/virtio.dts b/...virt/client_vm/client_vm_2/dts/virtio.dts → .../qemu_arm_virt/client_vm_2/dts/virtio.dts
diff --git a/...qemu_arm_virt/client_vm/client_vm_2/linux → ...tio/board/qemu_arm_virt/client_vm_2/linux b/...qemu_arm_virt/client_vm/client_vm_2/linux → ...tio/board/qemu_arm_virt/client_vm_2/linux
diff --git a/...m_virt/client_vm/client_vm_2/linux_config → ...rd/qemu_arm_virt/client_vm_2/linux_config b/...m_virt/client_vm/client_vm_2/linux_config → ...rd/qemu_arm_virt/client_vm_2/linux_config
diff --git a/...virt/client_vm/client_vm_2/rootfs.cpio.gz → .../qemu_arm_virt/client_vm_2/rootfs.cpio.gz b/...virt/client_vm/client_vm_2/rootfs.cpio.gz → .../qemu_arm_virt/client_vm_2/rootfs.cpio.gz
diff --git a/...erlevel/client_vm/client_vm_2/cmdq_test.c → ...rm_virt/client_vm_2/userlevel/cmdq_test.c b/...erlevel/client_vm/client_vm_2/cmdq_test.c → ...rm_virt/client_vm_2/userlevel/cmdq_test.c
diff --git a/scripts/dtscat → tools/dtscat b/scripts/dtscat → tools/dtscat