diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/Makefile index e53a14564..00581353f 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/Makefile @@ -1,4 +1,4 @@ -SRC_DIR := $(BOARD) rk-3568 +SRC_DIR := $(BOARD) usb include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/usb/Makefile index 73ea8fa3a..888b55863 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/usb/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/Makefile @@ -1,3 +1,3 @@ -SRC_DIR := components libusb +SRC_DIR := components include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/Makefile index d66f6dec2..be8aa893a 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/Makefile @@ -1,33 +1,17 @@ -include $(KERNEL_ROOT)/services/drivers/usb/components/usb.mk + +# usb_core = usbh_core.o -usb_class = usbh_hub.o \ - usbh_rndis.o \ - rndis_host.o +# libserial = $(KERNEL_ROOT)/services/app/libserial.o +# printf = $(KERNEL_ROOT)/services/app/printf.o +# libmem = $(KERNEL_ROOT)/services/app/libmem.o +# usyscall = $(KERNEL_ROOT)/services/app/usyscall.o +# arch_usyscall = $(KERNEL_ROOT)/services/app/arch_usyscall.o +# session = $(KERNEL_ROOT)/services/app/session.o +# libipc = $(KERNEL_ROOT)/services/app/libipc.o +# libsem = $(KERNEL_ROOT)/services/app/libsemaphore.o -usb_common = usb_common.o - -usb_core = usbh_core.o - -usb_osal = usb_osal.o - -usb_port = usb_hc_xhci.o - - -libserial = $(KERNEL_ROOT)/services/app/libserial.o -printf = $(KERNEL_ROOT)/services/app/printf.o -libmem = $(KERNEL_ROOT)/services/app/libmem.o -usyscall = $(KERNEL_ROOT)/services/app/usyscall.o -arch_usyscall = $(KERNEL_ROOT)/services/app/arch_usyscall.o -session = $(KERNEL_ROOT)/services/app/session.o -libipc = $(KERNEL_ROOT)/services/app/libipc.o -libsem = $(KERNEL_ROOT)/services/app/libsemaphore.o - - -SRC_DIR += common -SRC_DIR += class class/cdc class/hub class/wireless -SRC_DIR += core -SRC_DIR += osal -SRC_DIR += port port/xhci +SRC_DIR := core +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/Makefile new file mode 100644 index 000000000..6f0429a43 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/Makefile @@ -0,0 +1,11 @@ +include $(KERNEL_ROOT)/services/drivers/usb/components/usb.mk + +objs = usbh_core.o + +all: ${objs} + @echo "generate $^" + @mv $^ $(KERNEL_ROOT)/services/drivers/usb/components + +%.o: %.c + @echo "cc $^" + @${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/usbh_core.c b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/usbh_core.c index b36a10161..fe55b3de6 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/usbh_core.c +++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/core/usbh_core.c @@ -1 +1,7 @@ #include "usbh_core.h" +// #include "libserial.h" + +int main(){ +// printf("++++++++++++++++++"); + return 0; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/usb.mk b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/usb.mk index 20b0a3da9..a77bc089c 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/usb.mk +++ b/Ubiquitous/XiZi_AIoT/services/drivers/usb/components/usb.mk @@ -13,7 +13,7 @@ cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -c_useropts = -O2 +c_useropts = -O0 INC_DIR = -I$(KERNEL_ROOT)/services/drivers/usb/components \ @@ -33,3 +33,6 @@ INC_DIR = -I$(KERNEL_ROOT)/services/drivers/usb/components \ -I$(KERNEL_ROOT)/services/lib/usyscall \ -I$(KERNEL_ROOT)/services/boards/$(BOARD) \ -I$(KERNEL_ROOT)/services/app + + +# include $(KERNEL_ROOT)/compiler.mk