From f7d010dfa4cb825096267528e131a9e2735d7505 Mon Sep 17 00:00:00 2001
From: SimonLi <likailong@huawei.com>
Date: Mon, 27 Sep 2021 14:43:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(mtd):=20=E5=8E=BB=E9=99=A4mtd=E5=AF=B9hisil?=
 =?UTF-8?q?icon=E9=A9=B1=E5=8A=A8=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【背景】
1. liteos-a内核drivers/mtd/multi_partition/用到了device/hisilicon下的驱动函数实
现，这样导致三方芯片适配时，会依赖hisilicon的驱动。
2. HDF的mtd驱动提供了这几个函数的实现，但是未暴露头文件出来。

【修改方案】
1. 修改BUILD.gn去除/device/hisilicon的依赖。
2. 修改mtd_partition.c，将hisilicon的头文件改为hdf的头文件依赖。

【遗留问题】
liteos-a内核与HDF mtd驱动的分界线还不明确，导致依赖关系不清楚

close: #I49FKL

Signed-off-by: SimonLi <likailong@huawei.com>
---
 drivers/mtd/multi_partition/BUILD.gn            | 5 +----
 drivers/mtd/multi_partition/Makefile            | 3 +--
 drivers/mtd/multi_partition/src/mtd_partition.c | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/multi_partition/BUILD.gn b/drivers/mtd/multi_partition/BUILD.gn
index 625a89d5..5278330a 100644
--- a/drivers/mtd/multi_partition/BUILD.gn
+++ b/drivers/mtd/multi_partition/BUILD.gn
@@ -37,10 +37,7 @@ kernel_module(module_name) {
     "src/mtd_shellcmd.c",
   ]
 
-  include_dirs = [
-    "$LITEOSTOPDIR/fs/jffs2/include",
-    "//device/hisilicon/drivers/include/mtd/common/include",
-  ]
+  include_dirs = [ "$LITEOSTOPDIR/fs/jffs2/include" ]
 
   if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) {
     include_dirs += [ "//device/qemu/drivers/cfiflash" ]
diff --git a/drivers/mtd/multi_partition/Makefile b/drivers/mtd/multi_partition/Makefile
index ff995946..76f8973f 100644
--- a/drivers/mtd/multi_partition/Makefile
+++ b/drivers/mtd/multi_partition/Makefile
@@ -34,8 +34,7 @@ MODULE_NAME := $(notdir $(shell pwd))
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := \
-    -I $(LITEOSTOPDIR)/fs/jffs2/include \
-    -I $(LITEOSTOPDIR)/../../device/hisilicon/drivers/include/mtd/common/include
+    -I $(LITEOSTOPDIR)/fs/jffs2/include
 
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
diff --git a/drivers/mtd/multi_partition/src/mtd_partition.c b/drivers/mtd/multi_partition/src/mtd_partition.c
index 9a92fcd1..62ff09ed 100644
--- a/drivers/mtd/multi_partition/src/mtd_partition.c
+++ b/drivers/mtd/multi_partition/src/mtd_partition.c
@@ -37,7 +37,7 @@
 #include "los_config.h"
 #include "los_mux.h"
 #include "fs/driver.h"
-#include "mtd_common.h"
+#include "mtd/mtd_legacy_lite.h"
 
 #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
 #include "cfiflash.h"
-- 
GitLab