!877 LiteOS-A内核jffs2文件系统停止使用third_party下的Linux_Kernel

Merge pull request !877 from Far/master

BUILD.gn

@@ -75,7 +75,6 @@ generate_notice_file("kernel_notice_file") {
     "$LITEOSTHIRDPARTY/musl",
     "$LITEOSTHIRDPARTY/zlib",
     "$LITEOSTHIRDPARTY/FatFs",
-    "$LITEOSTHIRDPARTY/Linux_Kernel",
     "$LITEOSTHIRDPARTY/lwip",
     "$LITEOSTHIRDPARTY/NuttX",
     "$LITEOSTHIRDPARTY/mtd-utils",

bundle.json

@@ -43,7 +43,6 @@
                 "bounds_checking_function",
                 "toybox",
                 "NuttX",
-                "Linux_Kernel",
                 "FatFs",
                 "mksh",
                 "musl",
@@ -63,4 +62,4 @@
             "test": []
         }
     }
-}
\ No newline at end of file
+}

fs/BUILD.gn

@@ -33,7 +33,6 @@ group("fs") {
   deps = [
     "fat",
     "fat/virpart",
-    "jffs2",
     "nfs",
     "patchfs",
     "proc",

fs/Kconfig

@@ -4,7 +4,7 @@ source "fs/ramfs/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/nfs/Kconfig"
 source "fs/proc/Kconfig"
-source "fs/jffs2/Kconfig"
+#source "fs/jffs2/Kconfig"
 source "fs/rootfs/Kconfig"
 source "fs/patchfs/Kconfig"
-source "fs/zpfs/Kconfig"
\ No newline at end of file
+source "fs/zpfs/Kconfig"

fs/jffs2/BUILD.gn

@@ -28,7 +28,6 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/Linux_Kernel/Linux_Kernel.gni")
 
 module_switch = defined(LOSCFG_FS_JFFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/jffs2/Makefile

@@ -32,11 +32,11 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard src/*.c) \
-		$(wildcard $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2/*.c)
+		$(wildcard $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/jffs2/include \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2 \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2 \
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

tools/build/mk/los_config.mk

@@ -306,8 +306,8 @@ endif
 
 
 ifeq ($(LOSCFG_FS_JFFS), y)
-    LITEOS_BASELIB  += -ljffs2
-    LIB_SUBDIRS     += fs/jffs2
+#    LITEOS_BASELIB  += -ljffs2
+#    LIB_SUBDIRS     += fs/jffs2
 endif
 
 ifeq ($(LOSCFG_PLATFORM_ROOTFS), y)