From 0403820b22aec103274717ca5a661308b7e379b5 Mon Sep 17 00:00:00 2001 From: Zbigniew Bodek Date: Wed, 23 Dec 2020 19:45:03 +0800 Subject: [PATCH] Change path to Qemu ARM platform's config and init Change "vendor" to "device" where the latest version of MR puts stuff related to Qemu ARM Virt. Signed-off-by: Zbigniew Bodek --- Makefile | 2 +- platform/bsp.mk | 4 ++-- tools/build/mk/los_config.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3e02ad56..b7f3d045 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 99889951..9deee827 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 a735842b..5839d3e5 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) -- GitLab