diff --git a/BUILD.gn b/BUILD.gn index 9cd2131e431f5379506db017b8b7549b20df0142..043b0c87d7d6a8fe5cb5b81d07fb1faa9feeee50 100644 --- a/BUILD.gn +++ b/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", diff --git a/bundle.json b/bundle.json index ace6fa5ca0da08a53c1a55d69140680f4515221f..1a70a9184226bfd5128d24d0c210e8d62c6c0a8b 100644 --- a/bundle.json +++ b/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 +} diff --git a/fs/BUILD.gn b/fs/BUILD.gn index 26b27df37799339a16b8f3e77d435fb154674f90..16bb77782d69f4dc627e18d651b974be41a6dcea 100644 --- a/fs/BUILD.gn +++ b/fs/BUILD.gn @@ -33,7 +33,6 @@ group("fs") { deps = [ "fat", "fat/virpart", - "jffs2", "nfs", "patchfs", "proc", diff --git a/fs/Kconfig b/fs/Kconfig index 13deaebe9a63de0220a372533ac2f659d3211dcc..032668fb167fadf3191b93bc5bb2079d2d743d45 100644 --- a/fs/Kconfig +++ b/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" diff --git a/fs/jffs2/BUILD.gn b/fs/jffs2/BUILD.gn index e90e0e2826de59bae1ed1e799920309f59b71998..283c9eb1194a976c135cc1ed6b4594b7783f8059 100644 --- a/fs/jffs2/BUILD.gn +++ b/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") diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile index 09c9fefd75f3ed58896fa3d5e2ffbc245fa40a46..38a6daac7a86c87b7f8eec1a107d3ebce8347c6a 100644 --- a/fs/jffs2/Makefile +++ b/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) diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 81c6fbb7af01c5f0ad8fee436b9aa1fe44eed3c3..6b0c689f4b1219501514d4ac3268280b96d93c41 100644 --- a/tools/build/mk/los_config.mk +++ b/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)