diff --git a/bsd/dev/usb/Makefile b/bsd/dev/usb/Makefile index f01ea12db1488c6163088e59442568c54347e6e7..2d465482ebb3c05ae3e8fde569b3cbebe2bd92f2 100644 --- a/bsd/dev/usb/Makefile +++ b/bsd/dev/usb/Makefile @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. include $(LITEOSTOPDIR)/config.mk -include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk +include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk MODULE_NAME := usb_base @@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c endif ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y) -LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/framework/model/input/driver \ - -I$(LITEOSTOPDIR)/../../drivers/framework/include/core \ - -I$(LITEOSTOPDIR)/../../drivers/framework/core/common/include/host \ - -I$(LITEOSTOPDIR)/../../drivers/framework/utils \ - -I$(LITEOSTOPDIR)/../../drivers/framework/osal \ - -I$(LITEOSTOPDIR)/../../drivers/framework/ability/sbuf/include \ - -I$(LITEOSTOPDIR)/../../drivers/framework/include/osal \ +LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/model/input/driver \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/core \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/core/common/include/host \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/utils \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/osal \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/ability/sbuf/include \ + -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/osal \ -I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev LOCAL_SRCS += $(INPUT_SRC)/uhid.c \ diff --git a/drivers/Kconfig b/drivers/Kconfig index c603f8a96afe168ba7c559caa6f8d25c88a990a7..5687c0455de01dffb9274ec55d8e760b26ff4abb 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -5,7 +5,7 @@ config DRIVERS Answer Y to enable LiteOS support driver. source "bsd/dev/usb/Kconfig" -source "../../drivers/adapter/khdf/liteos/Kconfig" +source "../../drivers/hdf_core/adapter/khdf/liteos/Kconfig" # Device driver Kconfig import source "$(DEVICE_PATH)/drivers/Kconfig" diff --git a/kernel/base/Makefile b/kernel/base/Makefile index 4753dda36ccda84c9de516e2e2ded7cb3a54443c..b757dfd56b7dee9e367b25b805cfdc9bf15309e7 100644 --- a/kernel/base/Makefile +++ b/kernel/base/Makefile @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. include $(LITEOSTOPDIR)/config.mk -include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk +include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk MODULE_NAME := $(notdir $(shell pwd)) diff --git a/liteos.gni b/liteos.gni index 1d69c31569ffd02019958958318a8ff679ceff82..5ec817f41287c45ebded234e090dec054f02a577 100644 --- a/liteos.gni +++ b/liteos.gni @@ -31,7 +31,7 @@ import("$root_out_dir/config.gni") LITEOSTOPDIR = "//kernel/liteos_a" LITEOSTHIRDPARTY = "//third_party" -HDFTOPDIR = "//drivers/adapter/khdf/liteos" +HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos" ARCH = "" if (defined(LOSCFG_ARCH_ARM_AARCH32)) { diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 47c2b0515111ef221d087a600d3d792e290201d3..d404f1378a7348d17cd180f35805d9876dbe43ed 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -355,7 +355,7 @@ endif LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos ################################## Driver Option Begin ################################# ifeq ($(LOSCFG_DRIVERS_HDF), y) -include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/hdf_lite.mk +include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/hdf_lite.mk endif ifeq ($(LOSCFG_DRIVERS_HIEVENT), y)