yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!634 fix(mtd): 去除mtd对hisilicon驱动的依赖 

Merge pull request !634 from SimonLi/master
This commit is contained in:
openharmony_ci 2021-09-29 06:07:44 +00:00 committed by Gitee
parent ee72b21aff f7d010dfa4
commit 9bf580b1f6
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mtd/multi_partition/BUILD.gn
View File

@ -37,10 +37,7 @@ kernel_module(module_name) {
"src/mtd_shellcmd.c", "src/mtd_shellcmd.c",
] ]
include_dirs = [ include_dirs = [ "$LITEOSTOPDIR/fs/jffs2/include" ]
"$LITEOSTOPDIR/fs/jffs2/include",
"//device/hisilicon/drivers/include/mtd/common/include",
]
if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) { if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) {
include_dirs += [ "//device/qemu/drivers/cfiflash" ] include_dirs += [ "//device/qemu/drivers/cfiflash" ]

3
drivers/mtd/multi_partition/Makefile
View File

@ -34,8 +34,7 @@ MODULE_NAME := $(notdir $(shell pwd))
LOCAL_SRCS := $(wildcard src/*.c) LOCAL_SRCS := $(wildcard src/*.c)
LOCAL_INCLUDE := \ LOCAL_INCLUDE := \
-I $(LITEOSTOPDIR)/fs/jffs2/include \ -I $(LITEOSTOPDIR)/fs/jffs2/include
-I $(LITEOSTOPDIR)/../../device/hisilicon/drivers/include/mtd/common/include
ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash

2
drivers/mtd/multi_partition/src/mtd_partition.c
View File

@ -37,7 +37,7 @@
#include "los_config.h" #include "los_config.h"
#include "los_mux.h" #include "los_mux.h"
#include "fs/driver.h" #include "fs/driver.h"
#include "mtd_common.h" #include "mtd/mtd_legacy_lite.h"
#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
#include "cfiflash.h" #include "cfiflash.h"