diff --git a/Makefile b/Makefile index 3e02ad560ab13b9bab6d981bb2e236a6439ff22e..b7f3d0453396309fe79cf61ed12bf98adb3b23e3 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ endif ifeq ($(findstring y, $(LOSCFG_PLATFORM_HI3518EV300)$(LOSCFG_PLATFORM_HI3516DV300)), y) VENDOR_BOARD_INCLUDE := $(LITEOSTOPDIR)/../../vendor/hisi/hi35xx/$(LITEOS_PLATFORM)/config/board else ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -VENDOR_BOARD_INCLUDE := $(LITEOSTOPDIR)/../../vendor/qemu/arm/$(LITEOS_PLATFORM)/config/board +VENDOR_BOARD_INCLUDE := $(LITEOSTOPDIR)/../../device/qemu/arm/$(LITEOS_PLATFORM)/config/board else $(error "No VENDOR_BOARD_INCLUDE defined") endif diff --git a/platform/bsp.mk b/platform/bsp.mk index 99889951c18851657b508c8994c36ebe3ed91bf6..9deee827301fb549693b17e91cfd7e7ebdac4fbe 100644 --- a/platform/bsp.mk +++ b/platform/bsp.mk @@ -89,9 +89,9 @@ ifeq ($(findstring y, $(LOSCFG_PLATFORM_HI3518EV300)$(LOSCFG_PLATFORM_HI3516DV30 PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../vendor/hisi/hi35xx/$(LITEOS_PLATFORM)/config/board/include PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../vendor/hisi/hi35xx/$(LITEOS_PLATFORM)/config/board/include/hisoc else ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) - PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../vendor/qemu/arm/$(LITEOS_PLATFORM)/config/board/include + PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/arm/$(LITEOS_PLATFORM)/config/board/include # TODO: remove hisoc dependency in the code to avoid using hisoc here - PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../vendor/qemu/arm/$(LITEOS_PLATFORM)/config/board/include/hisoc + PLATFORM_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/arm/$(LITEOS_PLATFORM)/config/board/include/hisoc endif # #-include $(LITEOSTOPDIR)/platform/bsp/board/$(LITEOS_PLATFORM)/board.mk diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index a735842ba22efa939c2c582ffe688ec8e4812485..5839d3e5403f3a5d6cfb186634b1400b6a1f4ab5 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -363,7 +363,7 @@ LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos ifeq ($(findstring y, $(LOSCFG_PLATFORM_HI3518EV300)$(LOSCFG_PLATFORM_HI3516DV300)), y) LITEOS_VENDOR_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../vendor/hisi/hi35xx/platform else ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -LITEOS_VENDOR_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../vendor/qemu/arm/platform +LITEOS_VENDOR_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../device/qemu/arm/platform endif ################################## Driver Option Begin ################################# ifeq ($(LOSCFG_DRIVERS_HDF), y)