diff --git a/repos/dde_linux/lib/import/import-usb_arch_include.mk b/repos/dde_linux/lib/import/import-usb_arch_include.mk new file mode 100644 index 000000000..851563d1b --- /dev/null +++ b/repos/dde_linux/lib/import/import-usb_arch_include.mk @@ -0,0 +1,27 @@ +# architecture-dependent includes +ifeq ($(filter-out $(SPECS),x86),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86 + ifeq ($(filter-out $(SPECS),32bit),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_32 + endif # 32bit + ifeq ($(filter-out $(SPECS),64bit),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_64 + endif # 64bit +endif # x86 + +ifeq ($(filter-out $(SPECS),arm),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm + ifeq ($(filter-out $(SPECS),arm_v6),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v6 + endif # arm_v6 + ifeq ($(filter-out $(SPECS),arm_v7),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v7 + endif # arm_v7 +endif # arm + +ifeq ($(filter-out $(SPECS),arm_64),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_64 + ifeq ($(filter-out $(SPECS),arm_v8),) + ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v8 + endif # arm_v8 +endif # arm_64 diff --git a/repos/dde_linux/lib/import/import-usb_hid_include.mk b/repos/dde_linux/lib/import/import-usb_hid_include.mk index 75476a3be..84edf2e3c 100644 --- a/repos/dde_linux/lib/import/import-usb_hid_include.mk +++ b/repos/dde_linux/lib/import/import-usb_hid_include.mk @@ -1,26 +1,6 @@ USB_HID_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_hid -# architecture-dependent includes -ifeq ($(filter-out $(SPECS),x86),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86 - ifeq ($(filter-out $(SPECS),32bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_32 - endif # 32bit - ifeq ($(filter-out $(SPECS),64bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_64 - endif # 64bit -endif # x86 - -ifeq ($(filter-out $(SPECS),arm),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm - ifeq ($(filter-out $(SPECS),arm_v6),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v6 - endif # arm_v6 - ifeq ($(filter-out $(SPECS),arm_v7),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v7 - endif # arm_v7 -endif # arm - +include $(call select_from_repositories,lib/import/import-usb_arch_include.mk) # # The order of include-search directories is important, we need to look into diff --git a/repos/dde_linux/lib/import/import-usb_host_include.mk b/repos/dde_linux/lib/import/import-usb_host_include.mk index f9ab34188..a1686ef75 100644 --- a/repos/dde_linux/lib/import/import-usb_host_include.mk +++ b/repos/dde_linux/lib/import/import-usb_host_include.mk @@ -1,26 +1,6 @@ USB_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_host -# architecture-dependent includes -ifeq ($(filter-out $(SPECS),x86),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86 - ifeq ($(filter-out $(SPECS),32bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_32 - endif # 32bit - ifeq ($(filter-out $(SPECS),64bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_64 - endif # 64bit -endif # x86 - -ifeq ($(filter-out $(SPECS),arm),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm - ifeq ($(filter-out $(SPECS),arm_v6),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v6 - endif # arm_v6 - ifeq ($(filter-out $(SPECS),arm_v7),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v7 - endif # arm_v7 -endif # arm - +include $(call select_from_repositories,lib/import/import-usb_arch_include.mk) # # The order of include-search directories is important, we need to look into diff --git a/repos/dde_linux/lib/import/import-usb_include.mk b/repos/dde_linux/lib/import/import-usb_include.mk index bad980972..ca354c063 100644 --- a/repos/dde_linux/lib/import/import-usb_include.mk +++ b/repos/dde_linux/lib/import/import-usb_include.mk @@ -3,27 +3,7 @@ USB_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/usb LIB_DIR := $(REP_DIR)/src/drivers/usb LIB_INC_DIR := $(LIB_DIR)/include -# architecture-dependent includes -ifeq ($(filter-out $(SPECS),x86),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86 - ifeq ($(filter-out $(SPECS),32bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_32 - endif # 32bit - ifeq ($(filter-out $(SPECS),64bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_64 - endif # 64bit -endif # x86 - -ifeq ($(filter-out $(SPECS),arm),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm - ifeq ($(filter-out $(SPECS),arm_v6),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v6 - endif # arm_v6 - ifeq ($(filter-out $(SPECS),arm_v7),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v7 - endif # arm_v7 -endif # arm - +include $(call select_from_repositories,lib/import/import-usb_arch_include.mk) # # The order of include-search directories is important, we need to look into diff --git a/repos/dde_linux/lib/import/import-usb_net_include.mk b/repos/dde_linux/lib/import/import-usb_net_include.mk index 79e6fb4c9..a40775d00 100644 --- a/repos/dde_linux/lib/import/import-usb_net_include.mk +++ b/repos/dde_linux/lib/import/import-usb_net_include.mk @@ -1,26 +1,6 @@ USB_NET_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_net -# architecture-dependent includes -ifeq ($(filter-out $(SPECS),x86),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86 - ifeq ($(filter-out $(SPECS),32bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_32 - endif # 32bit - ifeq ($(filter-out $(SPECS),64bit),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/x86_64 - endif # 64bit -endif # x86 - -ifeq ($(filter-out $(SPECS),arm),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm - ifeq ($(filter-out $(SPECS),arm_v6),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v6 - endif # arm_v6 - ifeq ($(filter-out $(SPECS),arm_v7),) - ARCH_SRC_INC_DIR += $(REP_DIR)/src/include/spec/arm_v7 - endif # arm_v7 -endif # arm - +include $(call select_from_repositories,lib/import/import-usb_arch_include.mk) # # The order of include-search directories is important, we need to look into diff --git a/repos/dde_linux/recipes/src/usb_drv/content.mk b/repos/dde_linux/recipes/src/usb_drv/content.mk index a3cd1259d..9be6e28b4 100644 --- a/repos/dde_linux/recipes/src/usb_drv/content.mk +++ b/repos/dde_linux/recipes/src/usb_drv/content.mk @@ -1,4 +1,5 @@ LIB_MK := lib/import/import-usb_include.mk lib/mk/usb_include.mk lib/mk/rpi_usb.mk \ + lib/import/import-usb_arch_include.mk \ $(foreach SPEC,x86_32 x86_64 arm,lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk) PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)