From 72ceb7fd2689f853293c36386d33db716c41c6fd Mon Sep 17 00:00:00 2001
From: songyanguang <345810377@qq.com>
Date: Tue, 20 Aug 2024 09:35:11 +0800
Subject: [PATCH] Compile usb_driver_service into fs.img.

---
 Ubiquitous/XiZi_AIoT/services/app/Makefile                     | 2 +-
 Ubiquitous/XiZi_AIoT/services/drivers/usb/usb_service/Makefile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile
index 2b5808fe6..98ee6c136 100644
--- a/Ubiquitous/XiZi_AIoT/services/app/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile
@@ -45,7 +45,7 @@ INC_DIR = 	-I$(KERNEL_ROOT)/services/shell/letter-shell \
 ifeq ($(BOARD), imx6q-sabrelite)
 all: test_fault simple_client simple_server shell fs_server semaphore_server test_semaphore test_ipc_null test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server test_net lwip  readme.txt | bin
 else 
-all: test_fault simple_client simple_server shell fs_server semaphore_server test_ipc_null test_thread test_semaphore test_net lwip readme.txt eth_hal | bin
+all: test_fault simple_client simple_server shell fs_server semaphore_server test_ipc_null test_thread test_semaphore test_net lwip readme.txt eth_hal usb_driver_service | bin
 endif
 	../tools/mkfs/mkfs ./fs.img $^
 	@mv $(filter-out readme.txt, $^) bin
diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/usb_service/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/usb/usb_service/Makefile
index dac4fd694..ca7596a97 100644
--- a/Ubiquitous/XiZi_AIoT/services/drivers/usb/usb_service/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/usb_service/Makefile
@@ -25,6 +25,8 @@ usb_driver_service: ${objs}
 	@echo "generate $^"
 	@${ld} ${user_ldflags} -e main -o $@ $^ ${usb_components} ${libserial} ${printf} ${libmem} ${usyscall} ${arch_usyscall} ${session} ${libipc} ${libsem} ${board_specs}
 	@${objdump} -S $@ > $@.asm
+	@mv $@ $(KERNEL_ROOT)/services/app
+	@mv $@.asm $(KERNEL_ROOT)/services/app
 
 %.o: %.c
 	@echo "cc $^"