!469 -- 为hispark_taurus打开ADC模块编译宏

Merge pull request !469 from 王亚枫/OpenHarmony-2.3-Beta
feat: Open macro for ADC moudule
2021-07-27 14:26:11 +00:00 · 2021-07-27 21:39:27 +08:00
587 changed files with 10623 additions and 17721 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,9 @@ tags

 # Menuconfig temp files
 /config.h
-/.config
-/.config.old
+.config
+.config.old

 # Build temp files
+/platform/board.ld
 /out
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -28,361 +28,55 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import("//build/lite/config/component/lite_component.gni")
-
-declare_args() {
-  tee_enable = false
-  liteos_name = "OHOS_Image"
-  liteos_skip_make = false
-}
-
-cmd = "if [ -f $device_path/BUILD.gn ]; then echo true; else echo false; fi"
-HAVE_DEVICE_SDK = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
-
-LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h")
-
-tee = ""
-if (tee_enable) {
-  tee = "_tee"
-}
-
-declare_args() {
-  liteos_config_file = "${ohos_build_type}${tee}.config"
-}
-
-liteos_config_file = rebase_path(liteos_config_file, "", "$product_path/kernel_configs")
-print("liteos_config_file:", liteos_config_file)
-
-exec_script("//build/lite/run_shell_cmd.py",
-            [
-              "env" +
-              " CONFIG_=LOSCFG_" +
-              " KCONFIG_CONFIG_HEADER='y=true'" +
-              " KCONFIG_CONFIG=$liteos_config_file" +
-              " DEVICE_PATH=$device_path" +
-              " srctree=" + rebase_path(".") +
-              " genconfig" +
-              " --header-path $LITEOS_MENUCONFIG_H" +
-              " --file-list kconfig_files.txt" +
-              " --env-list kconfig_env.txt" +
-              " --config-out config.gni",
-            ], "", [ liteos_config_file ])
-
-import("liteos.gni")
-
-assert(ARCH != "", "ARCH not set!")
-assert(ARCH == arch, "ARCH not match! details: $ARCH != $arch")
-assert(tee_enable == defined(LOSCFG_TEE_ENABLE), "TEE switch not match!")
+import("//build/lite/config/subsystem/lite_subsystem.gni")

 generate_notice_file("kernel_notice_file") {
  module_name = "kernel"
  module_source_dir_list = [
-    "$LITEOSTHIRDPARTY/FreeBSD",
-    "$LITEOSTHIRDPARTY/musl",
-    "$LITEOSTHIRDPARTY/zlib",
-    "$LITEOSTHIRDPARTY/FatFs",
-    "$LITEOSTHIRDPARTY/Linux_Kernel",
-    "$LITEOSTHIRDPARTY/lwip",
-    "$LITEOSTHIRDPARTY/NuttX",
-    "$LITEOSTHIRDPARTY/mtd-utils",
+    "//third_party/FreeBSD",
+    "//third_party/musl",
+    "//third_party/zlib",
+    "//third_party/FatFs",
+    "//third_party/Linux_Kernel",
+    "//third_party/lwip",
+    "//third_party/NuttX",
+    "//third_party/mtd-utils",
  ]
 }

-liteos_arch_cflags = []
-if (defined(LOSCFG_ARCH_ARM)) {
-  mcpu = LOSCFG_ARCH_CPU
-  if (defined(LOSCFG_ARCH_ARM_AARCH64) && defined(LOSCFG_ARCH_FPU_DISABLE)) {
-    mcpu += "+nofp"
-  }
-  liteos_arch_cflags += [ "-mcpu=$mcpu" ]
-  if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
-    liteos_arch_cflags += [
-      "-mfloat-abi=softfp",
-      "-mfpu=$LOSCFG_ARCH_FPU",
+declare_args() {
+  enable_ohos_kernel_liteos_a_ext_build = true
+  LOSCFG_TEST_APPS = false
+  tee_enable = ""
+}
+
+lite_subsystem("kernel") {
+  subsystem_components = []
+
+  if (enable_ohos_kernel_liteos_a_ext_build == false) {
+    subsystem_components += [
+      "//kernel/liteos_a/kernel",
+      "//kernel/liteos_a/net",
+      "//kernel/liteos_a/lib",
+      "//kernel/liteos_a/compat",
+      "//kernel/liteos_a/fs",
+      "//kernel/liteos_a/arch:platform_cpu",
    ]
-  }
-}
-
-cc = "$ohos_current_cc_command " + string_join(" ", liteos_arch_cflags)
-if (ohos_build_compiler == "clang") {
-  cc += " --target=$target_triple"
-}
-
-config("arch_config") {
-  cflags = liteos_arch_cflags
-  asmflags = cflags
-  ldflags = cflags
-  if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
-    if (!defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-      cflags += ["-mthumb-interwork"]
+    if (LOSCFG_SHELL) {
+      subsystem_components += [ "//kernel/liteos_a/shell" ]
    }
-  }
-  if (defined(LOSCFG_THUMB)) {
-    cflags += [ "-mthumb" ]
-    if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-      cflags += [ "-mimplicit-it=thumb" ]
-    } else {
-      cflags += [ "-Wa,-mimplicit-it=thumb" ]
-    }
-  }
-}
-
-config("stdinc_config") {
-  std_include = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-file-name=include" ], "trim string")
-  cflags = [
-    "-isystem",
-    std_include,
-  ]
-  cflags += [ "-nostdinc" ]
-  asmflags = cflags
-}
-
-config("ssp_config") {
-  cflags = []
-  if (defined(LOSCFG_CC_STACKPROTECTOR_ALL)) {
-    cflags += [ "-fstack-protector-all" ]
-  } else if (defined(LOSCFG_CC_STACKPROTECTOR_STRONG)) {
-    cflags += [ "-fstack-protector-strong" ]
-  } else if (defined(LOSCFG_CC_STACKPROTECTOR)) {
-    cflags += [
-      "-fstack-protector",
-      "--param",
-      "ssp-buffer-size=4",
-    ]
  } else {
-    cflags += [ "-fno-stack-protector" ]
+    deps = [ ":make" ]
+    deps += [ "//kernel/liteos_a/testsuites/unittest:unittest" ]
  }
-  asmflags = cflags
-}
-
-config("optimize_config") {
-  cflags = []
-  if (defined(LOSCFG_COMPILE_DEBUG)) {
-    cflags += [
-      "-g",
-      "-gdwarf-2",
-    ]
-    optimization_cflag = "-O0"
-  }
-  if (defined(LOSCFG_COMPILE_OPTIMIZE)) {
-    optimization_cflag = "-O2"
-  }
-  if (defined(LOSCFG_COMPILE_OPTIMIZE_SIZE)) {
-    if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-      optimization_cflag = "-Oz"
-    } else {
-      optimization_cflag = "-Os"
-    }
-  }
-  if (defined(LOSCFG_COMPILE_LTO)) {
-    if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-      cflags += [ "-flto=thin" ]
-    } else {
-      cflags += [ "-flto" ]
-    }
-  }
-  cflags += [ optimization_cflag ]
-  asmflags = cflags
-}
-
-config("kconfig_config") {
-  cflags = [
-    "-imacros",
-    "$LITEOS_MENUCONFIG_H",
-  ]
-  asmflags = cflags
-}
-
-config("warn_config") {
-  cflags = [
-    "-Wall",
-    "-Werror",
-    "-Wpointer-arith",
-    "-Wstrict-prototypes",
-    "-Winvalid-pch",
-    "-Wno-address-of-packed-member",
-  ]
-  asmflags = cflags
-}
-
-config("dialect_config") {
-  cflags_c = [ "-std=c99" ]
-  cflags_cc = [ "-std=c++11" ]
-}
-
-config("misc_config") {
-  defines = [ "__LITEOS__" ]
-  if (!defined(LOSCFG_DEBUG_VERSION)) {
-    defines += [ "NDEBUG" ]
-  }
-
-  cflags = [
-    "-fno-pic",
-    "-fno-builtin",
-    "-fms-extensions",
-    "-fno-strict-aliasing",
-    "-fno-common",
-    "-fsigned-char",
-    "-ffunction-sections",
-    "-fdata-sections",
-    "-fno-exceptions",
-    "-fno-omit-frame-pointer",
-    "-fno-short-enums",
-    "-mno-unaligned-access",
-  ]
-
-  if (!defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    cflags += [ "-fno-aggressive-loop-optimizations" ]
-  }
-
-  asmflags = cflags
-}
-
-config("los_config") {
-  configs = [
-    ":arch_config",
-    ":kconfig_config",
-    ":stdinc_config",
-    ":dialect_config",
-    ":optimize_config",
-    ":ssp_config",
-    ":warn_config",
-    ":misc_config",
-  ]
-}
-
-executable("liteos") {
-  configs = [] # clear default configs
-  configs += [ ":arch_config" ]
-  configs += [ ":public" ]
-
-  ldflags = [
-    "-static",
-    "-nostdlib",
-    "-Wl,--gc-sections",
-    "-Wl,-Map=$liteos_name.map",
-    "-Wl,--no-eh-frame-hdr",
-  ]
-
-  libgcc = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-libgcc-file-name" ], "trim string")
-  libs = [ libgcc ]
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos_llvm.ld", root_build_dir) ]
-    inputs = [ "tools/build/liteos_llvm.ld" ]
-  } else {
-    ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos.ld", root_build_dir) ]
-    ldflags += [ "-Wl,-nostartfiles" ]
-    inputs = [ "tools/build/liteos.ld" ]
-  }
-
-  inputs += [ "$root_out_dir/board.ld" ]
-
-  output_dir = target_out_dir
-
-  deps = [
-    "platform:copy_board.ld",
-    ":modules",
-  ]
-}
-
-copy("copy_liteos") {
-  deps = [ ":liteos" ]
-  sources = [ "$target_out_dir/unstripped/bin/liteos" ]
-  outputs = [ "$root_out_dir/$liteos_name" ]
-}
-
-build_ext_component("build_kernel_image") {
-  deps = [ ":copy_liteos" ]
-  exec_path = rebase_path(root_out_dir)
-
-  objcopy = "${compile_prefix}objcopy$toolchain_cmd_suffix"
-  objdump = "${compile_prefix}objdump$toolchain_cmd_suffix"
-
-  command = "$objcopy -O binary $liteos_name $liteos_name.bin"
-  command += " && sh -c '$objdump -t $liteos_name | sort >$liteos_name.sym.sorted'"
-  command += " && sh -c '$objdump -d $liteos_name >$liteos_name.asm'"
-}
-
-config("public") {
-  configs = [
-    "arch:public",
-    "platform:public",
-    "kernel:public",
-    "compat:public",
-    "bsd:public",
-    "fs:public",
-    "drivers:public",
-    "security:public",
-    "net:public",
-    "shell:public",
-    "lib:public",
-  ]
-
-  configs += [
-    "$HDFTOPDIR:public",
-    "//drivers/liteos:public",
-  ]
-
-  if (HAVE_DEVICE_SDK) {
-    configs += [ "$device_path:public" ]
-  }
-}
-
-group("modules") {
-  deps = [
-    "arch",
-    "bsd",
-    "compat",
-    "drivers",
-    "fs",
-    "kernel",
-    "lib",
-    "net",
-    "platform",
-    "security",
-    "shell",
-    "syscall",
-  ]
-
-  deps += [
-    HDFTOPDIR,
-    "//drivers/liteos",
-  ]
-
-  if (HAVE_DEVICE_SDK) {
-    deps += [ device_path ]
-  }
-}
-
-group("apps") {
-  deps = [ "apps" ]
-}
-
-group("tests") {
-  deps = [ "testsuites" ]
-}
-
-group("kernel") {
-  deps = [ ":build_kernel_image" ]
-}
-
-group("liteos_a") {
-  deps = [
-    ":apps",
-    ":kernel",
-    ":tests",
-  ]
 }

 build_ext_component("make") {
  exec_path = rebase_path(".", root_build_dir)
-  outdir = rebase_path("$target_out_dir/${target_name}_out")
+  outdir = rebase_path(get_path_info(".", "out_dir"))
  sysroot_path = rebase_path(ohos_current_sysroot)
  arch_cflags = string_join(" ", target_arch_cflags)
-  command = "./build.sh \"$board_name\" \"$ohos_build_compiler\" \"$root_build_dir\" \"$ohos_build_type\" \"$tee_enable\""
-  command += " \"$device_company\" \"$product_path\" \"$outdir\" \"$ohos_version\" \"$sysroot_path\" \"$arch_cflags\""
-  command += " \"$device_path\" \"$compile_prefix\" \"$liteos_config_file\""
-  if (liteos_skip_make) {
-    print("build_ext_component \"$target_name\" skipped:", command)
-    command = "true"
-  }
+  command = "./build.sh ${board_name} ${ohos_build_compiler} ${root_build_dir} ${ohos_build_type} \"${tee_enable}\""
+  command += " \"${device_company}\" \"${product_path}\" $outdir \"${ohos_version}\" ${sysroot_path} \"${arch_cflags}\""
+  command += " \"${device_path}\""
 }
--- a/75
+++ b/75
@@ -26,64 +26,27 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+#
+#
+# For a description of the syntax of this configuration file,
+# see extra/config/Kconfig-language.txt
+#
 mainmenu "Huawei LiteOS Configuration"

 menu "Compiler"
 choice
-    prompt "Compiler type"
+    prompt "LiteOS_Compiler_Type"
    default COMPILER_CLANG_LLVM
    help
-      Choose compiler type.
+      Enable arm-himix100 or aarch64-himix100 or compiler.

-config COMPILER_GCC
-    bool "GCC"
-
-config CROSS_COMPILE
-    string "GCC cross-compile toolchain prefix"
-    depends on COMPILER_GCC
-    default "arm-linux-ohoseabi-" if ARCH_ARM_AARCH32
+config COMPILER_HIMIX_32
+    bool "arm-linux-ohoseabi"

 config COMPILER_CLANG_LLVM
-    bool "Clang"
-
-config LLVM_TARGET
-    string "Clang LLVM target"
-    depends on COMPILER_CLANG_LLVM
-    default "arm-liteos" if ARCH_ARM_AARCH32
+    bool "clang-llvm"

 endchoice
-
-config COMPILE_DEBUG
-    bool "Enable debug options"
-    default n
-    help
-      Answer Y to add -g option in compile command.
-
-config COMPILE_OPTIMIZE
-    bool "Enable code optimization options"
-    default y
-    help
-      Answer Y to add optimization options for efficient code.
-      The final binary size will be smaller and execute faster.
-      But the debugging experience may be worst somehow.
-
-config COMPILE_OPTIMIZE_SIZE
-    bool "Enable code size optimization options" if COMPILE_OPTIMIZE
-    default y
-    help
-      Answer Y to add optimization options for small code size.
-      The final binary size will be smaller.
-      But the compile time may be a bit longer.
-
-config COMPILE_LTO
-    bool "Enable link time optimization (LTO)" if COMPILE_OPTIMIZE_SIZE
-    default y
-    help
-      Answer Y to add lto options for more smaller code size.
-      The final binary size will be smaller.
-      But the compile time may be much longer.
-
 endmenu

 menu "Platform"
@@ -95,7 +58,7 @@ source "platform/Kconfig"
 source "arch/Kconfig"

 ######################### config options of rootfs #####################
-source "kernel/common/rootfs/Kconfig"
+source "kernel/common/Kconfig"
 ######################### config options of patchfs #####################
 source "kernel/common/patchfs/Kconfig"
 ######################### config options of blackbox #####################
@@ -130,7 +93,6 @@ source "fs/romfs/Kconfig"
 source "fs/nfs/Kconfig"
 source "fs/proc/Kconfig"
 source "fs/jffs2/Kconfig"
-source "fs/zpfs/Kconfig"
 config ENABLE_READ_BUFFER
    bool "Enable read buffer Option"
    default n
@@ -160,11 +122,11 @@ source "net/Kconfig"

 ######################## config options of debug ########################
 menu "Debug"
-config GDB
-    bool "Enable gdb functions"
+config COMPILE_DEBUG
+    bool "Enable GCC -g Option"
    default n
    help
-      Answer Y to enable gdb functions.
+      Answer Y to add -g option in gcc command. But the LiteOS size will be much larger.

 config PLATFORM_ADAPT
    bool "Enable Os_adapt"
@@ -201,7 +163,6 @@ config ENABLE_MAGICKEY
 config THUMB
    bool "Enable Thumb"
    default n
-    depends on ARCH_ARM
    help
      Answer Y to build thumb version.  This will make LiteOS smaller.

@@ -224,8 +185,8 @@ config DEBUG_VERSION
    default n
    help
      If you do not select this option that means you enable a release version for LiteOS.
-      It also means you do not want to use debug modules, like shell,telnet,tftp,nfs and
-      memory check, etc.
+      It also means you do not want to use debug modules, like shell,telnet,tftp,
+      ,nfs,ramfs proc and memory check.
      If you select this option that means you enable a debug version for LiteOS.
      That means you want a opposite behaviour compared to release version.

@@ -334,13 +295,13 @@ source "bsd/dev/usb/Kconfig"
 source "../../drivers/adapter/khdf/liteos/Kconfig"

 # Device driver Kconfig import
-source "$(DEVICE_PATH)/drivers/Kconfig"
+osource "$(DEVICE_PATH)/Kconfig"
+osource "$(DEVICE_PATH)/config/Kconfig"

 source "drivers/char/mem/Kconfig"
 source "drivers/char/quickstart/Kconfig"
 source "drivers/char/random/Kconfig"
 source "drivers/char/video/Kconfig"
-source "drivers/char/trace/Kconfig"

 source "../../drivers/liteos/tzdriver/Kconfig"
 source "../../drivers/liteos/hievent/Kconfig"
--- a/267
+++ b/267
@@ -27,57 +27,39 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-LITEOSTOPDIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
+LITEOSTOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+export OS=$(shell uname -s)
+ifneq ($(OS), Linux)
+LITEOSTOPDIR := $(shell dirname $(subst \,/,$(LITEOSTOPDIR))/./)
+endif
+
+LITEOSTHIRDPARTY := $(LITEOSTOPDIR)/../../third_party
+
 export LITEOSTOPDIR
+export LITEOSTHIRDPARTY

+RM = -rm -rf
+MAKE = make
+__LIBS = libs
 APPS = apps
+ROOTFSDIR = rootfsdir
 ROOTFS = rootfs
+
 LITEOS_TARGET = liteos
-LITEOS_LIBS_TARGET = libs
-KCONFIG_CMDS := $(notdir $(wildcard $(dir $(shell which menuconfig))*config))
+LITEOS_LIBS_TARGET = libs_target
+LITEOS_PLATFORM_BASE = $(LITEOSTOPDIR)/platform

-ohos_kernel ?= liteos_a
-$(foreach line,$(shell hb env | sed 's/\[OHOS INFO\]/ohos/g;s/ /_/g;s/:_/=/g' || true),$(eval $(line)))
-ifneq ($(ohos_kernel),liteos_a)
-$(error The selected product ($(ohos_product)) is not a liteos_a kernel type product)
-endif
-
-ifeq ($(PRODUCT_PATH),)
-PRODUCT_PATH:=$(ohos_product_path)
-endif
-
-ifeq ($(DEVICE_PATH),)
-DEVICE_PATH:=$(ohos_device_path)
-endif
-
-ifeq ($(TEE:1=y),y)
-tee = _tee
-endif
-ifeq ($(RELEASE:1=y),y)
-CONFIG ?= $(PRODUCT_PATH)/kernel_configs/release$(tee).config
-else
-CONFIG ?= $(PRODUCT_PATH)/kernel_configs/debug$(tee).config
-endif
-
-KCONFIG_CONFIG ?= $(CONFIG)
-SYSROOT_PATH ?= $(OUT)/sysroot
-LITEOS_MENUCONFIG_H ?= $(LITEOSTOPDIR)/config.h
-LITEOS_CONFIG_FILE ?= $(LITEOSTOPDIR)/.config
-
-# export los_config.mk related environment variables
-export LITEOS_MENUCONFIG_H
-export LITEOS_CONFIG_FILE
-
-# export subdir Makefile related environment variables
-export SYSROOT_PATH
-export PRODUCT_PATH
-export DEVICE_PATH
-
-# export kconfig related environment variables
 export CONFIG_=LOSCFG_
-export srctree=$(LITEOSTOPDIR)
+ifeq ($(PRODUCT_PATH),)
+export PRODUCT_PATH=$(LITEOSTOPDIR)/../../device/hisilicon/drivers
+endif

-include $(LITEOSTOPDIR)/config.mk
+ifeq ($(shell which menuconfig),)
+$(shell pip install --user kconfiglib >/dev/null)
+endif
+$(shell env CONFIG_=$(CONFIG_) PRODUCT_PATH=$(PRODUCT_PATH) olddefconfig >/dev/null)
+
+-include $(LITEOSTOPDIR)/tools/build/config.mk

 ifeq ($(LOSCFG_STORAGE_SPINOR), y)
 FSTYPE = jffs2
@@ -93,118 +75,149 @@ FSTYPE = jffs2
 endif
 ROOTFS_DIR = $(OUT)/rootfs
 ROOTFS_ZIP = $(OUT)/rootfs.zip
+VERSION =

-define HELP =
-Usage: make [TARGET]... [PARAMETER=VALUE]...
+SYSROOT_PATH ?= $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot
+export SYSROOT_PATH

-Targets:
-    help:       display this help and exit
-    clean:      clean compiled objects
-    cleanall:   clean all build outputs
-    all:        make liteos kernel image and rootfs image (Default target)
-    $(APPS):       build all apps
-    $(ROOTFS):     make a original rootfs image
-    $(LITEOS_LIBS_TARGET):       compile all kernel modules (libraries)
-    $(LITEOS_TARGET):     make liteos kernel image
-    update_config:  update product kernel config (use menuconfig)
-    xxconfig:   invoke xxconfig command of kconfiglib (xxconfig is one of $(KCONFIG_CMDS))
-
-Parameters:
-    FSTYPE:     value should be one of (jffs2 vfat yaffs2)
-    TEE:        boolean value(1 or y for true), enable tee
-    RELEASE:    boolean value(1 or y for true), build release version
-    CONFIG:     kernel config file to be use
-    args:       arguments for xxconfig command
-endef
-export HELP
-
-all: $(LITEOS_TARGET) $(ROOTFS)
+all: $(OUT) $(BUILD) $(LITEOS_TARGET) $(APPS)
+lib: $(OUT) $(BUILD) $(LITEOS_LIBS_TARGET)

 help:
-	$(HIDE)echo "$$HELP"
+	$(HIDE)echo "-------------------------------------------------------"
+	$(HIDE)echo "1.====make help:    get help infomation of make"
+	$(HIDE)echo "2.====make:         make a debug version based the .config"
+	$(HIDE)echo "3.====make debug:   make a debug version based the .config"
+	$(HIDE)echo "4.====make release: make a release version for all platform"
+	$(HIDE)echo "5.====make release PLATFORM=xxx:  make a release version only for platform xxx"
+	$(HIDE)echo "6.====make rootfsdir: make a original rootfs dir"
+	$(HIDE)echo "7.====make rootfs FSTYPE=***: make a original rootfs img"
+	$(HIDE)echo "8.====make test: make the testsuits_app and put it into the rootfs dir"
+	$(HIDE)echo "9.====make test_apps FSTYPE=***: make a rootfs img with the testsuits_app in it"
+	$(HIDE)echo "xxx should be one of (hi3516cv300 hi3516ev200 hi3556av100/cortex-a53_aarch32 hi3559av100/cortex-a53_aarch64)"
+	$(HIDE)echo "*** should be one of (jffs2)"
+	$(HIDE)echo "-------------------------------------------------------"

+debug:
+	$(HIDE)echo "=============== make a debug version  ==============="
+	$(HIDE) $(MAKE) all
+
+release:
+ifneq ($(PLATFORM),)
+	$(HIDE)echo "=============== make a release version for platform $(PLATFORM) ==============="
+	$(HIDE)$(SCRIPTS_PATH)/mklibversion.sh $(PLATFORM)
+else
+	$(HIDE)echo "================make a release version for all platform ==============="
+	$(HIDE)$(SCRIPTS_PATH)/mklibversion.sh
+endif
+
+##### make sysroot #####
 sysroot:
-	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
 ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
-ifeq ($(origin SYSROOT_PATH),file)
-	$(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \
-	ln -snf $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/build/Makefile && \
-	$(MAKE) TARGETS=liteos_a_user \
-		ARCH=$(ARCH) \
-		TARGET=$(LOSCFG_LLVM_TARGET) \
-		ARCH_CFLAGS="$(LITEOS_CORE_COPTS) -w" \
-		TOPDIR="$(LITEOSTOPDIR)/../.." \
-		SYSROOTDIR="$(SYSROOT_PATH)" \
-		CLANG="$(LITEOS_COMPILER_PATH)clang" \
-		BUILD_ALL_MULTILIB=false \
-		BUILD_DEBUG=$(if $(patsubst y,,$(or $(RELEASE:1=y),n)),true,false)
+ifeq ($(wildcard $(SYSROOT_PATH)/usr/include/$(LLVM_TARGET)/),)
+	$(HIDE)$(MAKE) -C $(SYSROOT_PATH)/build TARGETS=liteos_a_user
 endif
+	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
 endif

-$(filter-out menuconfig,$(KCONFIG_CMDS)):
-	$(HIDE)$@ $(args)
+##### make dynload #####
+-include $(LITEOS_MK_PATH)/dynload.mk

-$(LITEOS_CONFIG_FILE): $(KCONFIG_CONFIG)
-	$(HIDE)env KCONFIG_CONFIG=$< genconfig --config-out $@ --header-path $(LITEOS_MENUCONFIG_H)
+#-----need move when make version-----#
+##### make lib #####
+$(__LIBS): $(OUT) $(CXX_INCLUDE)

-update_config menuconfig:
-	$(HIDE)test -f "$(CONFIG)" && cp -v "$(CONFIG)" .config && menuconfig $(args) && savedefconfig --out "$(CONFIG)"
+$(OUT): $(LITEOS_MENUCONFIG_H)
+	$(HIDE)mkdir -p $(OUT)/lib
+	$(HIDE)$(CC) -I$(LITEOSTOPDIR)/kernel/base/include -I$(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH) \
+		-I$(LITEOS_PLATFORM_BASE)/include -imacros $< -E $(LITEOS_PLATFORM_BASE)/board.ld.S \
+		-o $(LITEOS_PLATFORM_BASE)/board.ld -P

-$(LITEOS_LIBS_TARGET): sysroot
-	$(HIDE)for dir in $(LIB_SUBDIRS); do $(MAKE) -C $$dir all || exit 1; done
+$(BUILD):
+	$(HIDE)mkdir -p $(BUILD)

-$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET)
-$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).map
-#$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).objsize
-$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).bin
-$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).sym.sorted
-$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).asm
-#$(LITEOS_TARGET): $(OUT)/$(LITEOS_TARGET).size
+$(LITEOS_LIBS_TARGET): $(__LIBS) sysroot
+	$(HIDE)for dir in $(LIB_SUBDIRS); \
+		do $(MAKE) -C $$dir all || exit 1; \
+	done
+	$(HIDE)echo "=============== make lib done  ==============="

-$(OUT)/$(LITEOS_TARGET): $(LITEOS_LIBS_TARGET)
-	$(LD) $(LITEOS_LDFLAGS) $(LITEOS_TABLES_LDFLAGS) -Map=$@.map -o $@ --start-group $(LITEOS_LIBDEP) --end-group
-$(OUT)/$(LITEOS_TARGET).map: $(OUT)/$(LITEOS_TARGET)
-$(OUT)/$(LITEOS_TARGET).objsize: $(LITEOS_LIBS_TARGET)
-	$(SIZE) -t --common $(OUT)/lib/*.a >$@
-$(OUT)/$(LITEOS_TARGET).bin: $(OUT)/$(LITEOS_TARGET)
-	$(OBJCOPY) -O binary $< $@
-$(OUT)/$(LITEOS_TARGET).sym.sorted: $(OUT)/$(LITEOS_TARGET)
-	$(OBJDUMP) -t $< |sort >$@
-$(OUT)/$(LITEOS_TARGET).asm: $(OUT)/$(LITEOS_TARGET)
-	$(OBJDUMP) -d $< >$@
-$(OUT)/$(LITEOS_TARGET).size: $(OUT)/$(LITEOS_TARGET)
-	$(NM) -S --size-sort $< >$@
+##### make menuconfig #####
+menuconfig:
+	$(HIDE)menuconfig
+##### menuconfig end #######

-$(APPS): sysroot
+$(LITEOS_MENUCONFIG_H): .config
+	$(HIDE)genconfig
+
+$(LITEOS_TARGET): $(__LIBS) sysroot
+	$(HIDE)touch $(LOSCFG_ENTRY_SRC)
+
+	$(HIDE)for dir in $(LITEOS_SUBDIRS); \
+	do $(MAKE) -C $$dir all || exit 1; \
+	done
+
+	$(LD) $(LITEOS_LDFLAGS) $(LITEOS_TABLES_LDFLAGS) $(LITEOS_DYNLDFLAGS) -Map=$(OUT)/$@.map -o $(OUT)/$@ --start-group $(LITEOS_LIBDEP) --end-group
+#	$(SIZE) -t --common $(OUT)/lib/*.a >$(OUT)/$@.objsize
+	$(OBJCOPY) -O binary $(OUT)/$@ $(LITEOS_TARGET_DIR)/$@.bin
+	$(OBJDUMP) -t $(OUT)/$@ |sort >$(OUT)/$@.sym.sorted
+	$(OBJDUMP) -d $(OUT)/$@ >$(OUT)/$@.asm
+#	$(NM) -S --size-sort $(OUT)/$@ >$(OUT)/$@.size
+
+$(APPS): $(LITEOS_TARGET) sysroot
 	$(HIDE)$(MAKE) -C apps all

-$(ROOTFS): $(APPS)
+prepare:
 	$(HIDE)mkdir -p $(OUT)/musl
 ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
-	$(HIDE)cp -fp $$($(CC) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl
-	$(HIDE)cp -fp $$($(GPP) $(LITEOS_CXXFLAGS) -print-file-name=libc++.so) $(OUT)/musl
+	$(HIDE)cp -f $$($(CC) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl
+	$(HIDE)cp -f $$($(GPP) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CXXFLAGS) -print-file-name=libc++.so) $(OUT)/musl
 else
-	$(HIDE)cp -fp $$($(CC) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl
-	$(HIDE)cp -fp $$($(CC) $(LITEOS_CFLAGS) -print-file-name=libgcc_s.so.1) $(OUT)/musl
-	$(HIDE)cp -fp $$($(GPP) $(LITEOS_CXXFLAGS) -print-file-name=libstdc++.so.6) $(OUT)/musl
+	$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/target/usr/lib/libc.so $(OUT)/musl
+	$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libstdc++.so.6 $(OUT)/musl
+	$(HIDE)cp -f $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libgcc_s.so.1 $(OUT)/musl
+	$(STRIP) $(OUT)/musl/*
 endif
-	$(HIDE)$(LITEOS_SCRIPTPATH)/make_rootfs/rootfsdir.sh $(OUT) $(ROOTFS_DIR)
-	$(HIDE)shopt -s nullglob && $(STRIP) $(ROOTFS_DIR)/bin/* $(ROOTFS_DIR)/lib/*
+
+$(ROOTFSDIR): prepare $(APPS)
+	$(HIDE)$(MAKE) clean -C apps
+	$(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/rootfsdir.sh $(OUT) $(ROOTFS_DIR) $(LITEOS_TARGET_DIR)
 ifneq ($(VERSION),)
-	$(HIDE)$(LITEOS_SCRIPTPATH)/make_rootfs/releaseinfo.sh "$(VERSION)" $(ROOTFS_DIR)
+	$(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/releaseinfo.sh "$(VERSION)" $(ROOTFS_DIR) $(LITEOS_TARGET_DIR)
 endif
-	$(HIDE)$(LITEOS_SCRIPTPATH)/make_rootfs/rootfsimg.sh $(ROOTFS_DIR) $(FSTYPE)
+
+$(ROOTFS): $(ROOTFSDIR)
+	$(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/rootfsimg.sh $(ROOTFS_DIR) $(FSTYPE)
 	$(HIDE)cd $(ROOTFS_DIR)/.. && zip -r $(ROOTFS_ZIP) $(ROOTFS)

 clean:
-	$(HIDE)if [ -d $(SYSROOT_PATH)/build ]; then $(MAKE) -C $(SYSROOT_PATH)/build clean; fi
-	$(HIDE)for dir in $(LIB_SUBDIRS) apps; do $(MAKE) -C $$dir clean || exit 1; done
-	$(HIDE)$(RM) $(LITEOS_MENUCONFIG_H)
-	$(HIDE)echo "clean $(LOSCFG_PLATFORM) finish"
+	$(HIDE)for dir in $(LITEOS_SUBDIRS); \
+		do $(MAKE) -C $$dir clean|| exit 1; \
+	done
+	$(HIDE)$(MAKE) -C apps clean
+	$(HIDE)$(RM) $(__OBJS) $(LITEOS_TARGET) $(BUILD) $(LITEOS_MENUCONFIG_H) *.bak *~
+	$(HIDE)$(RM) include/config include/generated
+	$(HIDE)$(MAKE) cleanrootfs
+	$(HIDE)echo "clean $(LITEOS_PLATFORM) finish"

 cleanall: clean
-	$(HIDE)$(RM) $(LITEOSTOPDIR)/out $(LITEOS_CONFIG_FILE)
+	$(HIDE)$(RM) $(LITEOSTOPDIR)/out $(LITEOS_PLATFORM_BASE)/board.ld
 	$(HIDE)echo "clean all done"

-.PHONY: all clean cleanall sysroot help update_config
-.PHONY: $(LITEOS_TARGET) $(ROOTFS) $(APPS) $(KCONFIG_CMDS) $(LITEOS_LIBS_TARGET) $(KCONFIG_CONFIG)
+cleanrootfs:
+	$(HIDE)$(RM) $(OUT)/rootfs
+	$(HIDE)$(RM) $(OUT)/rootfs.zip
+	$(HIDE)$(RM) $(OUT)/rootfs.img
+
+update_all_config:
+	$(HIDE)shopt -s globstar && for f in tools/build/config/**/*.config ; \
+		do \
+			echo updating $$f; \
+			test -f $$f && cp $$f .config && olddefconfig && savedefconfig --out $$f; \
+		done
+
+update_config:
+	$(HIDE)test -f "$(CONFIG)" && cp "$(CONFIG)" .config && menuconfig && savedefconfig --out "$(CONFIG)"
+
+.PHONY: all lib clean cleanall $(LITEOS_TARGET) debug release help update_all_config update_config
+.PHONY: prepare sysroot cleanrootfs $(ROOTFS) $(ROOTFSDIR) $(APPS) menuconfig $(LITEOS_LIBS_TARGET) $(__LIBS) $(OUT)
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
-
-->
-
-<configuration>
-    <oatconfig>
-        <licensefile></licensefile>
-        <policylist>
-            <policy name="projectPolicy" desc="">
-                <policyitem type="copyright" name="Huawei Technologies Co., Ltd. All rights reserved." path=".*" desc="original liteos copyright"/>
-                <policyitem type="license" name="BSD-3-Clause" path=".*" desc="Liteos kernel use bsd3 license"/>
-            </policy>
-        </policylist>
-        <filefilterlist>
-            <filefilter name="defaultFilter" desc="文件属于FreeBSD仓库软连接，本仓库屏蔽告警，在FreeBSD仓库进行处理">
-                <filteritem type="filepath" name="bsd/.*" desc="文件属于FreeBSD仓库软连接，本仓库屏蔽告警，在FreeBSD仓库进行处理"/>
-                <filteritem type="filepath" name="kernel/extended" desc="文件属于Nuttx仓库软连接，本仓库屏蔽告警，在Nuttx仓库进行处理"/>
-                <filteritem type="filepath" name="fs/include/fs" desc="文件属于Nuttx仓库软连接，本仓库屏蔽告警，在Nuttx仓库进行处理"/>
-            </filefilter>
-            <filefilter name="defaultFilter" desc="Files not to check">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="licenseFileNamePolicyFilter" desc="Filters for LICENSE file policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="readmeFileNamePolicyFilter" desc="Filters for README file policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="readmeOpenSourcefileNamePolicyFilter" desc="Filters for README.OpenSource file policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-            <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
-                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
-                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
-            </filefilter>
-
-        </filefilterlist>
-        <licensematcherlist>
-            <!--licensematcher name="uvwxyz License" desc="If the scanning result is InvalidLicense, you can define matching rules here. Note that quotation marks must be escaped.">
-                <licensetext name="
-                    uvwxyz license textA xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                " desc=""/>
-                <licensetext name="
-                    uvwxyz license textB xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-                " desc=""/>
-            </licensematcher-->
-        </licensematcherlist>
-    </oatconfig>
-</configuration>
--- a/README.md
+++ b/README.md
@@ -67,27 +67,26 @@ The OpenHarmony LiteOS Cortex-A is a new-generation kernel developed based on th

 ## Usage<a name="section741617511812"></a>

-OpenHarmony LiteOS Cortex-A supports the  [Hi3518E V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-introduction-hi3518.md)  and  [Hi3516D V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-introduction-hi3516.md). You can develop and run your applications based on both development boards.
+OpenHarmony LiteOS Cortex-A supports the  [Hi3518E V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/introduction-to-the-hi3518-development-board.md)  and  [Hi3516D V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/introduction-to-the-hi3516-development-board.md). You can develop and run your applications based on both development boards.

 ### Preparations<a name="section1579912573329"></a>

 You need to set up the compilation environment on Linux.

-   [Compilation environment on Linux](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-env-setup-lin.md)
-   For Hi3518E V300, see  [Setting Up the Hi3518 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3518-setting.md).
-   For Hi3516D V300, see  [Setting Up the Hi3516 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3516-setting.md).
+-   For Hi3518E V300, see  [Setting Up the Hi3518 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/setting-up-the-hi3518-development-environment.md).
+-   For Hi3516D V300, see  [Setting Up the Hi3516 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/setting-up-the-hi3516-development-environment.md).

 ### Source Code Acquisition<a name="section11443189655"></a>

-Download and decompress a set of source code on a Linux server to acquire the  [source code](https://gitee.com/openharmony/docs/blob/master/en/device-dev/get-code/sourcecode-acquire.md).
+Download and decompress a set of source code on a Linux server to acquire the  [source code](https://repo.huaweicloud.com/harmonyos/os/1.0.1/code-1.0.1.tar.gz). For more acquisition methods, see  [Source Code Acquisition](https://gitee.com/openharmony/docs/blob/master/en/device-dev/get-code/source-code-acquisition.md).

 ### Compilation and Building<a name="section2081013992812"></a>

 For details about how to develop the first application, see:

-   [Developing the First Example Program Running on Hi3518](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3518-running.md)
+-   [Developing the First Example Program Running on Hi3518](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/developing-the-first-example-program-running-on-hi3518.md)

-   [Developing the First Example Program Running on Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3516-running.md)
+-   [Developing the First Example Program Running on Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/developing-the-first-example-program-running-on-hi3516.md)

 ## Repositories Involved<a name="section1371113476307"></a>

--- a/README_zh-HK.md
+++ b/README_zh-HK.md
@@ -68,27 +68,26 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代

 ## 使用說明<a name="section741617511812"></a>

-OpenHarmony LiteOS-A內核支持Hi3518EV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3518.md)）、Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3516.md)）單板，開發者可基於兩種單板開發運行自己的應用程序。
+OpenHarmony LiteOS-A內核支持Hi3518EV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3518%E5%BC%80%E5%8F%91%E6%9D%BF%E4%BB%8B%E7%BB%8D.md)）、Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3516%E5%BC%80%E5%8F%91%E6%9D%BF%E4%BB%8B%E7%BB%8D.md)）單板，開發者可基於兩種單板開發運行自己的應用程序。

 ### 準備<a name="section1579912573329"></a>

 開發者需要在Linux上搭建編譯環境：

- [Ubuntu編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md);
- Hi3518EV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-setting.md)；
- Hi3516DV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-setting.md)。
+- Hi3518EV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3516%E5%BC%80%E5%8F%91%E6%9D%BF%E4%BB%8B%E7%BB%8D.md)；
+- Hi3516DV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3516%E6%90%AD%E5%BB%BA%E7%8E%AF%E5%A2%83.md)。

 ### 獲取源碼<a name="section11443189655"></a>

-在Linux服務器上下載並解壓一套源代碼，源碼獲取方式參考[源碼獲取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/sourcecode-acquire.md)。
+在Linux服務器上下載並解壓一套源代碼，獲取源碼（[下載鏈結](https://repo.huaweicloud.com/harmonyos/os/1.0.1/code-1.0.1.tar.gz)）。更多源碼獲取方式，參考[源碼獲取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/%E6%BA%90%E7%A0%81%E8%8E%B7%E5%8F%96.md)。

 ### 編譯構建<a name="section2081013992812"></a>

 開發者開發第一個應用程序可參考：

- [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-running.md)；
+- [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/%E5%BC%80%E5%8F%91Hi3518%E7%AC%AC%E4%B8%80%E4%B8%AA%E7%A4%BA%E4%BE%8B%E7%A8%8B%E5%BA%8F.md)；

- [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)。
+- [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/%E5%BC%80%E5%8F%91Hi3516%E7%AC%AC%E4%B8%80%E4%B8%AA%E5%BA%94%E7%94%A8%E7%A8%8B%E5%BA%8F%E7%A4%BA%E4%BE%8B.md)。

 ## 相關倉<a name="section1371113476307"></a>

--- a/README_zh.md
+++ b/README_zh.md
@@ -67,27 +67,26 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代

 ## 使用说明<a name="section741617511812"></a>

-OpenHarmony LiteOS-A内核支持Hi3518EV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3518.md)）、Hi3516DV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3516.md)）单板，开发者可基于两种单板开发运行自己的应用程序。
+OpenHarmony LiteOS-A内核支持Hi3518EV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3518%E5%BC%80%E5%8F%91%E6%9D%BF%E4%BB%8B%E7%BB%8D.md)）、Hi3516DV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3516%E5%BC%80%E5%8F%91%E6%9D%BF%E4%BB%8B%E7%BB%8D.md)）单板，开发者可基于两种单板开发运行自己的应用程序。

 ### 准备<a name="section1579912573329"></a>

 开发者需要在Linux上搭建编译环境：

-   [Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md);
-   Hi3518EV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-setting.md)；
-   Hi3516DV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-setting.md)。
+-   Hi3518EV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3518%E5%BC%80%E5%8F%91%E6%9D%BF.md)；
+-   Hi3516DV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Hi3516%E5%BC%80%E5%8F%91%E6%9D%BF.md)。

 ### 获取源码<a name="section11443189655"></a>

-在Linux服务器上下载并解压一套源代码，源码获取方式参考[源码获取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/sourcecode-acquire.md)。
+在Linux服务器上下载并解压一套源代码，获取源码（[下载链接](https://repo.huaweicloud.com/harmonyos/os/1.0.1/code-1.0.1.tar.gz)）。更多源码获取方式，参考[源码获取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/%E6%BA%90%E7%A0%81%E8%8E%B7%E5%8F%96.md)。

 ### 编译构建<a name="section2081013992812"></a>

 开发者开发第一个应用程序可参考：

-   [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-running.md)；
+-   [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/%E8%BF%90%E8%A1%8CHello-OHOS-4.md)；

-   [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)。
+-   [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/%E8%BF%90%E8%A1%8CHello-OHOS.md)。

 ## 相关仓<a name="section1371113476307"></a>

--- a/TODOList.md
+++ b/TODOList.md
@@ -0,0 +1,61 @@
+- liteos_m易用性
+	- [ ] liteos_m开发者手册
+	- [ ] 低功耗框架及实现（含投票机制）
+	- [ ] dump增强（配套解析工具）
+	- [ ] 全内存dump（配套解析工具）
+	- [ ] 实现完整L0 OHOS的qemu仿真
+	- [ ] Shell + AT
+
+- liteos_m能力增强
+	- [ ] liteos_m支持elf动态加载
+	- [ ] 基于MPU/PMP的多任务简化隔离
+	- [ ] 基于MPU/PMP的多BIN隔离及灌段隔离
+	- [ ] 扩展支持中断嵌套
+	- [ ] 支持arm9架构
+	- [ ] 支持xtensa架构
+
+- 文件系统增强
+	- [ ] 提供一种好用且开源的NandFlash文件系统
+	- [ ] 面向fat32、jffs2持续性能优化，做到极致
+	- [ ] fat32支持fast seek（现有fast seek限制文件扩展，需要改造）
+	- [ ] 支持软链接
+	- [ ] 头文件引用关系整理
+	- [ ] 接口层去nuttx
+	- [ ] 文件系统去大锁
+
+- liteos_a支持三方芯片易移植性
+	- [ ] 启动框架重构
+	- [ ] musl库归一化
+	- [ ] 去C库预编译
+	- [ ] 宏配置依赖关系整理
+	- [ ] 典型商用配置场景整理并导入门禁（1V1映射，去缺页，去隔离，单进程等等）
+	- [ ] 编译框架整合到gn
+	- [ ] 实现基于python的kconfig可视化配置
+
+- liteos_a易用性
+	- [ ] 实现L1 LiteOS-A及上层鸿蒙组件的qemu仿真
+	- [ ] liteos_a开发者手册
+	- [ ] mksh移植
+	- [ ] toybox命令集
+	- [ ] trace、backtrace、dump解析工具等
+	- procfs适配
+		- [ ] ifconfig、fd、free等
+
+- liteos_a能力增强
+	- [ ] 单链表整改（SMP多核性能）
+	- [ ] 快启
+	- [ ] 典型高频函数C库性能优化
+	- [ ] rwlock
+
+- liteos_a三方库移植
+	- [ ] libuv、dlna、benchmark、iperf、perf、tcpdump 等等
+	-  C库能力补全
+		- [ ] epoll实现 
+
+- 测试验证
+	- [ ] syzkaller、difuze等
+
+- 探索性课题
+	- [ ] 基于rust重写liteos_m基础内核
+	- [ ] 用户态驱动（对比业界并增强）
+	- [ ] 用户态文件系统
--- a/apps/BUILD.gn
+++ b/apps/BUILD.gn
@@ -1,54 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-group("apps") {
-  deps = []
-
-  if (defined(LOSCFG_SHELL)) {
-    deps += [
-      "shell",
-      "mksh",
-      "toybox",
-    ]
-  }
-
-  if (defined(LOSCFG_USER_INIT_DEBUG)) {
-    deps += [ "init" ]
-  }
-
-  if (defined(LOSCFG_NET_LWIP_SACK_TFTP)) {
-    deps += [ "tftp" ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_TRACE)) {
-    deps += [ "trace" ]
-  }
-}
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -27,21 +27,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-APPSTOPDIR := $(shell pwd)
-LITEOSTOPDIR ?= $(APPSTOPDIR)/..
-export LITEOSTOPDIR
-export APPSTOPDIR
+LITEOSTOPDIR = $(shell pwd)/../

-include $(APPSTOPDIR)/config.mk
+include $(LITEOSTOPDIR)/.config
+include ./config.mk
+include ./module.mk

-all:
+HIDE := @
+APPS := app
+
+all: $(APPS)
+
+# Make
+$(APPS):
 ifneq ($(APP_SUBDIRS), )
-	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir all || exit 1; done
+	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir || exit 1; done
 endif

 clean:
 ifneq ($(APP_SUBDIRS), )
-	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir clean || exit 1; done
+	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir clean; done
 endif

-.PHONY: all clean
+.PHONY: all $(APPS) clean
--- a/apps/app.mk
+++ b/apps/app.mk
@@ -1,114 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-OBJOUT := $(BUILD)$(dir $(subst $(LITEOSTOPDIR),,$(shell pwd)))$(APP_NAME)
-
-APP := $(OUT)/bin/$(APP_NAME)
-
-# create a separate list of objects per source type
-
-LOCAL_CSRCS := $(filter %.c,$(LOCAL_SRCS))
-LOCAL_CPPSRCS := $(filter %.cpp,$(LOCAL_SRCS))
-LOCAL_ASMSRCS := $(filter %.S,$(LOCAL_SRCS))
-LOCAL_ASMSRCS2 := $(filter %.s,$(LOCAL_SRCS))
-LOCAL_CCSRCS := $(filter %.cc,$(LOCAL_SRCS))
-
-LOCAL_COBJS := $(patsubst %.c,$(OBJOUT)/%.o,$(LOCAL_CSRCS))
-LOCAL_CPPOBJS := $(patsubst %.cpp,$(OBJOUT)/%.o,$(LOCAL_CPPSRCS))
-LOCAL_ASMOBJS := $(patsubst %.S,$(OBJOUT)/%.o,$(LOCAL_ASMSRCS))
-LOCAL_ASMOBJS2 := $(patsubst %.s,$(OBJOUT)/%.o,$(LOCAL_ASMSRCS2))
-LOCAL_CCOBJS := $(patsubst %.cc,$(OBJOUT)/%.o,$(LOCAL_CCSRCS))
-
-LOCAL_OBJS := $(LOCAL_COBJS) $(LOCAL_CPPOBJS) $(LOCAL_ASMOBJS) $(LOCAL_ASMOBJS2) $(LOCAL_CCOBJS)
-
-LOCAL_CGCH := $(patsubst %.h,%.h.gch,$(LOCAL_CHS))
-LOCAL_CPPGCH := $(patsubst %.h,%.h.gch,$(LOCAL_CPPHS))
-
-all : $(APP)
-
-define ECHO =
-ifeq ($$(HIDE),@)
-_$(1) := $($(1))
-$(1) = echo "  $(1)" $$(patsubst $$(OUT)/%,%,$$@) && $$(_$(1))
-endif
-endef
-$(foreach cmd,CC GPP AS,$(eval $(call ECHO,$(cmd))))
-
-LOCAL_FLAGS += -MD -MP
-include $(LOCAL_OBJS:%.o=%.d)
-
-$(LOCAL_COBJS): $(OBJOUT)/%.o: %.c
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_CFLAGS) -c $< -o $@
-
-$(LOCAL_CPPOBJS): $(OBJOUT)/%.o: %.cpp
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -c $< -o $@
-
-$(LOCAL_ASMOBJS): $(OBJOUT)/%.o: %.S
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_ASFLAGS) -c $< -o $@
-
-$(LOCAL_ASMOBJS2): $(OBJOUT)/%.o: %.s
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(AS) $(ASFLAGS) $(LOCAL_FLAGS) $(LOCAL_ASFLAGS) -c $< -o $@
-
-$(LOCAL_CCOBJS): $(OBJOUT)/%.o: %.cc
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -c $< -o $@
-
-$(LOCAL_CGCH): %.h.gch : %.h
-	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_CFLAGS) $> $^
-
-$(LOCAL_CPPGCH): %.h.gch : %.h
-	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -x c++-header $> $^
-
-LOCAL_GCH := $(LOCAL_CGCH) $(LOCAL_CPPGCH)
-
-$(LOCAL_OBJS): $(LOCAL_GCH)
-$(APP): $(LOCAL_OBJS)
-	$(HIDE)$(OBJ_MKDIR)
-	$(HIDE)$(GPP) $(LDFLAGS) -o $@ $^
-
-clean:
-	$(HIDE)$(RM) $(APP) $(OBJOUT) $(LOCAL_GCH) *.bak *~
-
-.PHONY: all clean
-
-# clear some variables we set here
-LOCAL_CSRCS :=
-LOCAL_CPPSRCS :=
-LOCAL_ASMSRCS :=
-LOCAL_COBJS :=
-LOCAL_CPPOBJS :=
-LOCAL_ASMOBJS :=
-LOCAL_ASMOBJS2 :=
-
-# LOCAL_OBJS is passed back
-#LOCAL_OBJS :=
--- a/apps/config.mk
+++ b/apps/config.mk
@@ -27,18 +27,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+# common dir config
 include $(LITEOSTOPDIR)/config.mk

+# output dir config
+OBJOUT := $(APPSTOPDIR)/out
+APPSOUT := $(OBJOUT)/apps
+LIBSOUT := $(OBJOUT)/libs
+IMGOUT  := $(OUT)
+
 # common flags config
-BASE_OPTS := -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE=700 $(LITEOS_GCOV_OPTS)
+BASE_OPTS := -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-common -fno-strict-aliasing -D_GNU_SOURCE \
+             $(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LLVM_EXTRA_OPTS) $(LITEOS_GCOV_OPTS)

-ASFLAGS   :=
-CFLAGS    := $(LITEOS_COPTS) $(BASE_OPTS) -fPIE
-CXXFLAGS  := $(LITEOS_CXXOPTS) $(BASE_OPTS) -fPIE
-LDFLAGS   := $(LITEOS_CORE_COPTS) -pie -Wl,-z,relro,-z,now -O2
-
-CFLAGS    := $(filter-out -fno-pic -fno-builtin -nostdinc -nostdlib,$(CFLAGS))
-CXXFLAGS  := $(filter-out -fno-pic -fno-builtin -nostdinc -nostdlib -nostdinc++,$(CXXFLAGS))
+CFLAGS := -std=c99 -fno-exceptions $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE)
+CXXFLAGS := -std=c++11 -fexceptions -fpermissive -frtti $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE)
+LDCFLAGS  := -lc
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+LLVM_SYSROOT := --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)
+LDCXXFLGS := -lc++ -lc++abi -lc
+else
+BASE_OPTS += -Wl,-z,relro,-z,now
+LDCXXFLGS := -lstdc++ -lsupc++ -lc
+endif
+COMMON_INCLUDE := -I $(LITEOSTHIRDPARTY)/bounds_checking_function/include

 # alias variable config
 HIDE := @
@@ -46,35 +58,3 @@ MAKE := make
 RM := rm -rf
 CP := cp -rf
 MV := mv -f
-
-APP := $(APPSTOPDIR)/app.mk
-
-##build modules config##
-APP_SUBDIRS :=
-
-ifeq ($(LOSCFG_SHELL), y)
-APP_SUBDIRS += shell
-APP_SUBDIRS += mksh
-APP_SUBDIRS += toybox
-endif
-
-ifeq ($(LOSCFG_USER_INIT_DEBUG), y)
-APP_SUBDIRS += init
-endif
-
-ifeq ($(LOSCFG_NET_LWIP_SACK_TFTP), y)
-APP_SUBDIRS += tftp
-endif
-
-ifeq ($(LOSCFG_DRIVERS_TRACE), y)
-APP_SUBDIRS += trace
-endif
-
-# clear all local variables
-LOCAL_FLAGS    :=
-LOCAL_CFLAGS   :=
-LOCAL_CPPFLAGS :=
-LOCAL_ASFLAGS  :=
-LOCAL_SRCS     :=
-LOCAL_CHS      :=
-LOCAL_CPPHS    :=
--- a/apps/init/BUILD.gn
+++ b/apps/init/BUILD.gn
@@ -1,39 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-executable("init") {
-  sources = [ "src/init.c" ]
-
-  if (defined(LOSCFG_QUICK_START)) {
-    ldflags = [ "--static" ]
-    defines = [ "LOSCFG_QUICK_START" ]
-  }
-}
--- a/apps/init/Makefile
+++ b/apps/init/Makefile
@@ -27,15 +27,43 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-include $(APPSTOPDIR)/config.mk
+INIT_DIR := $(dir $(shell pwd))/init/

-APP_NAME := $(notdir $(shell pwd))
+ifeq ($(APPSTOPDIR), )
+APPSTOPDIR := $(shell pwd)/../
+LITEOSTOPDIR = $(APPSTOPDIR)/../
+endif
+include $(INIT_DIR)/../config.mk

+APPS_OUT := $(OUT)/bin
 LOCAL_SRCS := src/init.c
+LOCAL_OBJ := src/init.o
+
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-bitwise-op-parentheses -Wnonnull $(LLVM_SYSROOT)
+LDCFLAGS += $(LLVM_EXTRA_LD_OPTS) $(LLVM_SYSROOT)
+endif

 ifeq ($(LOSCFG_QUICK_START), y)
-LDFLAGS += --static
+LDCFLAGS += --static
 CFLAGS += -DLOSCFG_QUICK_START
 endif

-include $(APP)
+INITNAME := init
+
+all: $(INITNAME)
+
+$(LOCAL_OBJ): %.o : %.c
+	$(HIDE) $(CC) $(CFLAGS) $(LOCAL_FLAGS) -fPIE $(LOCAL_INCLUDE) -c $< -o $@
+
+$(INITNAME):$(LOCAL_OBJ)
+	$(HIDE) $(CC) -pie -s $(LDPATH) $(BASE_OPTS) -o $(INITNAME) $^ $(LDCFLAGS)
+	$(HIDE) mkdir -p $(APPS_OUT)
+	$(HIDE) $(MV) $(INITNAME) $(APPS_OUT)
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+
+clean:
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+	$(HIDE) $(RM) $(INITNAME)
+
+.PHONY: all $(INITNAME) clean
--- a/apps/mksh/BUILD.gn
+++ b/apps/mksh/BUILD.gn
@@ -1,99 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//build/lite/config/component/lite_component.gni")
-import("//kernel/liteos_a/liteos.gni")
-
-group("mksh") {
-  deps = [ ":build_mksh" ]
-}
-
-copy("copy_mksh_src") {
-  sources = [ "$LITEOSTHIRDPARTY/mksh" ]
-  outputs = [ "$target_out_dir/mksh_build" ]
-}
-
-build_ext_component("build_mksh") {
-  deps = [ ":copy_mksh_src" ]
-  deps += [ "//prebuilts/lite/sysroot" ]
-  exec_path = rebase_path("$target_out_dir/mksh_build")
-
-  cflags = [
-    "-flto",
-    "-fdata-sections",
-    "-ffunction-sections",
-    "-fstack-protector-strong",
-    "-D_FORTIFY_SOURCE=2",
-    "-DMKSH_DISABLE_TTY_WARNING",
-    "-DMKSH_SMALL=1",
-    "-DMKSH_ASSUME_UTF8=1",
-    "-DMKSH_SMALL_BUT_FAST=0",
-    "-DMKSH_S_NOVI=1",
-    "-DHAVE_CAN_FSTACKPROTECTORSTRONG=1",
-    "-DMKSH_LESS_CMDLINE_EDITING",
-    "-DMKSH_LESS_BUILDINS",
-    "-DMKSH_NO_INITCOMS",
-    "-DADAPT_FOR_LITEOS_A",
-  ]
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    cflags += [ "-Oz" ]
-  } else {
-    cflags += [ "-O2" ]
-  }
-  cflags = string_join(" ", cflags)
-
-  extra_flags = string_join(" ", target_arch_cflags)
-  if (ohos_build_compiler == "clang") {
-    extra_flags += " --target=$target_triple"
-    extra_flags += " --sysroot=" + rebase_path(ohos_current_sysroot)
-  }
-
-  command = "rm -rf .git && env"
-  command += " CC=\"$ohos_current_cc_command\""
-  command += " TARGET_OS=OpenHarmony"
-  command += " CFLAGS=\"$cflags $extra_flags\""
-  command += " LDFLAGS=\"-Wl,--gc-sections -flto -O2\""
-  command += " sh ./Build.sh -r"
-
-  # copy mksh and .mkshrc to out dir
-  command += " && mkdir -p "
-  command += rebase_path("$root_out_dir/bin", exec_path)
-  command += " && install -D mksh "
-  command += rebase_path("$root_out_dir/unstripped/bin/mksh", exec_path)
-  command += " && $ohos_current_strip_command mksh -o "
-  command += rebase_path("$root_out_dir/bin/mksh", exec_path)
-  command += " && install -D .mkshrc "
-  command += rebase_path("$root_out_dir/etc/.mkshrc", exec_path)
-
-  outputs = [
-    "$root_out_dir/unstripped/bin/mksh",
-    "$root_out_dir/bin/mksh",
-    "$root_out_dir/etc/.mkshrc",
-  ]
-}
--- a/apps/mksh/Makefile
+++ b/apps/mksh/Makefile
@@ -27,30 +27,45 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-include $(APPSTOPDIR)/config.mk
+MKSH := mksh

-BUILD_DIR := $(OUT)/mksh_build
-BUILD_LOG := $(BUILD_DIR)/build.log
+MKSH_DIR := $(shell pwd)/
+LITEOSTOPDIR = $(MKSH_DIR)/../../
+include $(MKSH_DIR)/../config.mk

-CFLAGS += -DMKSH_DISABLE_TTY_WARNING -DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=1 -DMKSH_SMALL_BUT_FAST=0 -DMKSH_S_NOVI=1 -DHAVE_CAN_FSTACKPROTECTORSTRONG=1
-CFLAGS += -DMKSH_LESS_CMDLINE_EDITING -DMKSH_LESS_BUILDINS -DMKSH_NO_INITCOMS -DADAPT_FOR_LITEOS_A
-CFLAGS += -Wno-error
-LDFLAGS += -Wl,--gc-sections
+APPS_OUT := $(OUT)/bin
+ETC_OUT := $(OUT)/etc
+BUILD_DIR := $(MKSH_DIR)/build
+BUILD_LOG := $(MKSH_DIR)/build.log
+TARGET_OS := OpenHarmony

-all:
+LOCAL_CFLAGS := -flto -fdata-sections -ffunction-sections -Oz -fstack-protector-strong -D_FORTIFY_SOURCE=2
+LOCAL_CFLAGS += --target=$(LLVM_TARGET) $(LLVM_SYSROOT)
+LOCAL_CFLAGS += -DMKSH_DISABLE_TTY_WARNING -DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=1 -DMKSH_SMALL_BUT_FAST=0 -DMKSH_S_NOVI=1 -DHAVE_CAN_FSTACKPROTECTORSTRONG=1
+LOCAL_CFLAGS += -DMKSH_LESS_CMDLINE_EDITING -DMKSH_LESS_BUILDINS -DMKSH_NO_INITCOMS -DADAPT_FOR_LITEOS_A
+LOCAL_LDFLAGS := -Wl,--gc-sections -flto -O2 --target=$(LLVM_TARGET) $(LLVM_SYSROOT)
+
+all:$(MKSH)
+
+$(MKSH):
 ifneq ($(wildcard $(BUILD_DIR)/Rebuild.sh),)
 	$(HIDE)echo "not clean, rebuilding now"
-	$(HIDE)cd $(BUILD_DIR) && sh ./Rebuild.sh > $(BUILD_LOG) 2>&1
+	$(HIDE)chmod +x $(BUILD_DIR)/Rebuild.sh
+	$(HIDE)cd $(BUILD_DIR) && ./Rebuild.sh > $(BUILD_LOG) 2>&1
 else
 	$(HIDE)mkdir -p $(BUILD_DIR)
-	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/mksh/. $(BUILD_DIR)
-	$(HIDE)cd $(BUILD_DIR) && CC="$(CC)" TARGET_OS=OpenHarmony CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" sh ./Build.sh -r > $(BUILD_LOG) 2>&1
+	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/$(MKSH)/. $(BUILD_DIR)
+	$(HIDE)chmod +x $(BUILD_DIR)/Build.sh
+	$(HIDE)cd $(BUILD_DIR) && CC=$(CC) TARGET_OS=$(TARGET_OS) CFLAGS="$(LOCAL_CFLAGS)" LDFLAGS="$(LOCAL_LDFLAGS)" ./Build.sh -r > $(BUILD_LOG) 2>&1
 endif
-	$(HIDE)mkdir -p $(OUT)/bin/ $(OUT)/etc/
-	$(HIDE)$(STRIP) $(BUILD_DIR)/mksh -o $(OUT)/bin/mksh
-	$(HIDE)$(CP) $(BUILD_DIR)/.mkshrc $(OUT)/etc/
+	$(HIDE)$(CP) -rf $(BUILD_DIR)/$(MKSH) .
+	$(HIDE)$(STRIP) $(MKSH)
+	$(HIDE)mkdir -p $(APPS_OUT)
+	$(HIDE)$(CP) $(MKSH) $(APPS_OUT)
+	$(HIDE)mkdir -p $(ETC_OUT)
+	$(HIDE)$(CP) -rf $(BUILD_DIR)/.mkshrc $(ETC_OUT)/

 clean:
-	$(HIDE)$(RM) $(BUILD_DIR)
+	$(HIDE)$(RM) $(MKSH) $(BUILD_DIR) $(BUILD_LOG)

-.PHONY: all clean
+.PHONY: all $(MKSH) clean
--- a/apps/module.mk
+++ b/apps/module.mk
@@ -27,18 +27,20 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-import("//kernel/liteos_a/liteos.gni")
+APP_SUBDIRS :=

-group("arch") {
-  deps = []
-  if (defined(LOSCFG_ARCH_ARM)) {
-    deps += [ "arm" ]
-  }
-}
+##build modules config##

-config("public") {
-  configs = []
-  if (defined(LOSCFG_ARCH_ARM)) {
-    configs += [ "arm:public" ]
-  }
-}
+ifeq ($(LOSCFG_SHELL), y)
+APP_SUBDIRS += shell
+APP_SUBDIRS += mksh
+APP_SUBDIRS += toybox
+endif
+
+ifeq ($(LOSCFG_USER_INIT_DEBUG), y)
+APP_SUBDIRS += init
+endif
+
+ifeq ($(LOSCFG_NET_LWIP_SACK_TFTP), y)
+APP_SUBDIRS += tftp
+endif
--- a/apps/shell/BUILD.gn
+++ b/apps/shell/BUILD.gn
@@ -1,44 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-executable("shell") {
-  sources = [
-    "builtin/cd.c",
-    "src/main.c",
-    "src/shcmd.c",
-    "src/shcmdparse.c",
-    "src/shmsg.c",
-  ]
-
-  deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ]
-
-  include_dirs = [ "include" ]
-}
--- a/apps/shell/Makefile
+++ b/apps/shell/Makefile
@@ -27,19 +27,52 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-include $(APPSTOPDIR)/config.mk
+SHELL_DIR := $(dir $(shell pwd))/shell/

-APP_NAME := $(notdir $(shell pwd))
+ifeq ($(APPSTOPDIR), )
+APPSTOPDIR := $(shell pwd)/../
+LITEOSTOPDIR = $(APPSTOPDIR)/../
+endif
+include $(SHELL_DIR)/../config.mk
+APPS_OUT := $(OUT)/bin

-SECUREC_DIR := $(LITEOSTHIRDPARTY)/bounds_checking_function
+SECUREC_INCLUDE := $(LITEOSTHIRDPARTY)/bounds_checking_function/include

-LOCAL_SRCS = $(wildcard src/*.c builtin/*.c)
-LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/*.c)
+LOCAL_SRCS = $(wildcard src/main.c)\
+             $(wildcard src/shcmd.c)\
+             $(wildcard src/shmsg.c)\
+             $(wildcard src/shcmdparse.c)\
+             $(wildcard builtin/cd.c)
+LOCAL_SRCS += $(wildcard $(LITEOSTHIRDPARTY)/bounds_checking_function/src/*.c)
+LOCAL_OBJ := $(LOCAL_SRCS:.c=.o)

 LOCAL_INCLUDE := \
-	-I include \
-	-I $(SECUREC_DIR)/include
+	-I $(SHELL_DIR)/include/ \
+	-I $(SECUREC_INCLUDE)\

-LOCAL_FLAGS += $(LOCAL_INCLUDE)
+LOCAL_FLAGS += $(CFLAGS)

-include $(APP)
+LDPATH := -L$(SHELL_DIR)/
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-bitwise-op-parentheses $(LLVM_SYSROOT)
+LDCFLAGS += $(LLVM_EXTRA_LD_OPTS) $(LLVM_SYSROOT)
+endif
+
+SHELLNAME := shell
+
+all: $(SHELLNAME)
+
+$(LOCAL_OBJ): %.o : %.c
+	$(HIDE) $(CC) $(LOCAL_FLAGS) -fPIE $(LOCAL_INCLUDE) -c $< -o $@
+
+$(SHELLNAME): $(LOCAL_OBJ)
+	$(HIDE) $(CC) -pie -s $(LDPATH) $(BASE_OPTS) -o $(SHELLNAME) $^ $(LDCFLAGS)
+	$(HIDE) mkdir -p $(APPS_OUT)
+	$(HIDE) $(MV) $(SHELLNAME) $(APPS_OUT)
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+
+clean:
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+	$(HIDE) $(RM) $(SHELLNAME)
+
+.PHONY: all $(SHELLNAME) clean
--- a/apps/shell/builtin/cd.c
+++ b/apps/shell/builtin/cd.c
@@ -29,7 +29,9 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#ifndef  _GNU_SOURCE
 #define _GNU_SOURCE
+#endif

 #include "unistd.h"
 #include "shcmd.h"
--- a/apps/shell/include/shmsg.h
+++ b/apps/shell/include/shmsg.h
@@ -43,13 +43,8 @@ extern "C" {
 #define SHELL_ENTRY_STACKSIZE   0x1000
 #define SHELL_TASK_STACKSIZE    0x3000

-#define SHELL_EXEC_COMMAND          "exec"
-#define SHELL_EXEC_COMMAND_BYTES    4
-#define CMD_EXEC_COMMAND            SHELL_EXEC_COMMAND" "
-#define CMD_EXEC_COMMAND_BYTES      (SHELL_EXEC_COMMAND_BYTES+1)
-#define CMD_EXIT_COMMAND            "exit"
-#define CMD_EXIT_COMMAND_BYTES      4
-#define CMD_EXIT_CODE_BASE_DEC      10
+#define SHELL_EXEC_COMMAND          "exec "
+#define SHELL_EXEC_COMMAND_BYTES    5

 #define CONSOLE_IOC_MAGIC   'c'
 #define CONSOLE_CONTROL_REG_USERTASK _IO(CONSOLE_IOC_MAGIC, 7)
@@ -62,7 +57,6 @@ extern "C" {
 typedef void (*OutputFunc)(const char *fmt, ...);
 extern int ShellTaskInit(ShellCB *shellCB);
 extern int ShellEntryInit(ShellCB *shellCB);
-extern void ChildExec(const char *cmdName, char *const paramArray[]);
 extern void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB);
 extern int ShellNotify(ShellCB *shellCB);

--- a/apps/shell/include/show.h
+++ b/apps/shell/include/show.h
@@ -42,10 +42,10 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-extern char *OsShellGetWorkingDirtectory(void);
-extern unsigned int OsShellInit(void);
+extern char *OsShellGetWorkingDirtectory();
+extern unsigned int OsShellInit();
 extern int OsShellDeinit(ShellCB *shellCB);
-extern ShellCB *OsGetShellCb(void);
+extern ShellCB *OsGetShellCb();

 #ifdef __cplusplus
 #if __cplusplus
--- a/apps/shell/src/main.c
+++ b/apps/shell/src/main.c
@@ -29,15 +29,13 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#define _GNU_SOURCE
-
 #include "show.h"
 #include "shmsg.h"
 #include "shcmd.h"
 #include "semaphore.h"
 #include "securec.h"
 #include "unistd.h"
-#include <sys/syscall.h>
+

 ShellCB *g_shellCB = NULL;

@@ -90,47 +88,11 @@ OUT:
    return ret;
 }

-static int DoShellExec(char **argv)
-{
-    int i, j;
-    int len = 0;
-    int ret = SH_NOK;
-    char *cmdLine = NULL;
-
-    if (strncmp(argv[0], SHELL_EXEC_COMMAND, SHELL_EXEC_COMMAND_BYTES) == 0) {
-        ChildExec(argv[1], argv + 1);
-    }
-    for (i = 0; argv[i]; i++) {
-        len += strlen(argv[i]);
-    }
-    len += i + 1;
-    cmdLine = (char *)malloc(len);
-    if (!cmdLine) {
-        return ret;
-    }
-    memset_s(cmdLine, len, 0, len);
-
-    for(j = 0; j < i; j++) {
-        strcat_s(cmdLine, len,  argv[j]);
-        strcat_s(cmdLine, len, " ");
-    }
-
-    cmdLine[len - 2] = '\0';
-    ret = syscall(__NR_shellexec, argv[0], cmdLine);
-    free(cmdLine);
-    return ret;
-}
-
-int main(int argc, char **argv)
+int main()
 {
    int ret = SH_NOK;
    ShellCB *shellCB = NULL;

-    if (argc > 1) {
-        ret = DoShellExec(argv + 1);
-        return ret;
-    }
-
    setbuf(stdout, NULL);

    shellCB = (ShellCB *)malloc(sizeof(ShellCB));
--- a/apps/shell/src/shmsg.c
+++ b/apps/shell/src/shmsg.c
@@ -29,8 +29,6 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#define _GNU_SOURCE
-
 #include "stdlib.h"
 #include "stdio.h"
 #include "unistd.h"
@@ -44,10 +42,7 @@
 #include "shell_pri.h"
 #include "shcmd.h"

-#define CHAR_CTRL_C   '\x03'
-#define CHAR_CTRL_DEL '\x7F'

-#define VISIABLE_CHAR(ch) ((ch) > 0x1F && (ch) < 0x7F)

 char *GetCmdline(ShellCB *shellCB)
 {
@@ -205,21 +200,7 @@ void ParseEnterKey(OutputFunc outputFunc, ShellCB *shellCB)
        shellCB->shellBuf[shellCB->shellBufOffset] = '\0';
    }
 NOTIFY:
-    shellCB->shellBufOffset = 0;
-    ShellTaskNotify(shellCB);
-}
-
-void ParseCancelKey(OutputFunc outputFunc, ShellCB *shellCB)
-{
-    if ((shellCB == NULL) || (outputFunc == NULL)) {
-        return;
-    }
-
-    if (shellCB->shellBufOffset <= (SHOW_MAX_LEN - 1)) {
-        shellCB->shellBuf[0] = CHAR_CTRL_C;
-        shellCB->shellBuf[1] = '\0';
-    }
-
+    outputFunc("\n");
    shellCB->shellBufOffset = 0;
    ShellTaskNotify(shellCB);
 }
@@ -255,7 +236,7 @@ void ParseTabKey(OutputFunc outputFunc, ShellCB *shellCB)

 void ParseNormalChar(char ch, OutputFunc outputFunc, ShellCB *shellCB)
 {
-    if ((shellCB == NULL) || (outputFunc == NULL) || !VISIABLE_CHAR(ch)) {
+    if ((shellCB == NULL) || (outputFunc == NULL)) {
        return;
    }

@@ -273,7 +254,7 @@ void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB)
    const char ch = c;
    int ret;

-    if ((shellCB->shellBufOffset == 0) && (ch != '\n') && (ch != CHAR_CTRL_C) && (ch != '\0')) {
+    if ((shellCB->shellBufOffset == 0) && (ch != '\n') && (ch != '\0')) {
        (void)memset_s(shellCB->shellBuf, SHOW_MAX_LEN, 0, SHOW_MAX_LEN);
    }

@@ -282,11 +263,8 @@ void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB)
        case '\n': /* enter */
            ParseEnterKey(outputFunc, shellCB);
            break;
-        case CHAR_CTRL_C: /* ctrl + c */
-            ParseCancelKey(outputFunc, shellCB);
-            break;
        case '\b': /* backspace */
-        case CHAR_CTRL_DEL: /* delete(0x7F) */
+        case 0x7F: /* delete(0x7F) */
            ParseDeleteKey(outputFunc, shellCB);
            break;
        case '\t': /* tab */
@@ -351,80 +329,40 @@ char *GetCmdName(const char *cmdline, unsigned int len)
    return cmdName;
 }

-void ChildExec(const char *cmdName, char *const paramArray[])
-{
-    int ret;
-    pid_t gid;
-
-    ret = setpgrp();
-    if (ret == -1) {
-        exit(1);
-    }
-
-    gid = getpgrp();
-    if (gid < 0) {
-        printf("get group id failed, pgrpid %d, errno %d\n", gid, errno);
-    }
-
-    ret = tcsetpgrp(STDIN_FILENO, gid);
-    if (ret != 0) {
-        printf("tcsetpgrp failed, errno %d\n", errno);
-    }
-
-    ret = execve(cmdName, paramArray, NULL);
-    if (ret == -1) {
-        perror("execve");
-        exit(-1);
-    }
-}
-
-int CheckExit(const char *cmdName, const CmdParsed *cmdParsed)
-{
-    int ret = 0;
-
-    if (strlen(cmdName) != CMD_EXIT_COMMAND_BYTES || strncmp(cmdName, CMD_EXIT_COMMAND, CMD_EXIT_COMMAND_BYTES) != 0) {
-        return 0;
-    }
-
-    if (cmdParsed->paramCnt > 1) {
-        printf("exit: too many arguments\n");
-        return -1;
-    }
-    if (cmdParsed->paramCnt == 1) {
-        char *p;
-        ret = strtol(cmdParsed->paramArray[0], &p, CMD_EXIT_CODE_BASE_DEC);
-        if (*p != '\0') {
-            printf("exit: bad number: %s\n", cmdParsed->paramArray[0]);
-            return -1;
-        }
-    }
-
-    exit(ret);
-}
-
 static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, const CmdParsed *cmdParsed)
 {
    int ret;
    pid_t forkPid;
+    pid_t gid;

-    if (strncmp(cmdline, CMD_EXEC_COMMAND, CMD_EXEC_COMMAND_BYTES) == 0) {
+    if (strncmp(cmdline, SHELL_EXEC_COMMAND, SHELL_EXEC_COMMAND_BYTES) == 0) {
        forkPid = fork();
        if (forkPid < 0) {
            printf("Faild to fork from shell\n");
            return;
        } else if (forkPid == 0) {
-            ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray);
-        } else {
-            waitpid(forkPid, 0, 0);
-            ret = tcsetpgrp(STDIN_FILENO, getpid());
+            ret = setpgrp();
+            if (ret == -1) {
+                exit(1);
+            }
+
+            gid = getpgrp();
+            if (gid < 0) {
+                printf("get group id failed, pgrpid %d, errno %d\n", gid, errno);
+            }
+
+            ret = tcsetpgrp(STDIN_FILENO, gid);
            if (ret != 0) {
                printf("tcsetpgrp failed, errno %d\n", errno);
            }
+
+            ret = execve((const char *)cmdParsed->paramArray[0], (char * const *)cmdParsed->paramArray, NULL);
+            if (ret == -1) {
+                perror("execve");
+                exit(-1);
+            }
        }
    } else {
-        if (CheckExit(cmdName, cmdParsed) < 0) {
-            return;
-        }
        (void)syscall(__NR_shellexec, cmdName, cmdline);
    }
 }
@@ -479,7 +417,7 @@ unsigned int PreHandleCmdline(const char *input, char **output, unsigned int *ou
    unsigned int removeLen = strlen("./"); /* "./" needs to be removed if it exists */
    unsigned int ret;
    char *newCmd = NULL;
-    char *execCmd = CMD_EXEC_COMMAND;
+    char *execCmd = SHELL_EXEC_COMMAND;
    const char *cmdBuf = input;
    unsigned int cmdBufLen = strlen(cmdBuf);
    char *shiftStr = (char *)malloc(cmdBufLen + 1);
@@ -582,11 +520,7 @@ static void ShellCmdProcess(ShellCB *shellCB)
        if (buf == NULL) {
            break;
        }
-        if (buf[0] == CHAR_CTRL_C) {
-            printf("^C");
-            buf[0] = '\n';
-        }
-        printf("\n");
+
        ExecCmdline(buf);
        ShellSaveHistoryCmd(buf, shellCB);
        shellCB->cmdMaskKeyLink = shellCB->cmdHistoryKeyLink;
--- a/apps/tftp/Makefile
+++ b/apps/tftp/Makefile
@@ -27,19 +27,51 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-include $(APPSTOPDIR)/config.mk
+ROOT_DIR := $(dir $(shell pwd))/tftp/

-APP_NAME := $(notdir $(shell pwd))
+ifeq ($(APPSTOPDIR), )
+APPSTOPDIR := $(shell pwd)/../
+LITEOSTOPDIR = $(APPSTOPDIR)/../
+endif
+include $(ROOT_DIR)/../config.mk
+APPS_OUT := $(OUT)/bin

 SECUREC_DIR := $(LITEOSTHIRDPARTY)/bounds_checking_function

 LOCAL_SRCS = $(wildcard src/*.c)
-LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/*.c)
+LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/strncpy_s.c)
+LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/memcpy_s.c)
+LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/memset_s.c)
+LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/strncat_s.c)
+LOCAL_OBJ := $(LOCAL_SRCS:.c=.o)

 LOCAL_INCLUDE := \
-	-I include \
-	-I $(SECUREC_DIR)/include
+	-I $(ROOT_DIR)/include/ \
+	-I $(SECUREC_DIR)/include/\

-LOCAL_FLAGS += $(LOCAL_INCLUDE)
+LOCAL_FLAGS += $(CFLAGS)

-include $(APP)
+LDPATH := -L$(ROOT_DIR)/
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-bitwise-op-parentheses $(LLVM_SYSROOT)
+LDCFLAGS += $(LLVM_EXTRA_LD_OPTS) $(LLVM_SYSROOT)
+endif
+
+TARGETNAME := tftp
+
+all: $(TARGETNAME)
+
+$(LOCAL_OBJ): %.o : %.c
+	$(HIDE) $(CC) $(LOCAL_FLAGS) -fPIE $(LOCAL_INCLUDE) -c $< -o $@
+
+$(TARGETNAME): $(LOCAL_OBJ)
+	$(HIDE) $(CC) -pie -s $(LDPATH) $(BASE_OPTS) -o $(TARGETNAME) $^ $(LDCFLAGS)
+	$(HIDE) mkdir -p $(APPS_OUT)
+	$(HIDE) $(MV) $(TARGETNAME) $(APPS_OUT)
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+
+clean:
+	$(HIDE) $(RM) $(LOCAL_OBJ)
+	$(HIDE) $(RM) $(TARGETNAME)
+
+.PHONY: all $(TARGETNAME) clean
--- a/apps/toybox/BUILD.gn
+++ b/apps/toybox/BUILD.gn
@@ -1,80 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//build/lite/config/component/lite_component.gni")
-import("//kernel/liteos_a/liteos.gni")
-
-group("toybox") {
-  deps = [ ":build_toybox" ]
-}
-
-copy("copy_toybox_src") {
-  sources = [ "$LITEOSTHIRDPARTY/toybox" ]
-  outputs = [ "$target_out_dir/toybox_build" ]
-}
-
-copy("copy_toybox_config") {
-  deps = [ ":copy_toybox_src" ]
-  sources = [ "liteos_a_custom.config" ]
-  outputs = [ "$target_out_dir/{{source_file_part}}" ]
-}
-
-build_ext_component("build_toybox") {
-  deps = [ ":copy_toybox_src", ":copy_toybox_config" ]
-  deps += [ "//prebuilts/lite/sysroot" ]
-  exec_path = rebase_path("$target_out_dir/toybox_build")
-
-  cflags = [
-    "-fstack-protector-strong",
-    "-D_FORTIFY_SOURCE=2",
-  ]
-  cflags = string_join(" ", cflags)
-
-  extra_flags = string_join(" ", target_arch_cflags)
-  if (ohos_build_compiler == "clang") {
-    extra_flags += " --target=$target_triple"
-    extra_flags += " --sysroot=" + rebase_path(ohos_current_sysroot)
-  }
-
-  command = "rm -rf .git && cp -rfp porting/liteos_a/. . && env"
-  command += " CC=\"$ohos_current_cc_command\""
-  command += " STRIP=\"$ohos_current_strip_command\""
-  command += " OUTNAME=toybox"
-  command += " CFLAGS=\"$cflags $extra_flags\""
-  command += " make toybox"
-  command += " && install -D toybox "
-  command += rebase_path("$root_out_dir/bin/toybox", exec_path)
-  command += " && install -D generated/unstripped/toybox "
-  command += rebase_path("$root_out_dir/unstripped/bin/toybox", exec_path)
-
-  outputs = [
-    "$root_out_dir/unstripped/bin/toybox",
-    "$root_out_dir/bin/toybox",
-  ]
-}
--- a/apps/toybox/Makefile
+++ b/apps/toybox/Makefile
@@ -27,27 +27,34 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-include $(APPSTOPDIR)/config.mk
+TOYBOX:= toybox

-BUILD_DIR := $(OUT)/toybox_build
-BUILD_LOG := $(BUILD_DIR)/build.log
+TOYBOX_DIR := $(shell pwd)
+LITEOSTOPDIR = $(TOYBOX_DIR)/../../
+include $(TOYBOX_DIR)/../config.mk

-CFLAGS += -Wno-error
+APPS_OUT := $(OUT)/bin
+BUILD_DIR := $(TOYBOX_DIR)/build
+BUILD_LOG := $(TOYBOX_DIR)/build.log
+OUTNAME := $(TOYBOX)

-all:
+$(TOYBOX):
 ifneq ($(wildcard $(BUILD_DIR)),)
-	$(HIDE)echo "not clean, rebuilding now"
+	$(HIDE)echo "not clean, rebuilding now";
 else
-	$(HIDE)mkdir -p $(BUILD_DIR)
-	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/toybox/. $(BUILD_DIR)
-	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/toybox/porting/liteos_a/. $(BUILD_DIR)
-	$(HIDE)$(CP) liteos_a_custom.config $(BUILD_DIR)/../
+	$(HIDE)mkdir $(BUILD_DIR)
+	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/$(TOYBOX)/. $(BUILD_DIR)
+	$(HIDE)$(CP) -p $(LITEOSTHIRDPARTY)/$(TOYBOX)/porting/liteos_a/. $(BUILD_DIR)
 endif
-	$(HIDE)unset KCONFIG_CONFIG CROSS_COMPILE && \
-	env CC="$(CC)" OUTNAME="$(OUT)/bin/toybox" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" STRIP="$(STRIP)" \
+	$(HIDE)CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong --target=$(LLVM_TARGET) $(LLVM_SYSROOT)" CC="$(CC)" OUTNAME=$(OUTNAME) \
+	LDFLAGS="--target=$(LLVM_TARGET) $(LLVM_SYSROOT)" \
 	make -C $(BUILD_DIR) toybox -j> $(BUILD_LOG) 2>&1
+	$(HIDE)$(CP) $(BUILD_DIR)/$(TOYBOX) .
+	$(HIDE)$(STRIP) $(TOYBOX)
+	$(HIDE)mkdir -p $(APPS_OUT)
+	$(HIDE)$(CP) $(TOYBOX) $(APPS_OUT)

 clean:
-	$(HIDE)$(RM) $(BUILD_DIR)
+	$(HIDE)$(RM) $(TOYBOX) $(BUILD_DIR) $(BUILD_LOG)

-.PHONY: all clean
+.PHONY: all $(TOYBOX) clean
--- a/apps/toybox/liteos_a_custom.config
+++ b/apps/toybox/liteos_a_custom.config
@@ -1,6 +1,7 @@
-# CONFIG_BASENAME is not set
+CONFIG_GETTY=y
+CONFIG_MDEV=y
+CONFIG_MDEV_CONF=y
 # CONFIG_CAL is not set
-# CONFIG_CAT is not set
 # CONFIG_CATV is not set
 # CONFIG_CKSUM is not set
 # CONFIG_CRC32 is not set
@@ -12,7 +13,6 @@
 # CONFIG_CUT is not set
 # CONFIG_DF is not set
 # CONFIG_DIRNAME is not set
-# CONFIG_ECHO is not set
 # CONFIG_ENV is not set
 # CONFIG_EXPAND is not set
 # CONFIG_FALSE is not set
@@ -128,6 +128,7 @@
 # CONFIG_READAHEAD is not set
 # CONFIG_READLINK is not set
 # CONFIG_REALPATH is not set
+# CONFIG_REBOOT is not set
 # CONFIG_RESET is not set
 # CONFIG_REV is not set
 # CONFIG_RMMOD is not set
@@ -178,9 +179,3 @@
 # CONFIG_SEQ is not set
 # CONFIG_SU is not set
 # CONFIG_SYNC is not set
-#
-# pending (see toys/pending/README)
-#
-# CONFIG_GETTY is not set
-# CONFIG_MDEV is not set
-# CONFIG_MDEV_CONF is not set
--- a/apps/trace/src/trace.c
+++ b/apps/trace/src/trace.c
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdint.h>
-
-#define TRACE_IOC_MAGIC     'T'
-#define TRACE_START         _IO(TRACE_IOC_MAGIC, 1)
-#define TRACE_STOP          _IO(TRACE_IOC_MAGIC, 2)
-#define TRACE_RESET         _IO(TRACE_IOC_MAGIC, 3)
-#define TRACE_DUMP          _IO(TRACE_IOC_MAGIC, 4)
-#define TRACE_SET_MASK      _IO(TRACE_IOC_MAGIC, 5)
-
-#define TRACE_USR_MAX_PARAMS 3
-typedef struct {
-    unsigned int eventType;
-    uintptr_t identity;
-    uintptr_t params[TRACE_USR_MAX_PARAMS];
-} UsrEventInfo;
-
-static void TraceUsage(void)
-{
-    printf("\nUsage: ./trace [start] Start to trace events.\n");
-    printf("\nUsage: ./trace [stop] Stop trace.\n");
-    printf("\nUsage: ./trace [reset] Clear the trace record buffer.\n");
-    printf("\nUsage: ./trace [dump 0/1] Format printf trace data,"
-                "0/1 stands for whether to send data to studio for analysis.\n");
-    printf("\nUsage: ./trace [mask num] Set trace filter event mask.\n");
-    printf("\nUsage: ./trace [read nBytes] Read nBytes raw data from trace buffer.\n");
-    printf("\nUsage: ./trace [write type id params..] Write a user event, no more than 3 parameters.\n");
-}
-
-static void TraceRead(int fd, size_t size)
-{
-    ssize_t i;
-    ssize_t len;
-    char *buffer = (char *)malloc(size);
-    if (buffer == NULL) {
-        printf("Read buffer malloc failed.\n");
-        return;
-    }
-
-    len = read(fd, buffer, size);
-    for (i = 0; i < len; i++) {
-        printf("%02x ", buffer[i] & 0xFF);
-    }
-    printf("\n");
-    free(buffer);
-}
-
-static void TraceWrite(int fd, int argc, char **argv)
-{
-    int i;
-    UsrEventInfo info = {0};
-    info.eventType = strtoul(argv[2], NULL, 0);
-    info.identity = strtoul(argv[3], NULL, 0);
-    int paramNum = (argc - 4) > TRACE_USR_MAX_PARAMS ? TRACE_USR_MAX_PARAMS : (argc - 4);
-    
-    for (i = 0; i < paramNum; i++) {
-        info.params[i] = strtoul(argv[4 + i], NULL, 0);
-    }
-    (void)write(fd, &info, sizeof(UsrEventInfo));
-}
-
-int main(int argc, char **argv)
-{
-    int fd = open("/dev/trace", O_RDWR);
-    if (fd == -1) {
-        printf("Trace open failed.\n");
-        exit(EXIT_FAILURE);
-    }
-
-    if (argc == 1) {
-        TraceUsage();
-    } else if (argc == 2 && strcmp(argv[1], "start") == 0) {
-        ioctl(fd, TRACE_START, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "stop") == 0) {
-        ioctl(fd, TRACE_STOP, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "reset") == 0) {
-        ioctl(fd, TRACE_RESET, NULL);
-    } else if (argc == 3 && strcmp(argv[1], "mask") == 0) {
-        size_t mask = strtoul(argv[2], NULL, 0);
-        ioctl(fd, TRACE_SET_MASK, mask);
-    } else if (argc == 3 && strcmp(argv[1], "dump") == 0) {
-        size_t flag = strtoul(argv[2], NULL, 0);
-        ioctl(fd, TRACE_DUMP, flag);
-    } else if (argc == 3 && strcmp(argv[1], "read") == 0) {
-        size_t size = strtoul(argv[2], NULL, 0);
-        TraceRead(fd, size);
-    } else if (argc >= 4 && strcmp(argv[1], "write") == 0) {
-        TraceWrite(fd, argc, argv);
-    } else {
-        printf("Unsupported trace command.\n");
-        TraceUsage();
-    }
-
-    close(fd);
-    return 0;
-}
--- a/arch/arm/BUILD.gn
+++ b/arch/arm/BUILD.gn
@@ -1,40 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-group("arm") {
-  deps = [ "gic" ]
-  deps += [ ARCH ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-  configs = [ "$ARCH:public" ]
-}
--- a/arch/arm/arm.mk
+++ b/arch/arm/arm.mk
@@ -36,15 +36,15 @@ LOSCFG_ARCH_FPU_STRIP   := $(subst $\",,$(LOSCFG_ARCH_FPU))
 LOSCFG_ARCH_FPU          = $(LOSCFG_ARCH_FPU_STRIP)

 ifeq ($(LOSCFG_ARCH_ARM_AARCH32), y)
-ARCH                    := arm
+LITEOS_ARCH_ARM         := arm
 else ifeq ($(LOSCFG_ARCH_ARM_AARCH64), y)
-ARCH                    := aarch64
+LITEOS_ARCH_ARM         := 
 endif

 LITEOS_BASELIB          += -l$(LOSCFG_ARCH_CPU)
 LITEOS_BASELIB          += -lgic

-LIB_SUBDIRS             += arch/arm/$(ARCH)
+LIB_SUBDIRS             += arch/arm/$(LITEOS_ARCH_ARM)
 LIB_SUBDIRS             += arch/arm/gic

 # CPU compile options
@@ -66,14 +66,17 @@ LITEOS_GCCLIB           := $(subst cortex-,,$(LOSCFG_ARCH_CPU))_softfp_$(LOSCFG_
 endif

 LITEOS_CORE_COPTS        = $(or $(ARCH_CFLAGS),$(LITEOS_CPU_OPTS) $(LITEOS_FLOAT_OPTS) $(LITEOS_FPU_OPTS))
+LITEOS_INTERWORK        += $(LITEOS_CORE_COPTS)
+LITEOS_NODEBUG          += $(LITEOS_CORE_COPTS)
 LITEOS_ASOPTS           += $(LITEOS_CPU_OPTS)
 LITEOS_CXXOPTS_BASE     += $(LITEOS_CORE_COPTS)

 ARCH_INCLUDE            := -I $(LITEOSTOPDIR)/arch/arm/include \
-                           -I $(LITEOSTOPDIR)/arch/arm/$(ARCH)/include \
-                           -I $(LITEOSTOPDIR)/arch/arm/$(ARCH)/src/include
+                           -I $(LITEOSTOPDIR)/arch/arm/$(LITEOS_ARCH_ARM)/include \
+                           -I $(LITEOSTOPDIR)/arch/arm/$(LITEOS_ARCH_ARM)/src/include

 LITEOS_PLATFORM_INCLUDE += $(ARCH_INCLUDE)
+LITEOS_CXXINCLUDE       += $(ARCH_INCLUDE)

 # expose FPU info to assembly code
 ifeq ($(LOSCFG_ARCH_FPU_DISABLE), y)
@@ -83,3 +86,17 @@ else ifeq ($(LOSCFG_ARCH_FPU_VFP_D16), y)
 else ifeq ($(LOSCFG_ARCH_FPU_VFP_D32), y)
    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_VFP_D32
 endif
+
+# extra definition for other module
+LITEOS_CPU_TYPE          = $(LOSCFG_ARCH_CPU)
+LITEOS_ARM_ARCH         := -march=$(subst $\",,$(LOSCFG_ARCH_ARM_VER))
+
+# linux style macros
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7A) = -D__LINUX_ARM_ARCH__=7
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7R) = -D__LINUX_ARM_ARCH__=7
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7M) = -D__LINUX_ARM_ARCH__=7
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8A) = -D__LINUX_ARM_ARCH__=8
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8R) = -D__LINUX_ARM_ARCH__=8
+LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8M) = -D__LINUX_ARM_ARCH__=8
+
+AS_OBJS_LIBC_FLAGS      += $(LINUX_ARCH_y)
--- a/arch/arm/arm/BUILD.gn
+++ b/arch/arm/arm/BUILD.gn
@@ -1,90 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_name = LOSCFG_ARCH_CPU
-kernel_module(module_name) {
-  sources = [
-    "src/arm_generic_timer.c",
-    "src/clear_user.S",
-    "src/hw_user_get.S",
-    "src/hw_user_put.S",
-    "src/jmp.S",
-    "src/los_arch_mmu.c",
-    "src/los_asid.c",
-    "src/los_dispatch.S",
-    "src/los_exc.c",
-    "src/los_hw.c",
-    "src/los_hw_exc.S",
-    "src/los_hw_runstop.S",
-    "src/los_hw_tick.c",
-    "src/los_hwi.c",
-    "src/strncpy_from_user.c",
-    "src/strnlen_user.c",
-    "src/user_copy.c",
-    "src/smp.c",
-  ]
-
-  if (LOSCFG_ARCH_ARM_VER == "armv7-a") {
-    sources += [ "src/armv7a/cache.S" ]
-  }
-
-  if (defined(LOSCFG_KERNEL_SMP)) {
-    sources += [ "src/startup/reset_vector_mp.S" ]
-  } else {
-    sources += [ "src/startup/reset_vector_up.S" ]
-  }
-
-  include_dirs = [ "src/include" ]
-
-  if (defined(LOSCFG_GDB)) {
-    configs += [ ":as_objs_libc_flags" ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [
-    "include",
-    "src/include",
-  ]
-}
-
-config("as_objs_libc_flags") {
-  defines = [ "__ASSEMBLY__" ]
-
-  # linux style macros
-  if (defined(LOSCFG_ARCH_ARM_V7A) || defined(LOSCFG_ARCH_ARM_V7R) || defined(LOSCFG_ARCH_ARM_V7M)) {
-    defines += [ "__LINUX_ARM_ARCH__=7" ]
-  } else if (defined(LOSCFG_ARCH_ARM_V8A) || defined(LOSCFG_ARCH_ARM_V8R) || defined(LOSCFG_ARCH_ARM_V8M)) {
-    defines += [ "__LINUX_ARM_ARCH__=8" ]
-  }
-}
--- a/arch/arm/arm/Makefile
+++ b/arch/arm/arm/Makefile
@@ -38,7 +38,7 @@ LOCAL_INCLUDE := \
 	-I $(LITEOSTOPDIR)/kernel/extended/dynload/include \
 	-I $(LITEOSTOPDIR)/arch/arm/arm/include \

-ifeq ($(LOSCFG_ARCH_ARM_VER), "armv7-a")
+ifeq ($(LITEOS_ARM_ARCH), -march=armv7-a)
 LOCAL_SRCS += $(wildcard src/armv7a/*.S)
 endif

@@ -50,16 +50,6 @@ endif

 LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)

-AS_OBJS_LIBC_FLAGS  = -D__ASSEMBLY__
-# linux style macros
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7A) = -D__LINUX_ARM_ARCH__=7
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7R) = -D__LINUX_ARM_ARCH__=7
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7M) = -D__LINUX_ARM_ARCH__=7
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8A) = -D__LINUX_ARM_ARCH__=8
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8R) = -D__LINUX_ARM_ARCH__=8
-LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8M) = -D__LINUX_ARM_ARCH__=8
-AS_OBJS_LIBC_FLAGS      += $(LINUX_ARCH_y)
-
 ifeq ($(LOSCFG_GDB), y)
 LOCAL_FLAGS += $(AS_OBJS_LIBC_FLAGS)
 endif
--- a/arch/arm/arm/include/los_hw_cpu.h
+++ b/arch/arm/arm/include/los_hw_cpu.h
@@ -53,8 +53,6 @@ extern "C" {
 #define ISB     __asm__ volatile("isb" ::: "memory")
 #define WFI     __asm__ volatile("wfi" ::: "memory")
 #define BARRIER __asm__ volatile("":::"memory")
-#define WFE     __asm__ volatile("wfe" ::: "memory")
-#define SEV     __asm__ volatile("sev" ::: "memory")

 #define ARM_SYSREG_READ(REG)                    \
 ({                                              \
--- a/arch/arm/arm/src/los_arch_mmu.c
+++ b/arch/arm/arm/src/los_arch_mmu.c
@@ -790,7 +790,7 @@ STATUS_T LOS_ArchMmuDestroy(LosArchMmu *archMmu)
        LOS_PhysPageFree(page);
    }

-    OsArmWriteTlbiasidis(archMmu->asid);
+    OsArmWriteTlbiasid(archMmu->asid);
    OsFreeAsid(archMmu->asid);
 #endif
    (VOID)LOS_MuxDestroy(&archMmu->mtx);
--- a/arch/arm/arm/src/los_exc.c
+++ b/arch/arm/arm/src/los_exc.c
@@ -228,8 +228,7 @@ UINT32 OsArmSharedPageFault(UINT32 excType, ExcContext *frame, UINT32 far, UINT3
            break;
        }
        default:
-            OsArmWriteTlbimvaais(ROUNDDOWN(far, PAGE_SIZE));
-            ret = LOS_OK;
+            ret = LOS_ERRNO_VM_NOT_FOUND;
            break;
    }
 #if defined(LOSCFG_KERNEL_SMP) && defined(LOSCFG_DEBUG_VERSION)
@@ -277,8 +276,8 @@ STATIC const CHAR *g_excTypeString[] = {
 #ifdef LOSCFG_KERNEL_VM
 STATIC VADDR_T OsGetTextRegionBase(LosVmMapRegion *region, LosProcessCB *runProcess)
 {
-    struct Vnode *curVnode = NULL;
-    struct Vnode *lastVnode = NULL;
+    struct file *curFilep = NULL;
+    struct file *lastFilep = NULL;
    LosVmMapRegion *curRegion = NULL;
    LosVmMapRegion *lastRegion = NULL;

@@ -297,9 +296,9 @@ STATIC VADDR_T OsGetTextRegionBase(LosVmMapRegion *region, LosProcessCB *runProc
        if ((lastRegion == NULL) || !LOS_IsRegionFileValid(lastRegion)) {
            goto DONE;
        }
-        curVnode = curRegion->unTypeData.rf.vnode;
-        lastVnode = lastRegion->unTypeData.rf.vnode;
-    } while (curVnode == lastVnode);
+        curFilep = curRegion->unTypeData.rf.file;
+        lastFilep = lastRegion->unTypeData.rf.file;
+    } while (!strcmp(curFilep->f_path, lastFilep->f_path));

 DONE:
 #ifdef LOSCFG_KERNEL_DYNLOAD
@@ -455,7 +454,7 @@ STATIC VOID OsDumpExcVaddrRegion(LosVmSpace *space, LosVmMapRegion *region)
            mmuFlag = FALSE;
        }
        PrintExcInfo("       0x%08x   0x%08x   0x%08x\n",
-                     startVaddr, (UINTPTR)LOS_PaddrToKVaddr(startPaddr), (UINT32)pageCount << PAGE_SHIFT);
+                     startVaddr, LOS_PaddrToKVaddr(startPaddr), (UINT32)pageCount << PAGE_SHIFT);
        pageCount = 0;
        startPaddr = 0;
    }
@@ -516,7 +515,7 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)

    for (excReg = &(excBufAddr->R0); count <= DUMPREGS; excReg++, count++) {
        if (IS_VALID_ADDR(*excReg)) {
-            PrintExcInfo("\ndump mem around R%u:0x%x", count, (*excReg));
+            PrintExcInfo("\ndump mem around R%u:%p", count, (*excReg));
            OsDumpMemByte(DUMPSIZE, ((*excReg) - (DUMPSIZE >> 1)));
        }
    }
@@ -812,7 +811,7 @@ VOID OsCallStackInfo(VOID)
    PrintExcInfo("runTask->stackPointer = 0x%x\n"
                 "runTask->topOfStack = 0x%x\n"
                 "text_start:0x%x,text_end:0x%x\n",
-                 (UINTPTR)stackPointer, runTask->topOfStack, &__text_start, &__text_end);
+                 stackPointer, runTask->topOfStack, &__text_start, &__text_end);

    while ((stackPointer > (UINT32 *)runTask->topOfStack) && (count < OS_MAX_BACKTRACE)) {
        if ((*stackPointer > (UINTPTR)(&__text_start)) &&
@@ -995,12 +994,10 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
        g_currHandleExcCpuID = currCpuID;
        g_currHandleExcPID = OsCurrProcessGet()->processID;
        LOS_SpinUnlock(&g_excSerializerSpin);
-#ifndef LOSCFG_SAVE_EXCINFO
        if (g_excFromUserMode[currCpuID] == FALSE) {
            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID));
            HalIrqSendIpi(target, LOS_MP_IPI_HALT);
        }
-#endif
    } else if (g_excFromUserMode[currCpuID] == TRUE) {
        /* Both cores raise exceptions, and the current core is a user-mode exception.
         * Both cores are abnormal and come from the same process
@@ -1025,12 +1022,11 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
            while (1) {}
        }
    }
-#ifndef LOSCFG_SAVE_EXCINFO
+
    /* use halt ipi to stop other active cores */
    if (g_excFromUserMode[ArchCurrCpuid()] == FALSE) {
        WaitAllCpuStop(currCpuID);
    }
-#endif
 }
 #endif

--- a/arch/arm/arm/src/los_hw.c
+++ b/arch/arm/arm/src/los_hw.c
@@ -85,7 +85,7 @@ LITE_OS_SEC_TEXT_INIT VOID *OsTaskStackInit(UINT32 taskID, UINT32 stackSize, VOI
    taskContext->LR = (UINTPTR)OsTaskExit;  /* LR should be kept, to distinguish it's THUMB or ARM instruction */
    taskContext->R0 = taskID;               /* R0 */

-#ifdef LOSCFG_THUMB
+#ifdef LOSCFG_INTERWORK_THUMB
    taskContext->regCPSR = PSR_MODE_SVC_THUMB; /* CPSR (Enable IRQ and FIQ interrupts, THUMNB-mode) */
 #else
    taskContext->regCPSR = PSR_MODE_SVC_ARM;   /* CPSR (Enable IRQ and FIQ interrupts, ARM-mode) */
@@ -105,15 +105,7 @@ LITE_OS_SEC_TEXT_INIT VOID *OsTaskStackInit(UINT32 taskID, UINT32 stackSize, VOI

 LITE_OS_SEC_TEXT VOID OsUserCloneParentStack(VOID *childStack, UINTPTR parentTopOfStack, UINT32 parentStackSize)
 {
-    LosTaskCB *task = OsCurrTaskGet();
-    sig_cb *sigcb = &task->sig;
-    VOID *cloneStack = NULL;
-
-    if (sigcb->sigContext != NULL) {
-        cloneStack = (VOID *)((UINTPTR)sigcb->sigContext - sizeof(TaskContext));
-    } else {
-        cloneStack = (VOID *)(((UINTPTR)parentTopOfStack + parentStackSize) - sizeof(TaskContext));
-    }
+    VOID *cloneStack = (VOID *)(((UINTPTR)parentTopOfStack + parentStackSize) - sizeof(TaskContext));

    (VOID)memcpy_s(childStack, sizeof(TaskContext), cloneStack, sizeof(TaskContext));
    ((TaskContext *)childStack)->R0 = 0;
@@ -123,7 +115,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsUserTaskStackInit(TaskContext *context, UINTPTR tas
 {
    LOS_ASSERT(context != NULL);

-#ifdef LOSCFG_THUMB
+#ifdef LOSCFG_INTERWORK_THUMB
    context->regCPSR = PSR_MODE_USR_THUMB;
 #else
    context->regCPSR = PSR_MODE_USR_ARM;
--- a/arch/arm/arm/src/los_hwi.c
+++ b/arch/arm/arm/src/los_hwi.c
@@ -36,7 +36,7 @@
 #include "los_cpup_pri.h"
 #endif
 #include "los_sched_pri.h"
-#include "los_hook.h"
+

 /* spinlock for hwi module, only available on SMP mode */
 LITE_OS_SEC_BSS  SPIN_LOCK_INIT(g_hwiSpin);
@@ -84,7 +84,7 @@ VOID OsInterrupt(UINT32 intNum)
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
    OsCpupIrqStart();
 #endif
-    OsHookCall(LOS_HOOK_TYPE_ISR_ENTER, intNum);
+
    hwiForm = (&g_hwiForm[intNum]);
 #ifndef LOSCFG_NO_SHARED_IRQ
    while (hwiForm->pstNext != NULL) {
@@ -107,7 +107,6 @@ VOID OsInterrupt(UINT32 intNum)
 #endif
    ++g_hwiFormCnt[intNum];

-    OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, intNum);
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
    OsCpupIrqEnd(intNum);
 #endif
--- a/arch/arm/arm/src/smp.c
+++ b/arch/arm/arm/src/smp.c
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "smp.h"
-#include "arch_config.h"
-#include "los_base.h"
-#include "los_hw.h"
-#include "los_atomic.h"
-#include "los_arch_mmu.h"
-#include "los_init_pri.h"
-#include "gic_common.h"
-#include "los_task_pri.h"
-
-#ifdef LOSCFG_KERNEL_SMP
-
-extern VOID reset_vector(VOID);
-
-struct OsCpuInit {
-    ArchCpuStartFunc cpuStart;
-    VOID *arg;
-    Atomic initFlag;
-};
-
-STATIC struct OsCpuInit g_cpuInit[CORE_NUM - 1] = {0};
-
-VOID HalArchCpuOn(UINT32 cpuNum, ArchCpuStartFunc func, struct SmpOps *ops, VOID *arg)
-{
-    struct OsCpuInit *cpuInit = &g_cpuInit[cpuNum - 1];
-    UINTPTR startEntry = (UINTPTR)&reset_vector - KERNEL_VMM_BASE + SYS_MEM_BASE;
-    INT32 ret = 0;
-
-    cpuInit->cpuStart = func;
-    cpuInit->arg = arg;
-    cpuInit->initFlag = 0;
-
-    DCacheFlushRange((UINTPTR)cpuInit, (UINTPTR)cpuInit + sizeof(struct OsCpuInit));
-
-    LOS_ASSERT(ops != NULL);
-
-
-    ret = ops->SmpCpuOn(cpuNum, startEntry);
-    if (ret < 0) {
-        PRINT_ERR("cpu start failed, cpu num: %u, ret: %d\n", cpuNum, ret);
-        return;
-    }
-
-    while (!LOS_AtomicRead(&cpuInit->initFlag)) {
-        WFE;
-    }
-}
-
-VOID HalSecondaryCpuStart(VOID)
-{
-    UINT32 cpuid = ArchCurrCpuid();
-    struct OsCpuInit *cpuInit = &g_cpuInit[cpuid - 1];
-
-    OsCurrTaskSet(OsGetMainTask());
-
-    LOS_AtomicSet(&cpuInit->initFlag, 1);
-    SEV;
-
-#ifdef LOSCFG_KERNEL_MMU
-    OsArchMmuInitPerCPU();
-#endif
-
-    /* store each core's hwid */
-    CPU_MAP_SET(cpuid, OsHwIDGet());
-    HalIrqInitPercpu();
-    OsInitCall(LOS_INIT_LEVEL_ARCH);
-
-    cpuInit->cpuStart(cpuInit->arg);
-
-    while (1) {
-        WFI;
-    }
-}
-#endif
-
--- a/arch/arm/arm/src/startup/reset_vector_mp.S
+++ b/arch/arm/arm/src/startup/reset_vector_mp.S
@@ -28,7 +28,6 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 #define  ASSEMBLY
 #include "arch_config.h"
 #include "los_vm_boot.h"
@@ -55,8 +54,6 @@
    .extern __stack_chk_guard_setup
    .extern g_firstPageTable
    .extern g_mmuJumpPageTable
-    .extern g_archMmuInitMapping
-    .extern HalSecondaryCpuStart

    .equ MPIDR_CPUID_MASK, 0xffU

@@ -80,6 +77,14 @@
    bl      excstack_magic
 .endm

+/* param0 is physical address, param1 virtual address, param2 is sizes, param3 is flag */
+.macro PAGE_TABLE_SET param0, param1, param2, param3
+    ldr     r6, =\param0
+    ldr     r7, =\param1
+    ldr     r8, =\param2
+    ldr     r10, =\param3
+    bl      page_table_build
+.endm
    .code   32
    .section ".vectors","ax"

@@ -179,15 +184,12 @@ reloc_img_to_bottom_done:
    mov     r2, #MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS
    bl      memset_optimized                    /* optimized memset since r0 is 64-byte aligned */

-    ldr     r5, =g_archMmuInitMapping
-    add     r5, r5, r11
-init_mmu_loop:
-    ldmia   r5!, {r6-r10}                       /* r6 = phys, r7 = virt, r8 = size, r9 = mmu_flags, r10 = name */
-    cmp     r8, 0                               /* if size = 0, the mmu init done */
-    beq     init_mmu_done
-    bl      page_table_build
-    b       init_mmu_loop
-init_mmu_done:
+    PAGE_TABLE_SET SYS_MEM_BASE, KERNEL_VMM_BASE, KERNEL_VMM_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
+    PAGE_TABLE_SET SYS_MEM_BASE, UNCACHED_VMM_BASE, UNCACHED_VMM_SIZE, MMU_INITIAL_MAP_NORMAL_NOCACHE
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_DEVICE_BASE, PERIPH_DEVICE_SIZE, MMU_INITIAL_MAP_DEVICE
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_CACHED_BASE, PERIPH_CACHED_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_UNCACHED_BASE, PERIPH_UNCACHED_SIZE, MMU_INITIAL_MAP_STRONGLY_ORDERED
+
    orr     r8, r4, #MMU_TTBRx_FLAGS            /* r8 = r4 and set cacheable attributes on translation walk */
    ldr     r4, =g_mmuJumpPageTable             /* r4: jump pagetable vaddr */
    add     r4, r4, r11
@@ -203,7 +205,9 @@ init_mmu_done:
    str     r12, [r4, r7, lsr #(20 - 2)]        /* jumpTable[paIndex] = pt entry */
    rsb     r7, r11, r6, lsl #20                /* r7: va */
    str     r12, [r4, r7, lsr #(20 - 2)]        /* jumpTable[vaIndex] = pt entry */
-
+#endif
+    bl      _bootaddr_setup
+#ifdef LOSCFG_KERNEL_MMU
    bl      mmu_setup                           /* set up the mmu */
 #endif
    /* clear out the interrupt and exception stack and set magic num to check the overflow */
@@ -313,7 +317,6 @@ reset_platform:
    mov    r0, #0
    mov    pc, r0   // Jump to reset vector
 #endif
-
 cpu_start:
 #ifdef LOSCFG_KERNEL_MMU
    ldr     r4, =g_firstPageTable               /* r4 = physical address of translation table and clear it */
@@ -327,8 +330,7 @@ cpu_start:

    bl     mmu_setup
 #endif
-
-    bl     HalSecondaryCpuStart
+    bl     secondary_cpu_start
    b      .

 secondary_cpu_init:
@@ -368,9 +370,9 @@ sp_set:
 */
 #ifdef LOSCFG_KERNEL_MMU
 page_table_build:
-    mov     r10, r6
-    bfc     r10, #20, #12                       /* r9: pa % MB */
-    add     r8, r8, r10
+    mov     r9, r6
+    bfc     r9, #20, #12                        /* r9: pa % MB */
+    add     r8, r8, r9
    add     r8, r8, #(1 << 20)
    sub     r8, r8, #1
    lsr     r6, #20                             /* r6 = physical address / MB */
@@ -378,7 +380,7 @@ page_table_build:
    lsr     r8, #20                             /* r8 = roundup(size, MB) */

 page_table_build_loop:
-    orr     r12, r9, r6, lsl #20                /* r12: flags | physAddr */
+    orr     r12, r10, r6, lsl #20               /* r12: flags | physAddr */
    str     r12, [r4, r7, lsl #2]               /* gPgTable[l1Index] = physAddr | flags */
    add     r6, #1                              /* physAddr+ */
    add     r7, #1                              /* l1Index++ */
@@ -420,6 +422,24 @@ excstack_magic_loop:
    blt     excstack_magic_loop
    bx      lr

+/*
+ * 0xe51ff004 = "ldr  pc, [pc, #-4]"
+ * next addr value will be the real booting addr
+ */
+_bootaddr_setup:
+    mov     r0, #0
+    ldr     r1, =0xe51ff004
+    str     r1, [r0]
+
+    add     r0, r0, #4
+    ldr     r1, =SYS_MEM_BASE
+    str     r1, [r0]
+
+    dsb
+    isb
+
+    bx      lr
+
 #ifdef LOSCFG_KERNEL_MMU
 memset_optimized:
    mov     r3, r0
--- a/arch/arm/arm/src/startup/reset_vector_up.S
+++ b/arch/arm/arm/src/startup/reset_vector_up.S
@@ -54,7 +54,6 @@
    .extern __stack_chk_guard_setup
    .extern g_firstPageTable
    .extern g_mmuJumpPageTable
-    .extern g_archMmuInitMapping

    .equ MPIDR_CPUID_MASK, 0xffU

@@ -78,6 +77,14 @@
    bl      excstack_magic
 .endm

+/* param0 is physical address, param1 virtual address, param2 is sizes, param3 is flag */
+.macro PAGE_TABLE_SET param0, param1, param2, param3
+    ldr     r6, =\param0
+    ldr     r7, =\param1
+    ldr     r8, =\param2
+    ldr     r10, =\param3
+    bl      page_table_build
+.endm
    .code   32
    .section ".vectors","ax"

@@ -154,15 +161,12 @@ reloc_img_to_bottom_done:
    mov     r2, #MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS
    bl      memset_optimized                    /* optimized memset since r0 is 64-byte aligned */

-    ldr     r5, =g_archMmuInitMapping
-    add     r5, r5, r11
-init_mmu_loop:
-    ldmia   r5!, {r6-r10}                       /* r6 = phys, r7 = virt, r8 = size, r9 = mmu_flags, r10 = name */
-    cmp     r8, 0                               /* if size = 0, the mmu init done */
-    beq     init_mmu_done
-    bl      page_table_build
-    b       init_mmu_loop
-init_mmu_done:
+    PAGE_TABLE_SET SYS_MEM_BASE, KERNEL_VMM_BASE, KERNEL_VMM_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
+    PAGE_TABLE_SET SYS_MEM_BASE, UNCACHED_VMM_BASE, UNCACHED_VMM_SIZE, MMU_INITIAL_MAP_NORMAL_NOCACHE
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_DEVICE_BASE, PERIPH_DEVICE_SIZE, MMU_INITIAL_MAP_DEVICE
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_CACHED_BASE, PERIPH_CACHED_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
+    PAGE_TABLE_SET PERIPH_PMM_BASE, PERIPH_UNCACHED_BASE, PERIPH_UNCACHED_SIZE, MMU_INITIAL_MAP_STRONGLY_ORDERED
+
    orr     r8, r4, #MMU_TTBRx_FLAGS            /* r8 = r4 and set cacheable attributes on translation walk */
    ldr     r4, =g_mmuJumpPageTable             /* r4: jump pagetable vaddr */
    add     r4, r4, r11
@@ -227,6 +231,9 @@ warm_reset:
    LDR    r0, =__exception_handlers
    MCR    p15, 0, r0, c12, c0, 0

+    cmp    r11, #0
+    bne    cpu_start
+
 clear_bss:
    ldr    r0, =__bss_start
    ldr    r2, =__bss_end
@@ -303,6 +310,11 @@ reset_platform:
    mov    r0, #0
    mov    pc, r0   // Jump to reset vector
 #endif
+cpu_start:
+    bl     secondary_cpu_start
+    b      .
+
+

 /*
 * set sp for current cpu
@@ -324,9 +336,9 @@ sp_set:
 */
 #ifdef LOSCFG_KERNEL_MMU
 page_table_build:
-    mov     r10, r6
-    bfc     r10, #20, #12                       /* r9: pa % MB */
-    add     r8, r8, r10
+    mov     r9, r6
+    bfc     r9, #20, #12                        /* r9: pa % MB */
+    add     r8, r8, r9
    add     r8, r8, #(1 << 20)
    sub     r8, r8, #1
    lsr     r6, #20                             /* r6 = physical address / MB */
@@ -334,7 +346,7 @@ page_table_build:
    lsr     r8, #20                             /* r8 = roundup(size, MB) */

 page_table_build_loop:
-    orr     r12, r9, r6, lsl #20                /* r12: flags | physAddr */
+    orr     r12, r10, r6, lsl #20               /* r12: flags | physAddr */
    str     r12, [r4, r7, lsl #2]               /* gPgTable[l1Index] = physAddr | flags */
    add     r6, #1                              /* physAddr+ */
    add     r7, #1                              /* l1Index++ */
@@ -376,6 +388,24 @@ excstack_magic_loop:
    blt     excstack_magic_loop
    bx      lr

+/*
+ * 0xe51ff004 = "ldr  pc, [pc, #-4]"
+ * next addr value will be the real booting addr
+ */
+_bootaddr_setup:
+    mov     r0, #0
+    ldr     r1, =0xe51ff004
+    str     r1, [r0]
+
+    add     r0, r0, #4
+    ldr     r1, =SYS_MEM_BASE
+    str     r1, [r0]
+
+    dsb
+    isb
+
+    bx      lr
+
 #ifdef LOSCFG_KERNEL_MMU
 memset_optimized:
    mov     r3, r0
--- a/arch/arm/arm/src/strncpy_from_user.c
+++ b/arch/arm/arm/src/strncpy_from_user.c
@@ -46,7 +46,7 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count)
    }

    maxCount = (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)src, (size_t)count)) ? \
-                count : (INT32)(USER_ASPACE_TOP_MAX - (UINTPTR)src);
+                count : (USER_ASPACE_TOP_MAX - (UINTPTR)src);

    for (i = 0; i < maxCount; ++i) {
        if (LOS_GetUser(&character, src + offset) != LOS_OK) {
--- a/arch/arm/gic/BUILD.gn
+++ b/arch/arm/gic/BUILD.gn
@@ -1,41 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = []
-
-  if (defined(LOSCFG_ARCH_GIC_V2)) {
-    sources += [ "gic_v2.c" ]
-  } else if (defined(LOSCFG_ARCH_GIC_V3)) {
-    sources += [ "gic_v3.c" ]
-  }
-}
--- a/bsd/Kconfig
+++ b/bsd/Kconfig
@@ -1,14 +1,6 @@
 config  COMPAT_BSD
    bool "Enable FreeBSD"
    default y
-    select COMPAT_LINUXKPI

    help
      Answer Y to enable LiteOS support FreeBSD.
-
-config  COMPAT_LINUXKPI
-    bool "Enable linuxkpi" if COMPAT_BSD
-    default y
-
-    help
-      Answer Y to enable LiteOS support compatible layer for linuxkpi.
--- a/bsd/Makefile
+++ b/bsd/Makefile
@@ -33,8 +33,8 @@ MODULE_NAME := $(notdir $(shell pwd))

 LOCAL_SRCS  := $(wildcard kern/*.c)

-LOCAL_SRCS  += $(wildcard $(ARCH)/*.c)
-LOCAL_SRCS  += $(wildcard $(ARCH)/*.S)
+LOCAL_SRCS  += $(wildcard $(LITEOS_ARCH_ARM)/*.c)
+LOCAL_SRCS  += $(wildcard $(LITEOS_ARCH_ARM)/*.S)

 ifeq ($(LOSCFG_DRIVERS_RANDOM), y)
 LOCAL_SRCS += $(wildcard crypto/rijndael/*.c) \
--- a/bsd/compat/linuxkpi/BUILD.gn
+++ b/bsd/compat/linuxkpi/BUILD.gn
@@ -1,57 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_COMPAT_BSD)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "src/adp.c",
-    "src/linux_completion.c",
-    "src/linux_interrupt.c",
-    "src/linux_sched.c",
-    "src/linux_semaphore.c",
-    "src/linux_timer.c",
-    "src/linux_wakelock.c",
-    "src/linux_workqueue.c",
-    "src/prctl.c",
-    "src/tzdst.c",
-  ]
-
-  if (defined(LOSCFG_HRTIMER_ENABLE)) {
-    sources += [ "src/linux_hrtimer.c" ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/bsd/compat/linuxkpi/include/linux/mtd/mtd.h
+++ b/bsd/compat/linuxkpi/include/linux/mtd/mtd.h
@@ -0,0 +1 @@
+../../../../../../../../third_party/Linux_Kernel/fs/jffs2/mtd.h
--- a/bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h
+++ b/bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h
@@ -0,0 +1 @@
+../../../../../../../../third_party/Linux_Kernel/fs/jffs2/mtd_list.h
--- a/bsd/dev/usb/BUILD.gn
+++ b/bsd/dev/usb/BUILD.gn
@@ -1,150 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_USB)
-module_name = "usb_base"
-kernel_module(module_name) {
-  sources = [
-    "implementation/bsd_busspace.c",
-    "implementation/bsd_kernel.c",
-    "implementation/usb_btree.c",
-    "implementation/usb_busdma_loader.c",
-    "implementation/usb_init.c",
-    "implementation/usb_version.c",
-    "usb_debug.c",
-  ]
-
-  if (defined(LOSCFG_DRIVERS_USB)) {
-    sources += [
-      "controller/usb_controller.c",
-      "quirk/usb_quirk.c",
-      "usb_dev.c",
-      "usb_device.c",
-      "usb_dynamic.c",
-      "usb_error.c",
-      "usb_generic.c",
-      "usb_handle_request.c",
-      "usb_hub.c",
-      "usb_if.c",
-      "usb_lookup.c",
-      "usb_mbuf.c",
-      "usb_parse.c",
-      "usb_process.c",
-      "usb_request.c",
-      "usb_transfer.c",
-      "usb_util.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_4G_MODEM)) {
-    sources += [ "net/if_cdce.c" ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_ETHERNET)) {
-    sources += [
-      "net/if_axe.c",
-      "net/if_axge.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_RNDIS_HOST)) {
-    sources += [ "net/if_urndis.c" ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_4G_MODEM) ||
-      defined(LOSCFG_DRIVERS_USB_ETHERNET) ||
-      defined(LOSCFG_DRIVERS_USB_RNDIS_HOST)) {
-    sources += [
-      "net/usb_eth_drv.c",
-      "net/usb_ethernet.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_4G_MODEM) ||
-      defined(LOSCFG_DRIVERS_USB_SERIAL)) {
-    sources += [
-      "serial/u3g.c",
-      "serial/usb_serial.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_HOST_EHCI)) {
-    sources += [
-      "controller/ehci.c",
-      "controller/ehci_pci.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_HOST_XHCI) ||
-      defined(LOSCFG_DRIVERS_USB_HOST_XHCI_FOR_PORT2)) {
-    sources += [
-      "controller/xhci.c",
-      "controller/xhci_pci.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_WIRELESS)) {
-    sources += [ "linux_usb.c" ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_MASS_STORAGE)) {
-    sources += [ "storage/umass.c" ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_USB_HID_CLASS) &&
-      defined(LOSCFG_DRIVERS_HDF_INPUT)) {
-    sources += [
-      "input/uhid.c",
-      "usb_hid.c",
-    ]
-
-    include_dirs = [
-      "//drivers/framework/model/input/driver",
-      "//drivers/framework/include/core",
-      "//drivers/framework/core/common/include/host",
-      "//drivers/framework/utils",
-      "//drivers/framework/osal",
-      "//drivers/framework/ability/sbuf/include",
-      "//drivers/framework/include/osal",
-    ]
-  }
-
-  configs += [
-    "$HDFTOPDIR:hdf_config"
-  ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "." ]
-  include_dirs += [ "$LITEOSTHIRDPARTY/FreeBSD/sys/dev/evdev" ]
-}
--- a/build.sh
+++ b/build.sh
@@ -42,11 +42,41 @@ ohos_version=${9}
 sysroot_path=${10}
 arch_cflags=${11}
 device_path=${12}
-compile_prefix=${13}
-liteos_config_file=${14}

+echo "${board_name}" "${device_company}"
 echo "sh param:" "$@"

+function main() {
+    destination=".config"
+    tee=""
+    if [ "${tee_enable}" = "true" ]; then
+        tee="_tee"
+    fi
+
+    config_file="${product_path}/config/${ohos_build_type}${tee}.config"
+    if [ -f "${config_file}" ]; then
+        cp "${config_file}" "${destination}"
+        return
+    fi
+
+    product_name=$(basename "${product_path}")
+    config_file="${product_name}_release.config"
+    if [ "${ohos_build_compiler}" = "clang" ]; then
+        if [ "${ohos_build_type}" = "debug" ]; then
+            config_file="debug/${product_name}_${ohos_build_compiler}${tee}.config"
+        else
+            config_file="${product_name}_${ohos_build_compiler}_release${tee}.config"
+        fi
+    elif [ "${ohos_build_compiler}" = "gcc" ]; then
+        if [ "${ohos_build_type}" = "debug" ]; then
+            config_file="${product_name}_debug_shell${tee}.config"
+        else
+            config_file="${product_name}_release${tee}.config"
+        fi
+    fi
+    cp "tools/build/config/${config_file}" "${destination}"
+}
+
 if [ "x" != "x${sysroot_path}" ]; then
    export SYSROOT_PATH=${sysroot_path}
 fi
@@ -55,15 +85,10 @@ if [ "x" != "x${arch_cflags}" ]; then
    export ARCH_CFLAGS="${arch_cflags}"
 fi

+export OUTDIR="${outdir}"
 export PRODUCT_PATH="${product_path}"
 export DEVICE_PATH="${device_path}"

-export OUTDIR="${outdir}"
-export KCONFIG_CONFIG="${liteos_config_file}"
-export LITEOS_MENUCONFIG_H="${outdir}/config.h"
-export LITEOS_CONFIG_FILE="${outdir}/.config"
-export LITEOS_COMPILER_PATH="${compile_prefix%/*}/"
-export CROSS_COMPILE="${compile_prefix##*/}"
-
-mkdir -p "${outdir}"
-make -j all VERSION="${ohos_version}"
+main && \
+make clean && \
+make -j rootfs VERSION="${ohos_version}"
--- a/bundle.json
+++ b/bundle.json
@@ -1,59 +0,0 @@
-{
-    "name": "@ohos/kernel_liteos_a",
-    "version": "",
-    "description": "liteos-a内核",
-    "homePage": "https://gitee.com/openharmony",
-    "license": "BSD 3-clause",
-    "repository": "https://gitee.com/openharmony/kernel_liteos_a",
-    "domain": "os",
-    "language": "",
-    "publishAs": "code-segment",
-    "private": false,
-    "scripts": {},
-    "tags": [
-        "kernel"
-    ],
-    "keywords": [
-        "kernel",
-        "liteos-a"
-    ],
-    "envs": [],
-    "dirs": [],
-    "author": {
-        "name": "",
-        "email": "",
-        "url": ""
-    },
-    "contributors": [
-        {
-            "name": "",
-            "email": "",
-            "url": ""
-        }
-    ],
-    "segment": {
-        "destPath": "kernel/liteos_a"
-    },
-    "component": {
-        "name": "liteos-a",
-        "subsystem": "liteos_a",
-        "syscap": [
-            "SystemCapability.Kernel.liteos-a"
-        ],
-        "features": [],
-        "adated_system_type": [
-            "small"
-        ],
-        "rom": "",
-        "ram": "",
-        "deps": {
-            "components": [],
-            "third_party": []
-        },
-        "build": {
-            "sub_component": [],
-            "inner_kits": [],
-            "test": []
-        }
-    }
-}
--- a/compat/BUILD.gn
+++ b/compat/BUILD.gn
@@ -1,38 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-group("compat") {
-  deps = [ "posix" ]
-}
-
-config("public") {
-  configs = [ "posix:public" ]
-}
--- a/compat/posix/include/mqueue.h
+++ b/compat/posix/include/mqueue.h
@@ -81,11 +81,6 @@ typedef union send_receive_t {
    short data;
 } mode_s;

-struct mqnotify {
-    pid_t pid;
-    struct sigevent notify;
-};
-
 /* TYPE DEFINITIONS */
 struct mqarray {
    UINT32 mq_id : 31;
@@ -95,7 +90,7 @@ struct mqarray {
    mode_s mode_data; /* mode data of mqueue */
    uid_t euid; /* euid of mqueue */
    gid_t egid; /* egid of mqueue */
-    struct mqnotify mq_notify;
+    fd_set mq_fdset; /* mqueue sysFd bit map */
    LosQueueCB *mqcb;
    struct mqpersonal *mq_personal;
 };
@@ -422,8 +417,7 @@ extern int mq_timedsend(mqd_t personal, const char *msg, size_t msgLen,
 extern ssize_t mq_timedreceive(mqd_t personal, char *msg, size_t msgLen,
                               unsigned int *msgPrio, const struct timespec *absTimeout);

-extern void MqueueRefer(int sysFd);
-extern int OsMqNotify(mqd_t personal, const struct sigevent *sigev);
+extern void mqueue_refer(int sysFd);

 #ifdef __cplusplus
 #if __cplusplus
--- a/compat/posix/src/errno.c
+++ b/compat/posix/src/errno.c
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "errno.h"
-#include "los_errno.h"
-#include "los_task_pri.h"
-
-/* the specific errno get or set in interrupt service routine */
-static int errno_isr;
-
-int *__errno_location(void)
-{
-    LosTaskCB *runTask = NULL;
-
-    if (OS_INT_INACTIVE) {
-        runTask = OsCurrTaskGet();
-        return &runTask->errorNo;
-    } else {
-        return &errno_isr;
-    }
-}
-
-int *__errno(void) __attribute__((__weak__, __alias__("__errno_location")));
--- a/compat/posix/src/malloc.c
+++ b/compat/posix/src/malloc.c
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "stdlib.h"
-#include "string.h"
-#include "los_vm_map.h"
-
-/*
- * Allocates the requested memory and returns a pointer to it. The requested
- * size is nitems each size bytes long (total memory requested is nitems*size).
- * The space is initialized to all zero bits.
- */
-
-void *calloc(size_t nitems, size_t size)
-{ /*lint !e578*/
-    size_t real_size;
-    void *ptr = NULL;
-
-    if (nitems == 0 || size == 0) {
-        return NULL;
-    }
-
-    real_size = (size_t)(nitems * size);
-    ptr = LOS_KernelMalloc((UINT32) real_size);
-    if (ptr != NULL) {
-        (void) memset_s((void *) ptr, real_size, 0, real_size);
-    }
-    return ptr;
-}
-
-/*
- * Deallocates the memory previously allocated by a call to calloc, malloc, or
- * realloc. The argument ptr points to the space that was previously allocated.
- * If ptr points to a memory block that was not allocated with calloc, malloc,
- * or realloc, or is a space that has been deallocated, then the result is undefined.
- */
-
-void free(void *ptr)
-{
-    if (ptr == NULL) {
-        return;
-    }
-
-    LOS_KernelFree(ptr);
-}
-
-/*
- * Allocates the requested memory and returns a pointer to it. The requested
- * size is size bytes. The value of the space is indeterminate.
- */
-
-void *malloc(size_t size)
-{ /*lint !e31 !e10*/
-    if (size == 0) {
-        return NULL;
-    }
-
-    return LOS_KernelMalloc((UINT32) size);
-}
-
-void *zalloc(size_t size)
-{ /*lint !e10*/
-    void *ptr = NULL;
-
-    if (size == 0) {
-        return NULL;
-    }
-
-    ptr = LOS_KernelMalloc((UINT32) size);
-    if (ptr != NULL) {
-        (void) memset_s(ptr, size, 0, size);
-    }
-    return ptr;
-}
-
-/*
- * allocates a block of size bytes whose address is a multiple of boundary.
- * The boundary must be a power of two!
- */
-
-void *memalign(size_t boundary, size_t size)
-{
-    if (size == 0) {
-        return NULL;
-    }
-
-    return LOS_KernelMallocAlign((UINT32) size, (UINT32) boundary);
-}
-
-/*
- * Attempts to resize the memory block pointed to by ptr that was previously
- * allocated with a call to malloc or calloc. The contents pointed to by ptr are
- * unchanged. If the value of size is greater than the previous size of the
- * block, then the additional bytes have an undeterminate value. If the value
- * of size is less than the previous size of the block, then the difference of
- * bytes at the end of the block are freed. If ptr is null, then it behaves like
- * malloc. If ptr points to a memory block that was not allocated with calloc
- * or malloc, or is a space that has been deallocated, then the result is
- * undefined. If the new space cannot be allocated, then the contents pointed
- * to by ptr are unchanged. If size is zero, then the memory block is completely
- * freed.
- */
-
-void *realloc(void *ptr, size_t size)
-{
-    if (ptr == NULL) {
-        ptr = malloc(size);
-        return ptr;
-    }
-
-    if (size == 0) {
-        free(ptr);
-        return NULL;
-    }
-
-    return LOS_KernelRealloc(ptr, (UINT32) size);
-}
--- a/compat/posix/src/misc.c
+++ b/compat/posix/src/misc.c
@@ -30,15 +30,13 @@
 */

 #include "sys/types.h"
-#include "sys/resource.h"
 #include "unistd.h"
 #include "stdio.h"
 #include "pthread.h"
 #include "sys/utsname.h"
 #include "mqueue.h"
 #include "semaphore.h"
-#include "los_process_pri.h"
-#include "los_hw.h"
+

 /*
 * Supply some suitable values for constants that may not be present
@@ -54,27 +52,17 @@
 int uname(struct utsname *name)
 {
    INT32 ret;
-    const char *cpuInfo = NULL;
-
    if (name == NULL) {
        return -EFAULT;
    }
-    (VOID)strcpy_s(name->sysname, sizeof(name->sysname), KERNEL_NAME);
-    (VOID)strcpy_s(name->nodename, sizeof(name->nodename), "hisilicon");
-    ret = sprintf_s(name->version, sizeof(name->version), "%s %u.%u.%u.%u %s %s",
+    (VOID)strncpy_s(name->sysname, sizeof(name->sysname), KERNEL_NAME, strlen(KERNEL_NAME) + 1);
+    (VOID)strncpy_s(name->nodename, sizeof(name->nodename), "hisilicon", strlen("hisilicon") + 1);
+    ret = snprintf_s(name->version, sizeof(name->version), sizeof(name->version) - 1, "%s %u.%u.%u.%u %s %s\n",
                     KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, __DATE__, __TIME__);
    if (ret < 0) {
        return -EIO;
    }
-
-    cpuInfo = LOS_CpuInfo();
-    (VOID)strcpy_s(name->machine, sizeof(name->machine), cpuInfo);
-    ret = sprintf_s(name->release, sizeof(name->release), "%u.%u.%u.%u",
-                     KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE);
-    if (ret < 0) {
-        return -EIO;
-    }
-
+    name->machine[0] = '\0';
    name->domainname[0] = '\0';
    return 0;
 }
@@ -152,50 +140,3 @@ pid_t getpid(void)
    return ((LosTaskCB *)(OsCurrTaskGet()))->taskID;
 }

-int getrlimit(int resource, struct rlimit *rlim)
-{
-    LosProcessCB *pcb = OsCurrProcessGet();
-
-    switch (resource) {
-        case RLIMIT_NOFILE:
-        case RLIMIT_FSIZE:
-            break;
-        default:
-            return -EINVAL;
-    }
-    rlim->rlim_cur = pcb->pl_rlimit[resource].rlim_cur;
-    rlim->rlim_max = pcb->pl_rlimit[resource].rlim_max;
-
-    return 0;
-}
-
-#define FSIZE_RLIMIT 0XFFFFFFFF
-#ifndef NR_OPEN_DEFAULT
-#define NR_OPEN_DEFAULT 1024
-#endif
-int setrlimit(int resource, const struct rlimit *rlim)
-{
-    LosProcessCB *pcb = OsCurrProcessGet();
-
-    if (rlim->rlim_cur > rlim->rlim_max) {
-        return -EINVAL;
-    }
-    switch (resource) {
-        case RLIMIT_NOFILE:
-            if (rlim->rlim_max > NR_OPEN_DEFAULT) {
-                return -EPERM;
-            }
-            break;
-        case RLIMIT_FSIZE:
-            if (rlim->rlim_max > FSIZE_RLIMIT) {
-                return -EPERM;
-            }
-            break;
-        default:
-            return -EINVAL;
-    }
-    pcb->pl_rlimit[resource].rlim_cur = rlim->rlim_cur;
-    pcb->pl_rlimit[resource].rlim_max = rlim->rlim_max;
-
-    return 0;
-}
--- a/compat/posix/src/mqueue.c
+++ b/compat/posix/src/mqueue.c
@@ -49,7 +49,6 @@
 #endif

 /* GLOBALS */
-STATIC fd_set g_queueFdSet;
 STATIC struct mqarray g_queueTable[LOSCFG_BASE_IPC_QUEUE_LIMIT];
 STATIC pthread_mutex_t g_mqueueMutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 STATIC struct mqpersonal *g_mqPrivBuf[MAX_MQ_FD];
@@ -121,7 +120,6 @@ STATIC INT32 DoMqueueDelete(struct mqarray *mqueueCB)
    mqueueCB->mode_data.data = 0;
    mqueueCB->euid = -1;
    mqueueCB->egid = -1;
-    mqueueCB->mq_notify.pid = 0;

    ret = LOS_QueueDelete(mqueueCB->mq_id);
    switch (ret) {
@@ -206,7 +204,6 @@ STATIC struct mqpersonal *DoMqueueCreate(const struct mq_attr *attr, const CHAR
    mqueueCB->mq_personal->mq_flags = (INT32)((UINT32)openFlag | ((UINT32)attr->mq_flags & (UINT32)FNONBLOCK));
    mqueueCB->mq_personal->mq_mode = mode;
    mqueueCB->mq_personal->mq_refcount = 0;
-    mqueueCB->mq_notify.pid = 0;

    return mqueueCB->mq_personal;
 ERROUT:
@@ -248,44 +245,6 @@ ERROUT:
    return (struct mqpersonal *)-1;
 }

-STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
-{
-    struct mqarray *mqueueCB = NULL;
-    struct mqpersonal *tmp = NULL;
-
-    mqueueCB = privateMqPersonal->mq_posixdes;
-    if (mqueueCB == NULL || mqueueCB->mq_personal == NULL) {
-        errno = EBADF;
-        return LOS_NOK;
-    }
-
-    /* find the personal and remove */
-    if (mqueueCB->mq_personal == privateMqPersonal) {
-        mqueueCB->mq_personal = privateMqPersonal->mq_next;
-    } else {
-        for (tmp = mqueueCB->mq_personal; tmp->mq_next != NULL; tmp = tmp->mq_next) {
-            if (tmp->mq_next == privateMqPersonal) {
-                break;
-            }
-        }
-        if (tmp->mq_next == NULL) {
-            errno = EBADF;
-            return LOS_NOK;
-        }
-        tmp->mq_next = privateMqPersonal->mq_next;
-    }
-    /* flag no use */
-    privateMqPersonal->mq_status = 0;
-
-    /* free the personal */
-    (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
-
-    if ((mqueueCB->unlinkflag == TRUE) && (mqueueCB->mq_personal == NULL)) {
-        return DoMqueueDelete(mqueueCB);
-    }
-    return LOS_OK;
-}
-
 /* Translate a sysFd into privateMqPersonal */
 STATIC struct mqpersonal *MqGetPrivDataBuff(mqd_t personal)
 {
@@ -311,24 +270,29 @@ STATIC struct mqpersonal *MqGetPrivDataBuff(mqd_t personal)
 STATIC INT32 MqAllocSysFd(int maxfdp, struct mqpersonal *privateMqPersonal)
 {
    INT32 i;
-    fd_set *fdset = &g_queueFdSet;
+    struct mqarray *mqueueCB = privateMqPersonal->mq_posixdes;
+    fd_set *fdset = &mqueueCB->mq_fdset;
    for (i = 0; i < maxfdp; i++) {
        /* sysFd: used bit setting, and get the index of swtmrID buffer */
-        if (fdset && !(FD_ISSET(i + MQUEUE_FD_OFFSET, fdset))) {
+        if (!(fdset && FD_ISSET(i + MQUEUE_FD_OFFSET, fdset))) {
            FD_SET(i + MQUEUE_FD_OFFSET, fdset);
            if (!g_mqPrivBuf[i]) {
-                g_mqPrivBuf[i] = privateMqPersonal;
+                g_mqPrivBuf[i] = mqueueCB->mq_personal;
                return i + MQUEUE_FD_OFFSET;
            }
        }
    }
+    /* there are no more mq sysFd to use, free the personal */
+    LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
+    privateMqPersonal = NULL;
+    mqueueCB->mq_personal = NULL;
    return -1;
 }

-STATIC VOID MqFreeSysFd(mqd_t personal)
+STATIC VOID MqFreeSysFd(struct mqarray *mqueueCB, mqd_t personal)
 {
    INT32 sysFd = (INT32)personal;
-    fd_set *fdset = &g_queueFdSet;
+    fd_set *fdset = &mqueueCB->mq_fdset;
    if (fdset && FD_ISSET(sysFd, fdset)) {
        FD_CLR(sysFd, fdset);
        g_mqPrivBuf[sysFd - MQUEUE_FD_OFFSET] = NULL;
@@ -336,7 +300,7 @@ STATIC VOID MqFreeSysFd(mqd_t personal)
 }

 /* Mqueue fd reference count */
-void MqueueRefer(int sysFd)
+void mqueue_refer(int sysFd)
 {
    struct mqarray *mqueueCB = NULL;
    struct mqpersonal *privateMqPersonal = NULL;
@@ -351,11 +315,10 @@ void MqueueRefer(int sysFd)
    if (mqueueCB == NULL) {
        goto OUT_UNLOCK;
    }
-
    privateMqPersonal->mq_refcount++;
+    mqueueCB->unlink_ref++;
 OUT_UNLOCK:
    (VOID)pthread_mutex_unlock(&g_mqueueMutex);
-    return;
 }

 STATIC INT32 MqTryClose(struct mqpersonal *privateMqPersonal)
@@ -374,6 +337,15 @@ STATIC INT32 MqTryClose(struct mqpersonal *privateMqPersonal)
    return FALSE;
 }

+STATIC INT32 MqTryUnlink(struct mqarray *mqueueCB)
+{
+    if (mqueueCB->unlink_ref == 0) {
+        return TRUE;
+    }
+    mqueueCB->unlink_ref--;
+    return FALSE;
+}
+
 /* Set the mode data bit,for consumer's mode comparing. */
 STATIC INT32 MqueueModeAnalysisSet(struct mqpersonal *privateMqPersonal)
 {
@@ -520,9 +492,6 @@ mqd_t mq_open(const char *mqName, int openFlag, ...)
        }
        /* Set mode data bit ,just for the first node */
        if (MqueueModeAnalysisSet(privateMqPersonal)) {
-            if ((INT32)(UINTPTR)privateMqPersonal > 0) {
-                (VOID)DoMqueueClose(privateMqPersonal);
-            }
            goto OUT;
        }
    } else {
@@ -531,18 +500,15 @@ mqd_t mq_open(const char *mqName, int openFlag, ...)
        }
        privateMqPersonal = DoMqueueOpen(mqueueCB, openFlag);
    }
-
+OUT:
    if ((INT32)(UINTPTR)privateMqPersonal > 0) {
        /* alloc sysFd */
        sysFd = MqAllocSysFd(MAX_MQ_FD, privateMqPersonal);
        if (sysFd == -1) {
-            /* there are no more mq sysFd to use, close the personal */
-            (VOID)DoMqueueClose(privateMqPersonal);
            errno = ENFILE;
        }
        mqFd = (mqd_t)sysFd;
    }
-OUT:
    (VOID)pthread_mutex_unlock(&g_mqueueMutex);
    return mqFd;
 }
@@ -550,7 +516,9 @@ OUT:
 int mq_close(mqd_t personal)
 {
    INT32 ret = -1;
+    struct mqarray *mqueueCB = NULL;
    struct mqpersonal *privateMqPersonal = NULL;
+    struct mqpersonal *tmp = NULL;

    (VOID)pthread_mutex_lock(&g_mqueueMutex);

@@ -564,18 +532,47 @@ int mq_close(mqd_t personal)
        errno = EBADF;
        goto OUT_UNLOCK;
    }
-
+    /* there have other thread used the fd */
    if (!MqTryClose(privateMqPersonal)) {
        ret = 0;
        goto OUT_UNLOCK;
    }
-
-    ret = DoMqueueClose(privateMqPersonal);
-    if (ret < 0) {
+    mqueueCB = privateMqPersonal->mq_posixdes;
+    if (mqueueCB->mq_personal == NULL) {
+        errno = EBADF;
        goto OUT_UNLOCK;
    }
-    MqFreeSysFd(personal);

+    /* find the personal and remove */
+    if (mqueueCB->mq_personal == privateMqPersonal) {
+        mqueueCB->mq_personal = privateMqPersonal->mq_next;
+    } else {
+        for (tmp = mqueueCB->mq_personal; tmp->mq_next != NULL; tmp = tmp->mq_next) {
+            if (tmp->mq_next == privateMqPersonal) {
+                break;
+            }
+        }
+        if (tmp->mq_next == NULL) {
+            errno = EBADF;
+            goto OUT_UNLOCK;
+        }
+        tmp->mq_next = privateMqPersonal->mq_next;
+    }
+    /* flag no use */
+    privateMqPersonal->mq_status = 0;
+    MqFreeSysFd(mqueueCB, personal);
+
+    /* free the personal */
+    ret = LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
+    if (ret != LOS_OK) {
+        errno = EFAULT;
+        ret = -1;
+        goto OUT_UNLOCK;
+    }
+
+    if ((mqueueCB->unlinkflag == TRUE) && (mqueueCB->mq_personal == NULL)) {
+        ret = DoMqueueDelete(mqueueCB);
+    }
 OUT_UNLOCK:
    (VOID)pthread_mutex_unlock(&g_mqueueMutex);
    return ret;
@@ -668,7 +665,10 @@ int mq_unlink(const char *mqName)
        errno = ENOENT;
        goto ERROUT_UNLOCK;
    }
-
+    if (!MqTryUnlink(mqueueCB)) {
+        (VOID)pthread_mutex_unlock(&g_mqueueMutex);
+        return 0;
+    }
    if (mqueueCB->mq_personal != NULL) {
        mqueueCB->unlinkflag = TRUE;
    } else if (mqueueCB->unlink_ref == 0) {
@@ -717,35 +717,6 @@ STATIC INLINE BOOL MqParamCheck(mqd_t personal, const char *msg, size_t msgLen)
    return TRUE;
 }

-/*
- * Send realtime a signal to process which registered itself
- * successfully by mq_notify.
- */
-static void MqSendNotify(struct mqarray *mqueueCB)
-{
-    struct mqnotify *mqnotify = &mqueueCB->mq_notify;
-
-    if ((mqnotify->pid) && (mqueueCB->mqcb->readWriteableCnt[OS_QUEUE_READ] == 0)) {
-        siginfo_t info;
-
-        switch (mqnotify->notify.sigev_notify) {
-            case SIGEV_SIGNAL:
-                /* sends signal */
-                /* Create the siginfo structure */
-                info.si_signo = mqnotify->notify.sigev_signo;
-                info.si_code = SI_MESGQ;
-                info.si_value = mqnotify->notify.sigev_value;
-                OsDispatch(mqnotify->pid, &info, OS_USER_KILL_PERMISSION);
-                break;
-            case SIGEV_NONE:
-            default:
-                break;
-        }
-        /* after notification unregisters process */
-        mqnotify->pid = 0;
-    }
-}
-
 #define OS_MQ_GOTO_ERROUT_UNLOCK_IF(expr, errcode) \
    if (expr) {                        \
        errno = errcode;                 \
@@ -783,10 +754,6 @@ int mq_timedsend(mqd_t personal, const char *msg, size_t msgLen, unsigned int ms
    mqueueID = mqueueCB->mq_id;
    (VOID)pthread_mutex_unlock(&g_mqueueMutex);

-    if (LOS_ListEmpty(&mqueueCB->mqcb->readWriteList[OS_QUEUE_READ])) {
-        MqSendNotify(mqueueCB);
-    }
-
    err = LOS_QueueWriteCopy(mqueueID, (VOID *)msg, (UINT32)msgLen, (UINT32)absTicks);
    if (map_errno(err) != ENOERR) {
        goto ERROUT;
@@ -865,82 +832,4 @@ ssize_t mq_receive(mqd_t personal, char *msg_ptr, size_t msg_len, unsigned int *
    return mq_timedreceive(personal, msg_ptr, msg_len, msg_prio, NULL);
 }

-STATIC INLINE BOOL MqNotifyParamCheck(mqd_t personal, const struct sigevent *sigev)
-{
-    if (personal < 0) {
-        errno = EBADF;
-        goto ERROUT;
-    }
-
-    if (sigev != NULL) {
-        if (sigev->sigev_notify != SIGEV_NONE && sigev->sigev_notify != SIGEV_SIGNAL) {
-            errno = EINVAL;
-            goto ERROUT;
-        }
-        if (sigev->sigev_notify == SIGEV_SIGNAL && !GOOD_SIGNO(sigev->sigev_signo)) {
-            errno = EINVAL;
-            goto ERROUT;
-        }
-    }
-
-    return TRUE;
-ERROUT:
-    return FALSE;
-}
-
-int OsMqNotify(mqd_t personal, const struct sigevent *sigev)
-{
-    struct mqarray *mqueueCB = NULL;
-    struct mqnotify *mqnotify = NULL;
-    struct mqpersonal *privateMqPersonal = NULL;
-
-    if (!MqNotifyParamCheck(personal, sigev)) {
-        goto ERROUT;
-    }
-
-    (VOID)pthread_mutex_lock(&g_mqueueMutex);
-    privateMqPersonal = MqGetPrivDataBuff(personal);
-    if (privateMqPersonal == NULL) {
-        goto OUT_UNLOCK;
-    }
-
-    if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
-        errno = EBADF;
-        goto OUT_UNLOCK;
-    }
-
-    mqueueCB = privateMqPersonal->mq_posixdes;
-    mqnotify = &mqueueCB->mq_notify;
-
-    if (sigev == NULL) {
-        if (mqnotify->pid == LOS_GetCurrProcessID()) {
-            mqnotify->pid = 0;
-        }
-    } else if (mqnotify->pid != 0) {
-        errno = EBUSY;
-        goto OUT_UNLOCK;
-    } else {
-        switch (sigev->sigev_notify) {
-            case SIGEV_NONE:
-                mqnotify->notify.sigev_notify = SIGEV_NONE;
-                break;
-            case SIGEV_SIGNAL:
-                mqnotify->notify.sigev_signo = sigev->sigev_signo;
-                mqnotify->notify.sigev_value = sigev->sigev_value;
-                mqnotify->notify.sigev_notify = SIGEV_SIGNAL;
-                break;
-            default:
-                break;
-        }
-
-        mqnotify->pid = LOS_GetCurrProcessID();
-    }
-
-    (VOID)pthread_mutex_unlock(&g_mqueueMutex);
-    return 0;
-OUT_UNLOCK:
-    (VOID)pthread_mutex_unlock(&g_mqueueMutex);
-ERROUT:
-    return -1;
-}
 #endif
--- a/compat/posix/src/pthread.c
+++ b/compat/posix/src/pthread.c
@@ -231,7 +231,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,

    SetPthreadAttr(self, attr, &userAttr);

-    (VOID)snprintf_s(name, sizeof(name), sizeof(name) - 1, "pth%02u", pthreadNumber);
+    (VOID)snprintf_s(name, sizeof(name), sizeof(name) - 1, "pth%02d", pthreadNumber);
    pthreadNumber++;

    taskInitParam.pcName       = name;
--- a/compat/posix/src/sched.c
+++ b/compat/posix/src/sched.c
@@ -138,8 +138,3 @@ int __sched_cpucount(size_t set_size, const cpu_set_t* set)
    return count;
 }

-int sched_yield()
-{
-    (void)LOS_TaskYield();
-    return 0;
-}
--- a/compat/posix/src/stdio.c
+++ b/compat/posix/src/stdio.c
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#ifdef LOSCFG_FS_VFS
-#include <fs/fs.h>
-
-off_t _lseek(int fd, off_t offset, int whence)
-{
-    int ret;
-    struct file *filep = NULL;
-
-    /* Get the file structure corresponding to the file descriptor. */
-    ret = fs_getfilep(fd, &filep);
-    if (ret < 0) {
-        /* The errno value has already been set */
-        return (off_t)-get_errno();
-    }
-
-    /* libc seekdir function should set the whence to SEEK_SET, so we can discard
-     * the whence argument here */
-    if (filep->f_oflags & O_DIRECTORY) {
-        /* defensive coding */
-        if (filep->f_dir == NULL) {
-            return (off_t)-EINVAL;
-        }
-        if (offset == 0) {
-            rewinddir(filep->f_dir);
-        } else {
-            seekdir(filep->f_dir, offset);
-        }
-        ret = telldir(filep->f_dir);
-        if (ret < 0) {
-            return (off_t)-get_errno();
-        }
-        return ret;
-    }
-
-    /* Then let file_seek do the real work */
-    ret = file_seek(filep, offset, whence);
-    if (ret < 0) {
-        return -get_errno();
-    }
-    return ret;
-}
-
-off64_t _lseek64(int fd, int offsetHigh, int offsetLow, off64_t *result, int whence)
-{
-    off64_t ret;
-    struct file *filep = NULL;
-    off64_t offset = ((off64_t)offsetHigh << 32) + (uint)offsetLow; /* 32: offsetHigh is high 32 bits */
-
-    /* Get the file structure corresponding to the file descriptor. */
-    ret = fs_getfilep(fd, &filep);
-    if (ret < 0) {
-        /* The errno value has already been set */
-        return (off64_t)-get_errno();
-    }
-
-    /* libc seekdir function should set the whence to SEEK_SET, so we can discard
-     * the whence argument here */
-    if (filep->f_oflags & O_DIRECTORY) {
-        /* defensive coding */
-        if (filep->f_dir == NULL) {
-            return (off64_t)-EINVAL;
-        }
-        if (offsetLow == 0) {
-            rewinddir(filep->f_dir);
-        } else {
-            seekdir(filep->f_dir, offsetLow);
-        }
-        ret = telldir(filep->f_dir);
-        if (ret < 0) {
-            return (off64_t)-get_errno();
-        }
-        goto out;
-    }
-
-    /* Then let file_seek do the real work */
-    ret = file_seek64(filep, offset, whence);
-    if (ret < 0) {
-        return (off64_t)-get_errno();
-    }
-
-out:
-    *result = ret;
-
-    return 0;
-}
-
-#endif
--- a/compat/posix/src/time.c
+++ b/compat/posix/src/time.c
@@ -452,25 +452,11 @@ int clock_settime(clockid_t clockID, const struct timespec *tp)
 }

 #ifdef LOSCFG_KERNEL_CPUP
-inline UINT32 GetTidFromClockID(clockid_t clockID)
-{
-    // In musl/src/thread/pthread_getcpuclockid.c, we know 'clockid = (-tid - 1) * 8 + 6' 
-    UINT32 tid = -(clockID - 6) / 8 - 1; // 6 8 1 inverse operation from clockID to tid
-    return tid;
-}
-
-inline const pid_t GetPidFromClockID(clockid_t clockID)
-{
-    // In musl/src/time/clock_getcpuclockid.c, we know 'clockid = (-pid - 1) * 8 + 2'
-    const pid_t pid = -(clockID - 2) / 8 - 1; // 2 8 1 inverse operation from clockID to pid
-    return pid;
-}
-
 static int PthreadGetCputime(clockid_t clockID, struct timespec *ats)
 {
    uint64_t runtime;
    UINT32 intSave;
-    UINT32 tid = GetTidFromClockID(clockID);
+    UINT32 tid = ((UINT32) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET));

    if (OS_TID_CHECK_INVALID(tid)) {
        return -EINVAL;
@@ -496,7 +482,7 @@ static int ProcessGetCputime(clockid_t clockID, struct timespec *ats)
 {
    UINT64 runtime;
    UINT32 intSave;
-    const pid_t pid = GetPidFromClockID(clockID);
+    const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET));
    LosProcessCB *spcb = NULL;

    if (OsProcessIDUserCheckInvalid(pid) || pid < 0) {
@@ -538,7 +524,7 @@ static int GetCputime(clockid_t clockID, struct timespec *tp)
 static int CheckClock(const clockid_t clockID)
 {
    int error = 0;
-    const pid_t pid = GetPidFromClockID(clockID);
+    const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET));

    if (!((UINT32)clockID & CPUCLOCK_PERTHREAD_MASK)) {
        LosProcessCB *spcb = NULL;
@@ -964,11 +950,11 @@ int timer_getoverrun(timer_t timerID)
    return (overRun > DELAYTIMER_MAX) ? DELAYTIMER_MAX : overRun;
 }

-STATIC INT32 DoNanoSleep(UINT64 nanoseconds)
+STATIC INT32 DoNanoSleep(UINT64 useconds)
 {
    UINT32 ret;

-    ret = LOS_TaskDelay(OsNS2Tick(nanoseconds));
+    ret = LOS_TaskDelay(OsUS2Tick(useconds));
    if (ret == LOS_OK || ret == LOS_ERRNO_TSK_YIELD_NOT_ENOUGH_TASK) {
        return 0;
    }
@@ -977,12 +963,12 @@ STATIC INT32 DoNanoSleep(UINT64 nanoseconds)

 int usleep(unsigned useconds)
 {
-    return DoNanoSleep((UINT64)useconds * OS_SYS_NS_PER_US);
+    return DoNanoSleep((UINT64)useconds);
 }

 int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
-    UINT64 nanoseconds;
+    UINT64 useconds;
    INT32 ret = -1;

    (VOID)rmtp;
@@ -993,14 +979,14 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
        return ret;
    }

-    nanoseconds = (UINT64)rqtp->tv_sec * OS_SYS_NS_PER_SECOND + rqtp->tv_nsec;
+    useconds = (UINT64)rqtp->tv_sec * OS_SYS_US_PER_SECOND + rqtp->tv_nsec / OS_SYS_NS_PER_US;

-    return DoNanoSleep(nanoseconds);
+    return DoNanoSleep(useconds);
 }

 unsigned int sleep(unsigned int seconds)
 {
-    return DoNanoSleep((UINT64)seconds * OS_SYS_NS_PER_SECOND);
+    return DoNanoSleep((UINT64)seconds * OS_SYS_US_PER_SECOND);
 }

 double difftime(time_t time2, time_t time1)
@@ -1135,19 +1121,3 @@ VOID OsVdsoTimeGet(VdsoDataPage *vdsoDataPage)
 }
 #endif

-time_t time(time_t *t)
-{
-    struct timeval tp;
-    int ret;
-
-    /* Get the current time from the system */
-    ret = gettimeofday(&tp, (struct timezone *)NULL);
-    if (ret == LOS_OK) {
-        /* Return the seconds since the epoch */
-        if (t) {
-            *t = tp.tv_sec;
-        }
-        return tp.tv_sec;
-    }
-    return (time_t)OS_ERROR;
-}
--- a/config.mk
+++ b/config.mk
@@ -29,8 +29,16 @@

 ############### this is a makefile that you can config it ###############
 -include $(LITEOSTOPDIR)/tools/build/mk/los_config.mk
+
+TOP_LD_PATH      = $(LITEOSTOPDIR)
+SCRIPTS_PATH     = $(LITEOS_SCRIPTPATH)
+LITEOS_MK_PATH   = $(MK_PATH)
+LITEOS_SUBDIRS   = $(LIB_SUBDIRS)
+LIB_BIGODIR      = $(LITEOS_LIB_BIGODIR)
+
 ##### liteos tables -u ldflags #####
-include $(LITEOSTOPDIR)/tools/build/mk/liteos_tables_ldflags.mk
+-include $(LITEOS_MK_PATH)/liteos_tables_ldflags.mk
+

 LITEOS_COPTS   := $(LITEOS_COPTS_DEBUG) $(LITEOS_COPTS_BASE)  \
                  $(LITEOS_COPTS_EXTRA) $(LITEOS_CORE_COPTS)
@@ -51,11 +59,3 @@ LITEOS_CXXFLAGS := $(LITEOS_CXXOPTS)     $(LITEOS_CXXMACRO) \
 LITEOS_LDFLAGS  := $(LITEOS_LD_OPTS)     $(LITEOS_LD_PATH) \
                   $(LITEOS_LD_SCRIPT)

-# clear all local variables
-LOCAL_FLAGS    :=
-LOCAL_CFLAGS   :=
-LOCAL_CPPFLAGS :=
-LOCAL_ASFLAGS  :=
-LOCAL_SRCS     :=
-LOCAL_CHS      :=
-LOCAL_CPPHS    :=
--- a/drivers/BUILD.gn
+++ b/drivers/BUILD.gn
@@ -1,56 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-group("drivers") {
-  deps = [
-    "block/disk",
-    "char/bch",
-    "char/mem",
-    "char/quickstart",
-    "char/random",
-    "char/trace",
-    "char/video",
-    "mtd/multi_partition",
-  ]
-}
-
-config("public") {
-  configs = [
-    "block/disk:public",
-    "char/bch:public",
-    "char/mem:public",
-    "char/quickstart:public",
-    "char/random:public",
-    "char/video:public",
-    "char/trace:public",
-    "mtd/multi_partition:public",
-  ]
-}
--- a/drivers/block/disk/BUILD.gn
+++ b/drivers/block/disk/BUILD.gn
@@ -1,45 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_FAT_DISK)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "src/disk.c",
-    "src/disk_shellcmd.c",
-  ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/block/disk/include/disk.h
+++ b/drivers/block/disk/include/disk.h
@@ -165,10 +165,6 @@ extern "C" {
 #define DISK_ATA_GET_MODEL      21  /* Get model name */
 #define DISK_ATA_GET_SN         22  /* Get serial number */

-#ifdef LOSCFG_FS_FAT_CACHE
-#define DISK_DIRECT_BUFFER_SIZE 4   /* los_disk direct io buffer when bcache is off */
-#endif
-
 typedef enum _disk_status_ {
    STAT_UNUSED,
    STAT_INUSED,
@@ -191,9 +187,6 @@ typedef struct _los_disk_ {
    CHAR *disk_name;
    LOS_DL_LIST head;       /* link head of all the partitions */
    struct pthread_mutex disk_mutex;
-#ifndef LOSCFG_FS_FAT_CACHE
-    UINT8 *buff;
-#endif
 } los_disk;

 typedef struct _los_part_ {
--- a/drivers/block/disk/src/disk.c
+++ b/drivers/block/disk/src/disk.c
@@ -36,10 +36,6 @@
 #include "sys/mount.h"
 #include "linux/spinlock.h"
 #include "path_cache.h"
-#ifndef LOSCFG_FS_FAT_CACHE
-#include "los_vm_common.h"
-#include "user_copy.h"
-#endif

 los_disk g_sysDisk[SYS_MAX_DISK];
 los_part g_sysPart[SYS_MAX_PART];
@@ -803,78 +799,6 @@ INT32 DiskPartitionRegister(los_disk *disk)
    return ENOERR;
 }

-#ifndef LOSCFG_FS_FAT_CACHE
-static INT32 disk_read_directly(los_disk *disk, VOID *buf, UINT64 sector, UINT32 count)
-{
-    INT32 result = VFS_ERROR;
-    struct block_operations *bops = (struct block_operations *)((struct drv_data *)disk->dev->data)->ops;
-    if ((bops == NULL) || (bops->read == NULL)) {
-        return VFS_ERROR;
-    }
-    if (LOS_IsUserAddressRange((VADDR_T)buf, count * disk->sector_size)) {
-        UINT32 cnt = 0;
-        UINT8 *buffer = disk->buff;
-        for (; count != 0; count -= cnt) {
-            cnt = (count > DISK_DIRECT_BUFFER_SIZE) ? DISK_DIRECT_BUFFER_SIZE : count;
-            result = bops->read(disk->dev, buffer, sector, cnt);
-            if (result == (INT32)cnt) {
-                result = ENOERR;
-            } else {
-                break;
-            }
-            if (LOS_CopyFromKernel(buf, disk->sector_size * cnt, buffer, disk->sector_size * cnt)) {
-                result = VFS_ERROR;
-                break;
-            }
-            buf = (UINT8 *)buf + disk->sector_size * cnt;
-            sector += cnt;
-        }
-    } else {
-        result = bops->read(disk->dev, buf, sector, count);
-        if (result == count) {
-            result = ENOERR;
-        }
-    }
-
-    return result;
-}
-
-static INT32 disk_write_directly(los_disk *disk, const VOID *buf, UINT64 sector, UINT32 count)
-{
-    struct block_operations *bops = (struct block_operations *)((struct drv_data *)disk->dev->data)->ops;
-    INT32 result = VFS_ERROR;
-    if ((bops == NULL) || (bops->read == NULL)) {
-        return VFS_ERROR;
-    }
-    if (LOS_IsUserAddressRange((VADDR_T)buf, count * disk->sector_size)) {
-        UINT32 cnt = 0;
-        UINT8 *buffer = disk->buff;
-        for (; count != 0; count -= cnt) {
-            cnt = (count > DISK_DIRECT_BUFFER_SIZE) ? DISK_DIRECT_BUFFER_SIZE : count;
-            if (LOS_CopyToKernel(buffer, disk->sector_size * cnt, buf, disk->sector_size * cnt)) {
-                result = VFS_ERROR;
-                break;
-            }
-            result = bops->write(disk->dev, buffer, sector, cnt);
-            if (result == (INT32)cnt) {
-                result = ENOERR;
-            } else {
-                break;
-            }
-            buf = (UINT8 *)buf + disk->sector_size * cnt;
-            sector += cnt;
-        }
-    } else {
-        result = bops->write(disk->dev, buf, sector, count);
-        if (result == count) {
-            result = ENOERR;
-        }
-    }
-
-    return result;
-}
-#endif
-
 INT32 los_disk_read(INT32 drvID, VOID *buf, UINT64 sector, UINT32 count, BOOL useRead)
 {
 #ifdef LOSCFG_FS_FAT_CACHE
@@ -913,14 +837,21 @@ INT32 los_disk_read(INT32 drvID, VOID *buf, UINT64 sector, UINT32 count, BOOL us
            PRINT_ERR("los_disk_read read err = %d, sector = %llu, len = %u\n", result, sector, len);
        }
    } else {
-        result = VFS_ERROR;
-    }
-#else
+#endif
    if (disk->dev == NULL) {
        goto ERROR_HANDLE;
    }
-    result = disk_read_directly(disk, buf, sector, count);
+    struct block_operations *bops = (struct block_operations *)((struct drv_data *)disk->dev->data)->ops;
+    if ((bops != NULL) && (bops->read != NULL)) {
+        result = bops->read(disk->dev, (UINT8 *)buf, sector, count);
+        if (result == (INT32)count) {
+            result = ENOERR;
+        }
+    }
+#ifdef LOSCFG_FS_FAT_CACHE
+    }
 #endif
+
    if (result != ENOERR) {
        goto ERROR_HANDLE;
    }
@@ -969,14 +900,18 @@ INT32 los_disk_write(INT32 drvID, const VOID *buf, UINT64 sector, UINT32 count)
            PRINT_ERR("los_disk_write write err = %d, sector = %llu, len = %u\n", result, sector, len);
        }
    } else {
-        result = VFS_ERROR;
-    }
-#else
-    if (disk->dev == NULL) {
-        goto ERROR_HANDLE;
-    }
-    result = disk_write_directly(disk, buf, sector, count);
 #endif
+    struct block_operations *bops = (struct block_operations *)((struct drv_data *)disk->dev->data)->ops;
+    if ((bops != NULL) && (bops->write != NULL)) {
+        result = bops->write(disk->dev, (UINT8 *)buf, sector, count);
+        if (result == (INT32)count) {
+            result = ENOERR;
+        }
+    }
+#ifdef LOSCFG_FS_FAT_CACHE
+    }
+#endif
+
    if (result != ENOERR) {
        goto ERROR_HANDLE;
    }
@@ -1218,8 +1153,7 @@ ERROR_HANDLE:

 INT32 los_disk_cache_clear(INT32 drvID)
 {
-    INT32 result = ENOERR;
-#ifdef LOSCFG_FS_FAT_CACHE
+    INT32 result;
    los_part *part = get_part(drvID);
    los_disk *disk = NULL;

@@ -1227,7 +1161,7 @@ INT32 los_disk_cache_clear(INT32 drvID)
        return VFS_ERROR;
    }
    result = OsSdSync(part->disk_id);
-    if (result != ENOERR) {
+    if (result != 0) {
        PRINTK("[ERROR]disk_cache_clear SD sync failed!\n");
        return result;
    }
@@ -1240,7 +1174,7 @@ INT32 los_disk_cache_clear(INT32 drvID)
    DISK_LOCK(&disk->disk_mutex);
    result = BcacheClearCache(disk->bcache);
    DISK_UNLOCK(&disk->disk_mutex);
-#endif
+
    return result;
 }

@@ -1390,10 +1324,6 @@ static INT32 DiskDeinit(los_disk *disk)

 #ifdef LOSCFG_FS_FAT_CACHE
    DiskCacheDeinit(disk);
-#else
-    if (disk->buff != NULL) {
-        free(disk->buff);
-    }
 #endif

    disk->dev = NULL;
@@ -1414,15 +1344,12 @@ static INT32 DiskDeinit(los_disk *disk)
    return ENOERR;
 }

-static UINT32 OsDiskInitSub(const CHAR *diskName, INT32 diskID, los_disk *disk,
-                            struct geometry *diskInfo, struct Vnode *blkDriver)
+static VOID OsDiskInitSub(const CHAR *diskName, INT32 diskID, los_disk *disk,
+                          struct geometry *diskInfo, struct Vnode *blkDriver)
 {
    pthread_mutexattr_t attr;
 #ifdef LOSCFG_FS_FAT_CACHE
    OsBcache *bc = DiskCacheInit((UINT32)diskID, diskInfo, blkDriver);
-    if (bc == NULL) {
-        return VFS_ERROR;
-    }
    disk->bcache = bc;
 #endif

@@ -1431,16 +1358,6 @@ static UINT32 OsDiskInitSub(const CHAR *diskName, INT32 diskID, los_disk *disk,
    (VOID)pthread_mutex_init(&disk->disk_mutex, &attr);

    DiskStructInit(diskName, diskID, diskInfo, blkDriver, disk);
-
-#ifndef LOSCFG_FS_FAT_CACHE
-    disk->buff = malloc(diskInfo->geo_sectorsize * DISK_DIRECT_BUFFER_SIZE);
-    if (disk->buff == NULL) {
-        PRINT_ERR("OsDiskInitSub: direct buffer of disk init failed\n");
-        return VFS_ERROR;
-    }
-#endif
-
-    return ENOERR;
 }

 INT32 los_disk_init(const CHAR *diskName, const struct block_operations *bops,
@@ -1465,12 +1382,14 @@ INT32 los_disk_init(const CHAR *diskName, const struct block_operations *bops,
    ret = VnodeLookup(diskName, &blkDriver, 0);
    if (ret < 0) {
        VnodeDrop();
+        PRINT_ERR("disk_init : find %s fail!\n", diskName);
        ret = ENOENT;
        goto DISK_FIND_ERROR;
    }
    struct block_operations *bops2 = (struct block_operations *)((struct drv_data *)blkDriver->data)->ops;

-    if ((bops2 == NULL) || (bops2->geometry == NULL) || (bops2->geometry(blkDriver, &diskInfo) != 0)) {
+    if ((bops2 == NULL) || (bops2->geometry == NULL) ||
+        (bops2->geometry(blkDriver, &diskInfo) != 0)) {
        goto DISK_BLKDRIVER_ERROR;
    }

@@ -1478,12 +1397,7 @@ INT32 los_disk_init(const CHAR *diskName, const struct block_operations *bops,
        goto DISK_BLKDRIVER_ERROR;
    }

-    ret = OsDiskInitSub(diskName, diskID, disk, &diskInfo, blkDriver);
-    if (ret != ENOERR) {
-        (VOID)DiskDeinit(disk);
-        VnodeDrop();
-        return VFS_ERROR;
-    }
+    OsDiskInitSub(diskName, diskID, disk, &diskInfo, blkDriver);
    VnodeDrop();
    if (DiskDivideAndPartitionRegister(info, disk) != ENOERR) {
        (VOID)DiskDeinit(disk);
@@ -1508,13 +1422,10 @@ DISK_FIND_ERROR:

 INT32 los_disk_deinit(INT32 diskID)
 {
-    int ret;
    los_disk *disk = get_disk(diskID);
    if (disk == NULL) {
        return -EINVAL;
    }
-    ret = ForceUmountDev(disk->dev);
-    PRINTK("warning: %s lost, force umount ret = %d\n", disk->disk_name, ret);

    DISK_LOCK(&disk->disk_mutex);

--- a/drivers/char/bch/BUILD.gn
+++ b/drivers/char/bch/BUILD.gn
@@ -1,52 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_driver.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_register.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_unregister.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_cache.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_read.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_sem.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_setup.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_teardown.c",
-    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_write.c",
-  ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/char/mem/BUILD.gn
+++ b/drivers/char/mem/BUILD.gn
@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_MEM)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [ "src/mem.c" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/char/quickstart/BUILD.gn
+++ b/drivers/char/quickstart/BUILD.gn
@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_QUICKSTART)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [ "src/quickstart.c" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/char/random/BUILD.gn
+++ b/drivers/char/random/BUILD.gn
@@ -1,46 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_RANDOM)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [ "src/random.c" ]
-
-  if (defined(LOSCFG_HW_RANDOM_ENABLE)) {
-    sources += [ "src/random_hw.c" ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/char/trace/BUILD.gn
+++ b/drivers/char/trace/BUILD.gn
@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_TRACE)
-module_name = "trace_dev"
-kernel_module(module_name) {
-  sources = [ "src/trace.c" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/char/trace/Kconfig
+++ b/drivers/char/trace/Kconfig
@@ -1,6 +0,0 @@
-config DRIVERS_TRACE
-    bool "Enable TRACE DRIVER"
-    default y
-    depends on DRIVERS && FS_VFS && KERNEL_TRACE
-    help
-      Answer Y to enable LiteOS support trace in userspace.
--- a/drivers/char/trace/Makefile
+++ b/drivers/char/trace/Makefile
@@ -1,40 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(LITEOSTOPDIR)/config.mk
-
-MODULE_NAME := trace_dev
-
-LOCAL_SRCS :=  $(wildcard src/*.c)
-
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/drivers/char/trace/include
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
-include $(MODULE)
--- a/drivers/char/trace/include/los_dev_trace.h
+++ b/drivers/char/trace/include/los_dev_trace.h
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __LOS_DEV_TRACE_H__
-#define __LOS_DEV_TRACE_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-int DevTraceRegister(void);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#endif
--- a/drivers/char/trace/src/trace.c
+++ b/drivers/char/trace/src/trace.c
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fcntl.h"
-#include "linux/kernel.h"
-#include "sys/ioctl.h"
-#include "fs/driver.h"
-#include "los_dev_trace.h"
-#include "los_trace.h"
-#include "los_hook.h"
-#include "los_init.h"
-
-#define TRACE_DRIVER "/dev/trace"
-#define TRACE_DRIVER_MODE 0666
-
-/* trace ioctl */
-#define TRACE_IOC_MAGIC     'T'
-#define TRACE_START         _IO(TRACE_IOC_MAGIC, 1)
-#define TRACE_STOP          _IO(TRACE_IOC_MAGIC, 2)
-#define TRACE_RESET         _IO(TRACE_IOC_MAGIC, 3)
-#define TRACE_DUMP          _IO(TRACE_IOC_MAGIC, 4)
-#define TRACE_SET_MASK      _IO(TRACE_IOC_MAGIC, 5)
-
-static int TraceOpen(struct file *filep)
-{
-    return 0;
-}
-
-static int TraceClose(struct file *filep)
-{
-    return 0;
-}
-
-static ssize_t TraceRead(struct file *filep, char *buffer, size_t buflen)
-{
-    /* trace record buffer read */
-    ssize_t len = buflen;
-    OfflineHead *records;
-    int ret;
-    int realLen;
-
-    if (len % sizeof(unsigned int)) {
-        PRINT_ERR("Buffer size not aligned by 4 bytes\n");
-        return -EINVAL;
-    }
-
-    records = LOS_TraceRecordGet();
-    if (records == NULL) {
-        PRINT_ERR("Trace read failed, check whether trace mode is set to offline\n");
-        return -EINVAL;
-    }
-
-    realLen = buflen < records->totalLen ? buflen : records->totalLen;
-    ret = LOS_CopyFromKernel((void *)buffer, buflen, (void *)records, realLen);
-    if (ret != 0) {
-        return -EINVAL;
-    }
-
-    return realLen;
-}
-
-static ssize_t TraceWrite(struct file *filep, const char *buffer, size_t buflen)
-{
-    /* trace usr event here */
-    int ret;
-    UsrEventInfo *info = NULL;
-    int infoLen = sizeof(UsrEventInfo);
-
-    if (buflen != infoLen) {
-        PRINT_ERR("Buffer size not %d bytes\n", infoLen);
-        return -EINVAL;
-    }
-
-    info = LOS_MemAlloc(m_aucSysMem0, infoLen);
-    if (info == NULL) {
-        return -ENOMEM;
-    }
-    memset_s(info, infoLen, 0, infoLen);
-
-    ret = LOS_CopyToKernel(info, infoLen, buffer, buflen);
-    if (ret != 0) {
-        LOS_MemFree(m_aucSysMem0, info);
-        return -EINVAL;
-    }
-    OsHookCall(LOS_HOOK_TYPE_USR_EVENT, info, infoLen);
-    return 0;
-}
-
-static int TraceIoctl(struct file *filep, int cmd, unsigned long arg)
-{
-    switch (cmd) {
-        case TRACE_START:
-            return LOS_TraceStart();
-        case TRACE_STOP:
-            LOS_TraceStop();
-            break;
-        case TRACE_RESET:
-            LOS_TraceReset();
-            break;
-        case TRACE_DUMP:
-            LOS_TraceRecordDump((BOOL)arg);
-            break;
-        case TRACE_SET_MASK:
-            LOS_TraceEventMaskSet((UINT32)arg);
-            break;
-        default:
-            PRINT_ERR("Unknown trace ioctl cmd:%d\n", cmd);
-            return -EINVAL;
-    }
-    return 0;
-}
-
-static const struct file_operations_vfs g_traceDevOps = {
-    TraceOpen,       /* open */
-    TraceClose,      /* close */
-    TraceRead,       /* read */
-    TraceWrite,      /* write */
-    NULL,            /* seek */
-    TraceIoctl,      /* ioctl */
-    NULL,            /* mmap */
-#ifndef CONFIG_DISABLE_POLL
-    NULL,            /* poll */
-#endif
-    NULL,            /* unlink */
-};
-
-int DevTraceRegister(void)
-{
-    return register_driver(TRACE_DRIVER, &g_traceDevOps, TRACE_DRIVER_MODE, 0); /* 0666: file mode */
-}
-
-LOS_MODULE_INIT(DevTraceRegister, LOS_INIT_LEVEL_KMOD_EXTENDED);
--- a/drivers/char/video/BUILD.gn
+++ b/drivers/char/video/BUILD.gn
@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_VIDEO)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [ "$LITEOSTHIRDPARTY/NuttX/drivers/video/fb.c" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "$LITEOSTHIRDPARTY/NuttX/include/nuttx/video" ]
-}
--- a/drivers/mtd/multi_partition/BUILD.gn
+++ b/drivers/mtd/multi_partition/BUILD.gn
@@ -1,51 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_VFS)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "src/mtd_partition.c",
-    "src/mtd_shellcmd.c",
-  ]
-
-  include_dirs = [ "$LITEOSTOPDIR/fs/jffs2/include" ]
-
-  if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) {
-    include_dirs += [ "//device/qemu/drivers/cfiflash" ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/drivers/mtd/multi_partition/Makefile
+++ b/drivers/mtd/multi_partition/Makefile
@@ -35,8 +35,8 @@ LOCAL_SRCS :=  $(wildcard src/*.c)

 LOCAL_INCLUDE := \
    -I $(LITEOSTOPDIR)/fs/jffs2/include \
-    -I $(LITEOSTOPDIR)/../../drivers/framework/model/storage/include \
-    -I $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/model/storage/include
+    -I $(LITEOSTOPDIR)/drivers/mtd/multi_partition/include \
+    -I $(LITEOSTOPDIR)/../../device/hisilicon/drivers/include/mtd/common/include

 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
--- 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_legacy_lite.h"
+#include "mtd_common.h"

 #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
 #include "cfiflash.h"
--- a/fs/BUILD.gn
+++ b/fs/BUILD.gn
@@ -1,56 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-group("fs") {
-  deps = [
-    "fat",
-    "fat/virpart",
-    "jffs2",
-    "nfs",
-    "proc",
-    "ramfs",
-    "romfs",
-    "vfs",
-    "vfs/bcache",
-    "zpfs",
-  ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-  configs = [
-    "vfs:public",
-    "vfs/bcache:public",
-    "fat:public",
-    "fat/virpart:public",
-    "proc:public",
-  ]
-}
--- a/fs/fat/BUILD.gn
+++ b/fs/fat/BUILD.gn
@@ -1,55 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_FAT)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "os_adapt/fat_shellcmd.c",
-    "os_adapt/fatfs.c",
-    "os_adapt/format.c",
-  ]
-
-  sources += [
-    "$LITEOSTHIRDPARTY/FatFs/source/diskio.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ff.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ffsystem.c",
-    "$LITEOSTHIRDPARTY/FatFs/source/ffunicode.c",
-  ]
-
-  include_dirs = [ "os_adapt" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "$LITEOSTHIRDPARTY/FatFs/source" ]
-}
--- a/fs/fat/Makefile
+++ b/fs/fat/Makefile
@@ -39,6 +39,7 @@ LOCAL_INCLUDE := \
 	-I $(LITEOSTOPDIR)/fs/fat/os_adapt \
 	-I $(LITEOSTOPDIR)/fs/fat/virpart/include \
 	-I $(LITEOSTOPDIR)/fs/vfs \
+	-I $(LITEOSTHIRDPARTY)/NuttX/include

 LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)

--- a/fs/fat/os_adapt/fatfs.c
+++ b/fs/fat/os_adapt/fatfs.c
@@ -47,7 +47,6 @@
 #include "user_copy.h"
 #include "los_vm_filemap.h"
 #include "los_hash.h"
-#include "los_vm_common.h"
 #include <time.h>
 #include <errno.h>
 #include <dirent.h>
@@ -240,7 +239,7 @@ static mode_t fatfs_get_mode(BYTE attribute, mode_t fs_mode)
    return fs_mode;
 }

-static enum VnodeType fatfstype_2_vnodetype(BYTE type)
+static enum VnodeType fatfstype_2_vnodetype(BYTE type) 
 {
    switch (type) {
        case AM_ARC:
@@ -293,8 +292,7 @@ static FRESULT init_cluster(DIR_FILE *pdfp, DIR *dp_new, FATFS *fs, int type, co
    } else {
        /* Write the dir cluster */
        mem_set(dir, 0, SS(fs));
-        /* 11, the The max length of of the short file name,  Create "." entry */
-        mem_set(dir + DIR_Name, ' ', 11);
+        mem_set(dir + DIR_Name, ' ', 11); /* Create "." entry */
        dir[DIR_Name] = '.';
        dir[DIR_Attr] = AM_DIR;
        st_clust(fs, dir, *clust);
@@ -450,8 +448,6 @@ static int fatfs_create_obj(struct Vnode *parent, const char *name, int mode, st
        dp_new->obj.objsize = 0;
    } else if (type == AM_LNK) {
        dp_new->obj.objsize = strlen(target);
-    } else {
-        finfo_new->fsize = fs->csize * SS(fs);
    }

    ret = VnodeAlloc(&fatfs_vops, &vp);
@@ -561,7 +557,6 @@ int fatfs_lookup(struct Vnode *parent, const char *path, int len, struct Vnode *
        vp->mode = fatfs_get_mode(finfo->fattrib, fs->fs_mode);
        if (finfo->fattrib & AM_DIR) {
            vp->type = VNODE_TYPE_DIR;
-            finfo->fsize = fs->csize * SS(fs);
        } else {
            vp->type = VNODE_TYPE_REG;
        }
@@ -1186,7 +1181,6 @@ int fatfs_mount(struct Mount *mnt, struct Vnode *blk_device, const void *data)
    dfp->fno.ftime = 0;
    dfp->fno.fattrib = AM_DIR;
    dfp->fno.sclst = 0;
-    dfp->fno.fsize = fs->csize * SS(fs);
    dfp->fno.fname[0] = '/'; /* Mark as root dir */
    dfp->fno.fname[1] = '\0';
    LOS_ListInit(&(dfp->fno.fp_list));
@@ -1418,17 +1412,10 @@ int fatfs_stat(struct Vnode *vp, struct stat* sp)
    sp->st_gid = fs->fs_gid;
    sp->st_size = finfo->fsize;
    sp->st_blksize = fs->csize * SS(fs);
-    if (finfo->fattrib & AM_ARC) {
-        sp->st_blocks = finfo->fsize ? ((finfo->fsize - 1) / SS(fs) / fs->csize + 1) : 0;
-    } else {
-        sp->st_blocks = fs->csize;
-    }
+    sp->st_blocks = finfo->fsize ? ((finfo->fsize - 1) / SS(fs) / fs->csize + 1) : 0;
    time = fattime_transfer(finfo->fdate, finfo->ftime);
    sp->st_mtime = time;

-    /* Adapt to kstat member "long tv_sec" */
-    sp->__st_mtim32.tv_sec = (long)time;
-
    unlock_fs(fs, FR_OK);
    return 0;
 }
@@ -1849,7 +1836,6 @@ int fatfs_mkfs (struct Vnode *device, int sectors, int option)
    BYTE *work_buff = NULL;
    los_part *part = NULL;
    FRESULT result;
-    MKFS_PARM opt = {0};
    int ret;

    part = los_part_find(device);
@@ -1874,9 +1860,7 @@ int fatfs_mkfs (struct Vnode *device, int sectors, int option)
        return -ENOMEM;
    }

-    opt.n_sect = sectors;
-    opt.fmt = (BYTE)option;
-    result = _mkfs(part, &opt, work_buff, FF_MAX_SS);
+    result = _mkfs(part, sectors, option, work_buff, FF_MAX_SS);
    free(work_buff);
    if (result != FR_OK) {
        return -fatfs_2_vfs(result);
@@ -2036,59 +2020,18 @@ static UINT get_oldest_time(DIR_FILE df[], DWORD *oldest_time, UINT len)
    return index;
 }

-static FRESULT fscheck(DIR *dp)
-{
-    DIR_FILE df[CHECK_FILE_NUM] = {0};
-    FILINFO fno;
-    UINT index = 0;
-    UINT count;
-    DWORD time;
-    DWORD old_time = -1;
-    FRESULT result;
-    for (count = 0; count < CHECK_FILE_NUM; count++) {
-        if ((result = f_readdir(dp, &fno)) != FR_OK) {
-            return result;
-        } else {
-            if (fno.fname[0] == 0 || fno.fname[0] == (TCHAR)0xFF) {
-                break;
-            }
-            (void)memcpy_s(&df[count].f_dir, sizeof(DIR), dp, sizeof(DIR));
-            (void)memcpy_s(&df[count].fno, sizeof(FILINFO), &fno, sizeof(FILINFO));
-            time = combine_time(&(df[count].fno));
-            if (time < old_time) {
-                old_time = time;
-                index = count;
-            }
-        }
-    }
-    while ((result = f_readdir(dp, &fno)) == FR_OK) {
-        if (fno.fname[0] == 0 || fno.fname[0] == (TCHAR)0xFF) {
-            break;
-        }
-        time = combine_time(&fno);
-        if (time < old_time) {
-            (void)memcpy_s(&df[index].f_dir, sizeof(DIR), dp, sizeof(DIR));
-            (void)memcpy_s(&df[index].fno, sizeof(FILINFO), &fno, sizeof(FILINFO));
-            index = get_oldest_time(df, &old_time, CHECK_FILE_NUM);
-        }
-    }
-    index = 0;
-    while (result == FR_OK && index < count) {
-        result = f_fcheckfat(&df[index]);
-        ++index;
-    }
-
-    return result;
-}
-
 int fatfs_fscheck(struct Vnode* vp, struct fs_dirent_s *dir)
 {
    FATFS *fs = (FATFS *)vp->originMount->data;
+    DIR_FILE df[CHECK_FILE_NUM] = {0};
    DIR *dp = NULL;
    FILINFO *finfo = &(((DIR_FILE *)(vp->data))->fno);
-#ifdef LOSCFG_FS_FAT_CACHE
+    FILINFO fno;
+    DWORD old_time = -1;
+    DWORD time;
+    UINT count;
+    UINT index = 0;
    los_part *part = NULL;
-#endif
    FRESULT result;
    int ret;

@@ -2113,11 +2056,44 @@ int fatfs_fscheck(struct Vnode* vp, struct fs_dirent_s *dir)

    dp = (DIR *)dir->u.fs_dir;
    dp->obj.id = fs->id;
-    result = fscheck(dp);
+    for (count = 0; count < CHECK_FILE_NUM; count++) {
+        if ((result = f_readdir(dp, &fno)) != FR_OK) {
+            goto ERROR_UNLOCK;
+        } else {
+            if (fno.fname[0] == 0 || fno.fname[0] == (TCHAR)0xFF) {
+                break;
+            }
+            (void)memcpy_s(&df[count].f_dir, sizeof(DIR), dp, sizeof(DIR));
+            (void)memcpy_s(&df[count].fno, sizeof(FILINFO), &fno, sizeof(FILINFO));
+            time = combine_time(&(df[count].fno));
+            if (time < old_time) {
+                old_time = time;
+                index = count;
+            }
+        }
+    }
+    while ((result = f_readdir(dp, &fno)) == FR_OK) {
+        if (fno.fname[0] == 0 || fno.fname[0] == (TCHAR)0xFF) {
+            break;
+        }
+        time = combine_time(&fno);
+        if (time < old_time) {
+            (void)memcpy_s(&df[index].f_dir, sizeof(DIR), dp, sizeof(DIR));
+            (void)memcpy_s(&df[index].fno, sizeof(FILINFO), &fno, sizeof(FILINFO));
+            index = get_oldest_time(df, &old_time, CHECK_FILE_NUM);
+        }
+    }
    if (result != FR_OK) {
        goto ERROR_UNLOCK;
    }

+    for (index = 0; index < count; index++) {
+        result = f_fcheckfat(&df[index]);
+        if (result != FR_OK) {
+            goto ERROR_UNLOCK;
+        }
+    }
+
    unlock_fs(fs, FR_OK);

    ret = fatfs_closedir(vp, dir);
@@ -2192,207 +2168,6 @@ ERROUT:
    return -fatfs_2_vfs(res);
 }

-ssize_t fatfs_readpage(struct Vnode *vnode, char *buff, off_t pos)
-{
-    FATFS *fs = (FATFS *)(vnode->originMount->data);
-    DIR_FILE *dfp = (DIR_FILE *)(vnode->data);
-    FILINFO *finfo = &(dfp->fno);
-    FAT_ENTRY *ep = &(dfp->fat_entry);
-    DWORD clust;
-    DWORD sclust;
-    QWORD sect;
-    QWORD step;
-    QWORD n;
-    size_t position; /* byte offset */
-    BYTE *buf = (BYTE *)buff;
-    size_t buflen = PAGE_SIZE;
-    FRESULT result;
-    int ret;
-
-    ret = lock_fs(fs);
-    if (ret == FALSE) {
-        result = FR_TIMEOUT;
-        goto ERROR_OUT;
-    }
-
-    if (finfo->fsize <= pos) {
-        result = FR_OK;
-        goto ERROR_UNLOCK;
-    }
-
-    if (ep->clst == 0) {
-        ep->clst = finfo->sclst;
-    }
-
-    if (pos >= ep->pos) {
-        clust = ep->clst;
-        position = ep->pos;
-    } else {
-        clust = finfo->sclst;
-        position = 0;
-    }
-
-    /* Get to the current cluster */
-    n = pos / SS(fs) / fs->csize - position / SS(fs) / fs->csize;
-    while (n--) {
-        clust = get_fat(&(dfp->f_dir.obj), clust);
-        if ((clust == BAD_CLUSTER) || (clust == DISK_ERROR)) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        }
-    }
-
-    /* Get to the currnet sector */
-    sect = clst2sect(fs, clust);
-    sect += (pos / SS(fs)) & (fs->csize - 1);
-
-    /* How many sectors do we need to read once */
-    if (fs->csize < buflen / SS(fs)) {
-        step = fs->csize;
-    } else {
-        step = buflen / SS(fs);
-    }
-
-    n = 0;
-    sclust = clust;
-    while (n < buflen / SS(fs)) {
-        if (disk_read(fs->pdrv, buf, sect, step) != RES_OK) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        }
-        n += step;
-        if (n >= buflen / SS(fs)) {
-            break;
-        }
-
-        /* As cluster size is aligned, it must jump to next cluster when cluster size is less than pagesize */
-        clust = get_fat(&(dfp->f_dir.obj), clust);
-        if ((clust == BAD_CLUSTER) || (clust == DISK_ERROR)) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        } else if (fatfs_is_last_cluster(fs, clust)) {
-            break; /* read end */
-        }
-        sect = clst2sect(fs, clust);
-        buf += step * SS(fs);
-    }
-
-    ep->clst = sclust;
-    ep->pos = pos;
-
-    unlock_fs(fs, FR_OK);
-
-    return (ssize_t)min(finfo->fsize - pos, n * SS(fs));
-
-ERROR_UNLOCK:
-    unlock_fs(fs, result);
-ERROR_OUT:
-    return -fatfs_2_vfs(result);
-}
-
-ssize_t fatfs_writepage(struct Vnode *vnode, char *buff, off_t pos, size_t buflen)
-{
-    FATFS *fs = (FATFS *)(vnode->originMount->data);
-    DIR_FILE *dfp = (DIR_FILE *)(vnode->data);
-    FILINFO *finfo = &(dfp->fno);
-    FAT_ENTRY *ep = &(dfp->fat_entry);
-    DWORD clust;
-    DWORD sclst;
-    QWORD sect;
-    QWORD step;
-    QWORD n;
-    size_t position; /* byte offset */
-    BYTE *buf = (BYTE *)buff;
-    FRESULT result;
-    FIL fil;
-    int ret;
-
-    ret = lock_fs(fs);
-    if (ret == FALSE) {
-        result = FR_TIMEOUT;
-        goto ERROR_OUT;
-    }
-
-    if (finfo->fsize <= pos) {
-        result = FR_OK;
-        goto ERROR_UNLOCK;
-    }
-
-    if (ep->clst == 0) {
-        ep->clst = finfo->sclst;
-    }
-
-    if (pos >= ep->pos) {
-        clust = ep->clst;
-        position = ep->pos;
-    } else {
-        clust = finfo->sclst;
-        position = 0;
-    }
-
-    /* Get to the current cluster */
-    n = pos / SS(fs) / fs->csize - position / SS(fs) / fs->csize;
-    while (n--) {
-        clust = get_fat(&(dfp->f_dir.obj), clust);
-        if ((clust == BAD_CLUSTER) || (clust == DISK_ERROR)) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        }
-    }
-
-    /* Get to the currnet sector */
-    sect = clst2sect(fs, clust);
-    sect += (pos / SS(fs)) & (fs->csize - 1);
-
-    /* How many sectors do we need to read once */
-    if (fs->csize < buflen / SS(fs)) {
-        step = fs->csize;
-    } else {
-        step = buflen / SS(fs);
-    }
-
-    n = 0;
-    sclst = clust;
-    while (n < buflen / SS(fs)) {
-        if (disk_write(fs->pdrv, buf, sect, step) != RES_OK) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        }
-        n += step;
-        if (n >= buflen / SS(fs)) {
-            break;
-        }
-
-        /* As cluster size is aligned, it must jump to next cluster when cluster size is less than pagesize */
-        clust = get_fat(&(dfp->f_dir.obj), clust);
-        if ((clust == BAD_CLUSTER) || (clust == DISK_ERROR)) {
-            result = FR_DISK_ERR;
-            goto ERROR_UNLOCK;
-        } else if (fatfs_is_last_cluster(fs, clust)) {
-            break; /* read end */
-        }
-        sect = clst2sect(fs, clust);
-        buf += step * SS(fs);
-    }
-
-    ep->clst = sclst;
-    ep->pos = pos;
-
-    fil.obj.fs = fs;
-    if (update_filbuff(finfo, &fil, NULL) < 0) {
-        result = FR_DISK_ERR;
-        goto ERROR_UNLOCK;
-    }
-
-    unlock_fs(fs, FR_OK);
-
-    return (ssize_t)min(finfo->fsize - pos, n * SS(fs));
-ERROR_UNLOCK:
-    unlock_fs(fs, result);
-ERROR_OUT:
-    return -fatfs_2_vfs(result);
-}
-
 struct VnodeOps fatfs_vops = {
    /* file ops */
    .Getattr = fatfs_stat,
@@ -2400,8 +2175,6 @@ struct VnodeOps fatfs_vops = {
    .Lookup = fatfs_lookup,
    .Rename = fatfs_rename,
    .Create = fatfs_create,
-    .ReadPage = fatfs_readpage,
-    .WritePage = fatfs_writepage,
    .Unlink = fatfs_unlink,
    .Reclaim = fatfs_reclaim,
    .Truncate = fatfs_truncate,
--- a/fs/fat/os_adapt/fatfs.h
+++ b/fs/fat/os_adapt/fatfs.h
@@ -146,7 +146,7 @@ int fatfs_fscheck(struct Vnode* vnode, struct fs_dirent_s *dir);

 FRESULT find_fat_partition(FATFS *fs, los_part *part, BYTE *format, QWORD *start_sector);
 FRESULT init_fatobj(FATFS *fs, BYTE fmt, QWORD start_sector);
-FRESULT _mkfs(los_part *partition, const MKFS_PARM *opt, BYTE *work, UINT len);
+FRESULT _mkfs(los_part *partition, int sector, int opt, BYTE *work, UINT len);

 #ifdef __cplusplus
 #if __cplusplus
--- a/fs/fat/virpart/BUILD.gn
+++ b/fs/fat/virpart/BUILD.gn
@@ -1,47 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_FAT_VIRTUAL_PARTITION)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "src/virpart.c",
-    "src/virpartff.c",
-  ]
-
-  include_dirs = [ "../os_adapt" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/fs/fat/virpart/include/virpart.h
+++ b/fs/fat/virpart/include/virpart.h
@@ -37,11 +37,12 @@

 #define _MAX_ENTRYLENGTH  16                                       /* MAX virtual partition name length */
 #define _MAX_VIRVOLUMES   5                                        /* MAX virtual partition number */
-typedef struct virtual_partition_info {
-    char *devpartpath;                                             /* need set virtual partition, e.g. /dev/mmcblk0p0 */
-    int  virpartnum;                                               /* virtual partition numbers, MAX number is 5 */
-    double virpartpercent[_MAX_VIRVOLUMES];                        /* every virtual partition percent,e.g 0.6,0.3,0.1 */
-    char virpartname[_MAX_VIRVOLUMES][_MAX_ENTRYLENGTH + 1];       /* every virtual partition name, MAX length is 16 */
+typedef struct virtual_partition_info
+{
+  char *devpartpath;                                             /* need set virtual partition, e.g. /dev/mmcblk0p0 */
+  int  virpartnum;                                               /* virtual partition numbers, MAX number is 5 */
+  double virpartpercent[_MAX_VIRVOLUMES];                        /* every virtual partition percent,e.g 0.6,0.3,0.1 */
+  char virpartname[_MAX_VIRVOLUMES][_MAX_ENTRYLENGTH + 1];       /* every virtual partition name, MAX length is 16 */
 } virpartinfo;

 extern char g_devPartName[DISK_NAME + 1];
--- a/fs/fat/virpart/src/virpartff.c
+++ b/fs/fat/virpart/src/virpartff.c
@@ -525,7 +525,7 @@ FRESULT f_checkvirpart(FATFS *fs, const TCHAR *path, BYTE vol)
    }

    /* Lock the filesystem object */
-    res = mount_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
+    res = find_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
    if (res != FR_OK) {
        LEAVE_FF(fs, res);
    }
@@ -683,7 +683,7 @@ FRESULT f_makevirpart(FATFS *fs, const TCHAR *path, BYTE vol)
    }

    /* Lock the filesystem object */
-    res = mount_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
+    res = find_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
    if (res != FR_OK) {
        LEAVE_FF(fs, res);
    }
@@ -774,7 +774,7 @@ FRESULT f_getvirfree(const TCHAR *path, DWORD *nclst, DWORD *cclst)
    DIR dj;

    /* Find volume to Update the global FSINFO */
-    res = mount_volume(&path, &fs, 0);
+    res = find_volume(&path, &fs, 0);
    if (res != FR_OK) {
        LEAVE_FF(fs, res);
    }
--- a/fs/include/fs/driver.h
+++ b/fs/include/fs/driver.h
@@ -1 +0,0 @@
-../../../../../third_party/NuttX/fs/vfs/include/driver.h
--- a/fs/include/fs/driver.h
+++ b/fs/include/fs/driver.h
@@ -0,0 +1,298 @@
+/****************************************************************************
+ * include/fs/fs.h
+ *
+ *   Copyright (C) 2007-2009, 2011-2013, 2015-2018 Gregory Nutt. All rights
+ *     reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef _FS_DRIVER_H_
+#define _FS_DRIVER_H_
+
+#include <sys/stat.h>
+#include "vnode.h"
+#include "fs/file.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+/* This structure provides information about the state of a block driver */
+
+struct geometry
+{
+  bool               geo_available;    /* true: The device is available */
+  bool               geo_mediachanged; /* true: The media has changed since last query */
+  bool               geo_writeenabled; /* true: It is okay to write to this device */
+  unsigned long long geo_nsectors;     /* Number of sectors on the device */
+  size_t             geo_sectorsize;   /* Size of one sector */
+};
+
+/* This structure is provided by block devices when they register with the
+ * system.  It is used by file systems to perform filesystem transfers.  It
+ * differs from the normal driver vtable in several ways -- most notably in
+ * that it deals in struct Vnode vs. struct filep.
+ */
+
+struct block_operations
+{
+  int     (*open)(struct Vnode *vnode);
+  int     (*close)(struct Vnode *vnode);
+  ssize_t (*read)(struct Vnode *vnode, unsigned char *buffer,
+            unsigned long long start_sector, unsigned int nsectors);
+  ssize_t (*write)(struct Vnode *vnode, const unsigned char *buffer,
+            unsigned long long start_sector, unsigned int nsectors);
+  int     (*geometry)(struct Vnode *vnode, struct geometry *geometry);
+  int     (*ioctl)(struct Vnode *vnode, int cmd, unsigned long arg);
+  int     (*unlink)(struct Vnode *vnode);
+};
+
+struct drv_data
+{
+  const void *ops;
+  mode_t mode;
+  void *priv;
+};
+
+/****************************************************************************
+ * Name: register_driver
+ *
+ * Description:
+ *   Register a character driver vnode the pseudo file system.
+ *
+ * Input Parameters:
+ *   path - The path to the vnode to create
+ *   fops - The file operations structure
+ *   mode - Access privileges (not used)
+ *   priv - Private, user data that will be associated with the vnode.
+ *
+ * Returned Value:
+ *   Zero on success (with the vnode point in 'vnode'); A negated errno
+ *   value is returned on a failure (all error values returned by
+ *   vnode_reserve):
+ *
+ *   EINVAL - 'path' is invalid for this operation
+ *   EEXIST - An vnode already exists at 'path'
+ *   ENOMEM - Failed to allocate in-memory resources for the operation
+ *
+ * Attention:
+ *   This function should be called after los_vfs_init has been called.
+ *   The parameter path must point a valid string, which end with the terminating null byte.
+ *   The total length of parameter path must less than the value defined by PATH_MAX.
+ *   The prefix of the parameter path must be /dev/.
+ *   The fops must pointed the right functions, otherwise the system will crash when the device is being operated.
+ *
+ ****************************************************************************/
+
+int register_driver(const char *path,
+                    const struct file_operations_vfs *fops, mode_t mode,
+                    void *priv);
+
+/****************************************************************************
+ * Name: register_blockdriver
+ *
+ * Description:
+ *   Register a block driver vnode the pseudo file system.
+ *
+ * Attention:
+ *   This function should be called after los_vfs_init has been called.
+ *   The parameter path must point a valid string, which end with the terminating null byte.
+ *   The length of parameter path must be less than the value defined by PATH_MAX.
+ *   The prefix of the parameter path must be '/dev/'.
+ *   The bops must pointed the right functions, otherwise the system will crash when the device is being operated.
+ *
+ * Input Parameters:
+ *   path - The path to the vnode to create
+ *   bops - The block driver operations structure
+ *   mode - Access privileges (not used)
+ *   priv - Private, user data that will be associated with the vnode.
+ *
+ * Returned Value:
+ *   Zero on success (with the vnode point in 'vnode'); A negated errno
+ *   value is returned on a failure (all error values returned by
+ *   vnode_reserve):
+ *
+ *   EINVAL - 'path' is invalid for this operation
+ *   EEXIST - An vnode already exists at 'path'
+ *   ENOMEM - Failed to allocate in-memory resources for the operation
+ *
+ ****************************************************************************/
+
+int register_blockdriver(const char *path,
+                         const struct block_operations *bops,
+                         mode_t mode, void *priv);
+
+/****************************************************************************
+ * Name: unregister_driver
+ *
+ * Description:
+ *   Remove the character driver vnode at 'path' from the pseudo-file system
+ *
+ * Returned Value:
+ *   Zero on success (with the vnode point in 'vnode'); A negated errno
+ *   value is returned on a failure (all error values returned by
+ *   vnode_reserve):
+ *
+ *   EBUSY - Resource is busy ,not permit for this operation.
+ *   ENOENT - 'path' is invalid for this operation.
+ *
+ * Attention:
+ *   This function should be called after register_blockdriver has been called.
+ *   The parameter path must point a valid string, which end with the terminating null byte.
+ *   The total length of parameter path must less than the value defined by PATH_MAX.
+ *   The block device node referred by parameter path must be really exist.
+ ****************************************************************************/
+
+int unregister_driver(const char *path);
+
+/****************************************************************************
+ * Name: unregister_blockdriver
+ *
+ * Description:
+ *   Remove the block driver vnode at 'path' from the pseudo-file system
+ *
+ * Input Parameters:
+ *   path - The path that the vnode to be destroyed.
+ *
+ * Returned Value:
+ *   Zero on success (with the vnode point in 'vnode'); A negated errno
+ *   value is returned on a failure (all error values returned by
+ *   vnode_reserve):
+ *
+ *   EBUSY - Resource is busy ,not permit for this operation.
+ *   ENOENT - 'path' is invalid for this operation.
+ *
+ * Attention:
+ *   This function should be called after register_blockdriver has been called.
+ *   The parameter path must point a valid string, which end with the terminating null byte.
+ *   The total length of parameter path must less than the value defined by PATH_MAX.
+ *   The block device node referred by parameter path must be really exist.
+ *
+ ****************************************************************************/
+
+int unregister_blockdriver(const char *path);
+
+
+/****************************************************************************
+ * Name: open_blockdriver
+ *
+ * Description:
+ *   Return the vnode of the block driver specified by 'pathname'
+ *
+ * Input Parameters:
+ *   pathname - the full path to the block driver to be opened
+ *   mountflags - if MS_RDONLY is not set, then driver must support write
+ *     operations (see include/sys/mount.h)
+ *   ppvnode - address of the location to return the vnode reference
+ *
+ * Returned Value:
+ *   Returns zero on success or a negated errno on failure:
+ *
+ *   EINVAL  - pathname or pvnode is NULL
+ *   ENOENT  - No block driver of this name is registered
+ *   ENOTBLK - The vnode associated with the pathname is not a block driver
+ *   EACCESS - The MS_RDONLY option was not set but this driver does not
+ *     support write access
+ *
+ * Aattention:
+ *   The parameter path must point a valid string, which end with the terminating null byte.
+ *   The total length of parameter path must less than the value defined by PATH_MAX.
+ *   The parameter ppvnode must point a valid memory, which size must be enough for storing struct Vnode.
+
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int open_blockdriver(const char *pathname, int mountflags,
+                     struct Vnode **ppvnode);
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: find_blockdriver
+ *
+ * Description:
+ *   Return the inode of the block driver specified by 'pathname'
+ *
+ * Input Parameters:
+ *   pathname   - The full path to the block driver to be located
+ *   mountflags - If MS_RDONLY is not set, then driver must support write
+ *                operations (see include/sys/mount.h)
+ *   ppinode    - Address of the location to return the inode reference
+ *
+ * Returned Value:
+ *   Returns zero on success or a negated errno on failure:
+ *
+ *   ENOENT  - No block driver of this name is registered
+ *   ENOTBLK - The inode associated with the pathname is not a block driver
+ *   EACCESS - The MS_RDONLY option was not set but this driver does not
+ *             support write access
+ *
+ ****************************************************************************/
+
+int find_blockdriver(const char *pathname, int mountflags,
+                     struct Vnode **vpp);
+
+
+/****************************************************************************
+ * Name: close_blockdriver
+ *
+ * Description:
+ *   Call the close method and release the vnode
+ *
+ * Input Parameters:
+ *   vnode - reference to the vnode of a block driver opened by open_blockdriver
+ *
+ * Returned Value:
+ *   Returns zero on success or a negated errno on failure:
+ *
+ *   EINVAL  - vnode is NULL
+ *   ENOTBLK - The vnode is not a block driver
+ *
+ * Attention:
+ *   This function should be called after open_blockdriver has been called.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int close_blockdriver(struct Vnode *vnode);
+#endif
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+#endif /* _FS_DRIVER_H_ */
--- a/fs/include/fs/fd_table.h
+++ b/fs/include/fs/fd_table.h
@@ -46,7 +46,6 @@ struct fd_table_s {
    unsigned int max_fds;
    struct file_table_s *ft_fds; /* process fd array associate with system fd */
    fd_set *proc_fds;
-    fd_set *cloexec_fds;
    sem_t ft_sem; /* manage access to the file table */
 };

@@ -71,7 +70,7 @@ struct files_struct *dup_fd(struct files_struct *oldf);

 struct files_struct *alloc_files(void);

-void delete_files(struct files_struct *files);
+void delete_files(LosProcessCB *processCB, struct files_struct *files);

 struct files_struct *create_files_snapshot(const struct files_struct *oldf);

@@ -80,10 +79,4 @@ void delete_files_snapshot(struct files_struct *files);
 int alloc_fd(int minfd);

 void alloc_std_fd(struct fd_table_s *fdt);
-
-void FileTableLock(struct fd_table_s *fdt);
-
-void FileTableUnLock(struct fd_table_s *fdt);
-
-struct fd_table_s *GetFdTable(void);
 #endif
--- a/fs/include/fs/file.h
+++ b/fs/include/fs/file.h
@@ -1 +0,0 @@
-../../../../../third_party/NuttX/fs/vfs/include/file.h
--- a/fs/include/fs/file.h
+++ b/fs/include/fs/file.h
@@ -0,0 +1,594 @@
+/****************************************************************************
+ * include/fs/file.h
+ *
+ *   Copyright (C) 2007-2009, 2011-2013, 2015-2018 Gregory Nutt. All rights
+ *     reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_FS_FILE_H
+#define __INCLUDE_FS_FILE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "vfs_config.h"
+
+#include "sys/types.h"
+#include "sys/stat.h"
+#include "semaphore.h"
+#include "poll.h"
+#include "los_vm_map.h"
+#include "los_atomic.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#ifndef VFS_ERROR
+#define VFS_ERROR -1
+#endif
+
+#ifndef OK
+#define OK 0
+#endif
+
+/* This is the underlying representation of an open file.  A file
+ * descriptor is an index into an array of such types. The type associates
+ * the file descriptor to the file state and to a set of vnode operations.
+ */
+
+struct Vnode;
+
+struct file
+{
+  unsigned int         f_magicnum;  /* file magic number */
+  int                  f_oflags;    /* Open mode flags */
+  struct Vnode         *f_vnode;    /* Driver interface */
+  loff_t               f_pos;       /* File position */
+  unsigned long        f_refcount;  /* reference count */
+  char                 *f_path;     /* File fullpath */
+  void                 *f_priv;     /* Per file driver private data */
+  const char           *f_relpath;  /* realpath */
+  struct page_mapping  *f_mapping;  /* mapping file to memory */
+  void                 *f_dir;      /* DIR struct for iterate the directory if open a directory */
+  const struct file_operations_vfs *ops;
+  int fd;
+};
+
+/* This defines a list of files indexed by the file descriptor */
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+struct filelist
+{
+  sem_t   fl_sem;               /* Manage access to the file list */
+  struct file fl_files[CONFIG_NFILE_DESCRIPTORS];
+};
+
+extern struct filelist tg_filelist;
+#endif
+
+/* This structure is provided by devices when they are registered with the
+ * system.  It is used to call back to perform device specific operations.
+ */
+
+struct file_operations_vfs
+{
+  /* The device driver open method differs from the mountpoint open method */
+
+  int     (*open)(struct file *filep);
+
+  /* The following methods must be identical in signature and position because
+   * the struct file_operations and struct mountp_operations are treated like
+   * unions.
+   */
+
+  int     (*close)(struct file *filep);
+  ssize_t (*read)(struct file *filep, char *buffer, size_t buflen);
+  ssize_t (*write)(struct file *filep, const char *buffer, size_t buflen);
+  off_t   (*seek)(struct file *filep, off_t offset, int whence);
+  int     (*ioctl)(struct file *filep, int cmd, unsigned long arg);
+  int     (*mmap)(struct file* filep, struct VmMapRegion *region);
+  /* The two structures need not be common after this point */
+
+#ifndef CONFIG_DISABLE_POLL
+  int     (*poll)(struct file *filep, poll_table *fds);
+#endif
+  int     (*stat)(struct file *filep, struct stat* st);
+  int     (*fallocate)(struct file* filep, int mode, off_t offset, off_t len);
+  int     (*fallocate64)(struct file *filep, int mode, off64_t offset, off64_t len);
+  int     (*fsync)(struct file *filep);
+  ssize_t (*readpage)(struct file *filep, char *buffer, size_t buflen);
+  int     (*unlink)(struct Vnode *vnode);
+};
+
+/* file mapped in VMM pages */
+struct page_mapping {
+  LOS_DL_LIST                           page_list;    /* all pages */
+  SPIN_LOCK_S                           list_lock;    /* lock protecting it */
+  LosMux                                mux_lock;     /* mutex lock */
+  unsigned long                         nrpages;      /* number of total pages */
+  unsigned long                         flags;
+  Atomic                                ref;          /* reference counting */
+  struct file                           *host;        /* owner of this mapping */
+};
+
+/* map: full_path(owner) <-> mapping */
+struct file_map {
+  LOS_DL_LIST                           head;
+  LosMux                                lock;         /* lock to protect this mapping */
+  struct page_mapping                   mapping;
+  int                                   name_len;
+  char                                  *rename;
+  char                                  owner[0];     /* owner: full path of file */
+};
+
+/****************************************************************************
+ * Name: files_initlist
+ *
+ * Description:
+ *   Initializes the list of files for a new task
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+void files_initlist(struct filelist *list);
+#endif
+
+/****************************************************************************
+ * Name: files_releaselist
+ *
+ * Description:
+ *   Release a reference to the file list
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+void files_releaselist(struct filelist *list);
+#endif
+
+/****************************************************************************
+ * Name: file_dup2
+ *
+ * Description:
+ *   Assign an vnode to a specific files structure.  This is the heart of
+ *   dup2.
+ *
+ *   Equivalent to the non-standard fs_dupfd2() function except that it
+ *   accepts struct file instances instead of file descriptors and it does
+ *   not set the errno variable.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is return on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int file_dup2(struct file *filep1, struct file *filep2);
+#endif
+
+/****************************************************************************
+ * Name: fs_dupfd OR dup
+ *
+ * Description:
+ *   Clone a file descriptor 'fd' to an arbitrary descriptor number (any value
+ *   greater than or equal to 'minfd'). If socket descriptors are
+ *   implemented, then this is called by dup() for the case of file
+ *   descriptors.  If socket descriptors are not implemented, then this
+ *   function IS dup().
+ *
+ *   This alternative naming is used when dup could operate on both file and
+ *   socket descriptors to avoid drawing unused socket support into the link.
+ *
+ * Returned Value:
+ *   fs_dupfd is sometimes an OS internal function and sometimes is a direct
+ *   substitute for dup().  So it must return an errno value as though it
+ *   were dup().
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int fs_dupfd(int fd, int minfd);
+#endif
+
+/****************************************************************************
+ * Name: file_dup
+ *
+ * Description:
+ *   Equivalent to the non-standard fs_dupfd() function except that it
+ *   accepts a struct file instance instead of a file descriptor and does
+ *   not set the errno variable.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+int file_dup(struct file *filep, int minfd);
+
+/****************************************************************************
+ * Name: fs_dupfd2 OR dup2
+ *
+ * Description:
+ *   Clone a file descriptor to a specific descriptor number. If socket
+ *   descriptors are implemented, then this is called by dup2() for the
+ *   case of file descriptors.  If socket descriptors are not implemented,
+ *   then this function IS dup2().
+ *
+ *   This alternative naming is used when dup2 could operate on both file and
+ *   socket descriptors to avoid drawing unused socket support into the link.
+ *
+ * Returned Value:
+ *   fs_dupfd2 is sometimes an OS internal function and sometimes is a direct
+ *   substitute for dup2().  So it must return an errno value as though it
+ *   were dup2().
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int fs_dupfd2(int fd1, int fd2);
+#endif
+
+/****************************************************************************
+ * Name: fs_ioctl
+ *
+ * Description:
+ *   Perform device specific operations.
+ *
+ * Input Parameters:
+ *   fd       File/socket descriptor of device
+ *   req      The ioctl command
+ *   arg      The argument of the ioctl cmd
+ *
+ * Returned Value:
+ *   >=0 on success (positive non-zero values are cmd-specific)
+ *   -1 on failure with errno set properly:
+ *
+ *   EBADF
+ *     'fd' is not a valid descriptor.
+ *   EFAULT
+ *     'arg' references an inaccessible memory area.
+ *   EINVAL
+ *     'cmd' or 'arg' is not valid.
+ *   ENOTTY
+ *     'fd' is not associated with a character special device.
+ *   ENOTTY
+ *      The specified request does not apply to the kind of object that the
+ *      descriptor 'fd' references.
+ *
+ ****************************************************************************/
+#ifdef CONFIG_LIBC_IOCTL_VARIADIC
+int fs_ioctl(int fd, int req, unsigned long arg);
+#endif
+
+/****************************************************************************
+ * Name: lib_sendfile
+ *
+ * Description:
+ *   Transfer a file
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_SENDFILE
+ssize_t lib_sendfile(int outfd, int infd, off_t *offset, size_t count);
+#endif
+
+/****************************************************************************
+ * Name: fs_getfilep
+ *
+ * Description:
+ *   Given a file descriptor, return the corresponding instance of struct
+ *   file.  NOTE that this function will currently fail if it is provided
+ *   with a socket descriptor.
+ *
+ * Input Parameters:
+ *   fd    - The file descriptor
+ *   filep - The location to return the struct file instance
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int fs_getfilep(int fd, struct file **filep);
+#endif
+
+/****************************************************************************
+ * Name: file_read
+ *
+ * Description:
+ *   file_read() is an internal OS interface.  It is functionally similar to
+ *   the standard read() interface except:
+ *
+ *    - It does not modify the errno variable,
+ *    - It is not a cancellation point,
+ *    - It does not handle socket descriptors, and
+ *    - It accepts a file structure instance instead of file descriptor.
+ *
+ * Input Parameters:
+ *   filep  - File structure instance
+ *   buf    - User-provided to save the data
+ *   nbytes - The maximum size of the user-provided buffer
+ *
+ * Returned Value:
+ *   The positive non-zero number of bytes read on success, 0 on if an
+ *   end-of-file condition, or a negated errno value on any failure.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+ssize_t file_read(struct file *filep, void *buf, size_t nbytes);
+#endif
+
+/****************************************************************************
+ * Name: file_write
+ *
+ * Description:
+ *   Equivalent to the standard write() function except that is accepts a
+ *   struct file instance instead of a file descriptor.  Currently used
+ *   only by aio_write();
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+ssize_t file_write(struct file *filep, const void *buf, size_t nbytes);
+#endif
+
+/****************************************************************************
+ * Name: file_pread
+ *
+ * Description:
+ *   Equivalent to the standard pread function except that is accepts a
+ *   struct file instance instead of a file descriptor.  Currently used
+ *   only by aio_read();
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+ssize_t file_pread(struct file *filep, void *buf, size_t nbytes,
+                   off_t offset);
+#endif
+
+/****************************************************************************
+ * Name: file_pwrite
+ *
+ * Description:
+ *   Equivalent to the standard pwrite function except that is accepts a
+ *   struct file instance instead of a file descriptor.  Currently used
+ *   only by aio_write();
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+ssize_t file_pwrite(struct file *filep, const void *buf,
+                    size_t nbytes, off_t offset);
+#endif
+
+/****************************************************************************
+ * Name: file_seek
+ *
+ * Description:
+ *   Equivalent to the standard lseek() function except that is accepts a
+ *   struct file instance instead of a file descriptor.  Currently used
+ *   only by net_sendfile()
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+off_t file_seek(struct file *filep, off_t offset, int whence);
+#endif
+
+/****************************************************************************
+ * Name: file_fsync
+ *
+ * Description:
+ *   Equivalent to the standard fsync() function except that is accepts a
+ *   struct file instance instead of a file descriptor and it does not set
+ *   the errno variable.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int file_fsync(struct file *filep);
+#endif
+
+/****************************************************************************
+ * Name: file_vfcntl
+ *
+ * Description:
+ *   Similar to the standard vfcntl function except that is accepts a struct
+ *   struct file instance instead of a file descriptor.
+ *
+ * Input Parameters:
+ *   filep - Instance for struct file for the opened file.
+ *   cmd   - Indentifies the operation to be performed.
+ *   ap    - Variable argument following the command.
+ *
+ * Returned Value:
+ *   The nature of the return value depends on the command.  Non-negative
+ *   values indicate success.  Failures are reported as negated errno
+ *   values.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int file_vfcntl(struct file *filep, int cmd, va_list ap);
+#endif
+
+/****************************************************************************
+ * Name: file_seek64
+ *
+ * Description:
+ *   Equivalent to the standard lseek64() function except that is accepts a
+ *   struct file instance instead of a file descriptor.  Currently used
+ *   only by net_sendfile()
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+off64_t file_seek64(struct file *filep, off64_t offset, int whence);
+#endif
+
+/****************************************************************************
+ * Name: files_allocate
+ *
+ * Description:
+ *   Allocate a struct files instance and associate it with an vnode instance.
+ *   Returns the file descriptor == index into the files array.
+ *
+ ****************************************************************************/
+
+int files_allocate(struct Vnode *vnode, int oflags, off_t pos, void *priv, int minfd);
+
+/****************************************************************************
+ * Name: files_close
+ *
+ * Description:
+ *   Close an vnode (if open)
+ *
+ * Assumuptions:
+ *   Caller holds the list semaphore because the file descriptor will be freed.
+ *
+ ****************************************************************************/
+
+int files_close(int fd);
+
+/****************************************************************************
+ * Name: files_release
+ *
+ * Assumuptions:
+ *   Similar to files_close().  Called only from open() logic on error
+ *   conditions.
+ *
+ ****************************************************************************/
+
+void files_release(int fd);
+
+/****************************************************************************
+ * Name: files_initialize
+ *
+ * Description:
+ *   This is called from the FS initialization logic to configure the files.
+ *
+ ****************************************************************************/
+
+void WEAK files_initialize(void);
+
+int vfs_normalize_path(const char *directory, const char *filename, char **pathname);
+int vfs_normalize_pathat(int fd, const char *filename, char **pathname);
+
+struct filelist *sched_getfiles(void);
+
+/* fs/fs_sendfile.c *************************************************/
+/****************************************************************************
+ * Name: sendfile
+ *
+ * Description:
+ *   Copy data between one file descriptor and another.
+ *
+ ****************************************************************************/
+ssize_t sendfile(int outfd, int infd, off_t *offset, size_t count);
+
+/**
+ * @ingroup  fs
+ * @brief get the path by a given file fd.
+ *
+ * @par Description:
+ * The function is used for getting the path by a given file fd.
+ *
+ * @attention
+ * <ul>
+ * <li>Only support file fd, not any dir fd.</li>
+ * </ul>
+ *
+ * @param  fd               [IN] Type #int     file fd.
+ * @param  path             [IN] Type #char ** address of the location to return the path reference.
+ *
+ * @retval #0      get path success
+ * @retval #~0     get path failed
+ *
+ * @par Dependency:
+ * <ul><li>fs.h: the header file that contains the API declaration.</li></ul>
+ * @see
+ *
+ * @since 2020-1-8
+ */
+
+int get_path_from_fd(int fd, char **path);
+
+bool get_bit(int i);
+
+int AllocProcessFd(void);
+
+int AllocLowestProcessFd(int minFd);
+
+int AllocSpecifiedProcessFd(int procFd);
+
+int AllocAndAssocProcessFd(int sysFd, int minFd);
+
+int AllocAndAssocSystemFd(int procFd, int minFd);
+
+void AssociateSystemFd(int procFd, int sysFd);
+
+int DisassociateProcessFd(int procFd);
+
+int GetAssociatedSystemFd(int procFd);
+
+int CheckProcessFd(int procFd);
+
+void FreeProcessFd(int procFd);
+
+int CopyFdToProc(int fd, unsigned int targetPid);
+
+int CloseProcFd(int fd, unsigned int targetPid);
+
+void lsfd(void);
+
+void set_sd_sync_fn(int (*sync_fn)(int));
+
+struct Vnode *files_get_openfile(int fd);
+
+void poll_wait(struct file *filp, wait_queue_head_t *wait_address, poll_table *p);
+
+int follow_symlink(int dirfd, const char *path, struct Vnode **vnode, char **fullpath);
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+#endif /* __INCLUDE_FS_FILE_H */
--- a/fs/include/fs/fs_operation.h
+++ b/fs/include/fs/fs_operation.h
@@ -33,7 +33,6 @@
 #define FS_OPERATION_H

 #include "fs/file.h"
-#include "fs/fd_table.h"

 #ifdef __cplusplus
 #if __cplusplus
@@ -41,6 +40,81 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */

+/* vfs/fs_file_mapping.c ****************************************************/
+/****************************************************************************
+ * Name: init_file_mapping
+ *
+ * Description:
+ *   Init the global management structure of path <-> page_mapping
+ *
+ ****************************************************************************/
+
+extern UINT32 init_file_mapping(void);
+
+/****************************************************************************
+ * Name: add_mapping
+ *
+ * Description:
+ *   Create a new path <-> page_mapping mapping and add to global list.
+ *
+ ****************************************************************************/
+
+extern void add_mapping(struct file *filep, const char *fullpath);
+
+/****************************************************************************
+ * Name: find_mapping
+ *
+ * Description:
+ *   Find the page_mapping for path in global list.
+ *
+ ****************************************************************************/
+
+extern struct page_mapping *find_mapping(const char *path);
+
+/****************************************************************************
+ * Name: remove_mapping
+ *
+ * Description:
+ *   Drop all the page-caches for the file, and then remove mapping between
+ *   the file and pagecache.
+ *   ex_filp NULL: do not exclude any file, just matching the fullpath;
+ *   ex_filp not NULL: exclude it, which means, ex_filp can be open.
+ *
+ ****************************************************************************/
+
+extern int remove_mapping(const char *fullpath);
+
+/****************************************************************************
+ * Name: rename_mapping
+ *
+ * Description:
+ *   Rename the mapping from global path <-> page_mapping list.
+ *
+ ****************************************************************************/
+
+extern void rename_mapping(const char *src, const char *dst);
+
+/****************************************************************************
+ * Name: dec_mapping
+ *
+ * Description:
+ *   Decrease the refcnt of mapping.
+ *
+ ****************************************************************************/
+
+extern void dec_mapping_nolock(struct page_mapping *mapping);
+
+
+/****************************************************************************
+ * Name: update_file_path
+ *
+ * Description:
+ *   Update the path in file descriptors when do renaming.
+ *
+ ****************************************************************************/
+
+extern int update_file_path(const char *old_path, const char *new_path);
+
 /**
 * @ingroup  fs
 * @brief Initializes the vfs filesystem
@@ -63,11 +137,6 @@ extern "C" {

 void los_vfs_init(void);

-void CloseOnExec(struct files_struct *files);
-void SetCloexecFlag(int procFd);
-bool CheckCloexecFlag(int procFd);
-void ClearCloexecFlag(int procFd);
-
 void clear_fd(int fd);

 /**
@@ -235,23 +304,7 @@ extern int los_set_systime_status(BOOL b_status);
 struct IATTR;
 extern int chattr(const char *pathname, struct IATTR *attr);

-#define CONTINE_NUTTX_FCNTL 0XFF0F
-/**
- * @ingroup fs
- *
- * @par Description:
- * The VfsFcntl function shall manipulate file descriptor.
- *
- * @retval #0  On success.
- * @retval #-1 On failure with errno set.
- * @retval CONTINE_NUTTX_FCNTL doesn't support some cmds in VfsFcntl, needs to continue going through Nuttx vfs operation.</li>
- *
- * @par Dependency:
- * <ul><li>fs.h</li></ul>
- * @see None
- */

-extern int VfsFcntl(int fd, int cmd, ...);
 /**
 * @ingroup fs
 *
--- a/fs/include/fs/mount.h
+++ b/fs/include/fs/mount.h
@@ -45,7 +45,6 @@ struct Mount {
    const struct MountOps *ops;        /* operations of mount */
    struct Vnode *vnodeBeCovered;      /* vnode we mounted on */
    struct Vnode *vnodeCovered;        /* syncer vnode */
-    struct Vnode *vnodeDev;            /* dev vnode */
    LIST_HEAD vnodeList;               /* list of vnodes */
    int vnodeSize;                     /* size of vnode list */
    LIST_HEAD activeVnodeList;         /* list of active vnodes */
@@ -71,5 +70,4 @@ typedef int (*foreach_mountpoint_t)(const char *devpoint,
 struct Mount* MountAlloc(struct Vnode* vnode, struct MountOps* mop);
 LIST_HEAD* GetMountList(void);
 int foreach_mountpoint(foreach_mountpoint_t handler, void *arg);
-int ForceUmountDev(struct Vnode *dev);
 #endif
--- a/fs/jffs2/BUILD.gn
+++ b/fs/jffs2/BUILD.gn
@@ -1,75 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_JFFS)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "src/jffs2_hash.c",
-    "src/vfs_jffs2.c",
-  ]
-
-  sources += [
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/background.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/build.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_rtime.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_rubin.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_zlib.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/debug.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/dir.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/erase.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/file.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/fs.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/gc.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/malloc.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/nodelist.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/nodemgmt.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/read.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/readinode.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/scan.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/summary.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/super.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/write.c",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/writev.c",
-  ]
-
-  include_dirs = [
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2",
-    "$LITEOSTHIRDPARTY/Linux_Kernel/fs",
-  ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
--- a/fs/jffs2/src/vfs_jffs2.c
+++ b/fs/jffs2/src/vfs_jffs2.c
@@ -201,13 +201,13 @@ int VfsJffs2Lookup(struct Vnode *parentVnode, const char *path, int len, struct
    }

    (void)VfsHashGet(parentVnode->originMount, node->i_ino, &newVnode, NULL, NULL);
+    LOS_MuxUnlock(&g_jffs2FsLock);
    if (newVnode) {
        if (newVnode->data == NULL) {
            LOS_Panic("#####VfsHashGet error#####\n");
-        }
+         }
        newVnode->parent = parentVnode;
        *ppVnode = newVnode;
-        LOS_MuxUnlock(&g_jffs2FsLock);
        return 0;
    }
    ret = VnodeAlloc(&g_jffs2Vops, &newVnode);
@@ -276,33 +276,6 @@ int VfsJffs2Close(struct file *filep)
    return 0;
 }

-ssize_t VfsJffs2ReadPage(struct Vnode *vnode, char *buffer, off_t off)
-{
-    struct jffs2_inode *node = NULL;
-    struct jffs2_inode_info *f = NULL;
-    struct jffs2_sb_info *c = NULL;
-    int ret;
-
-    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);
-
-    node = (struct jffs2_inode *)vnode->data;
-    f = JFFS2_INODE_INFO(node);
-    c = JFFS2_SB_INFO(node->i_sb);
-
-    off_t pos = min(node->i_size, off);
-    ssize_t len = min(PAGE_SIZE, (node->i_size - pos));
-    ret = jffs2_read_inode_range(c, f, (unsigned char *)buffer, off, len);
-    if (ret) {
-        LOS_MuxUnlock(&g_jffs2FsLock);
-        return ret;
-    }
-    node->i_atime = Jffs2CurSec();
-
-    LOS_MuxUnlock(&g_jffs2FsLock);
-
-    return len;
-}
-
 ssize_t VfsJffs2Read(struct file *filep, char *buffer, size_t bufLen)
 {
    struct jffs2_inode *node = NULL;
@@ -311,6 +284,7 @@ ssize_t VfsJffs2Read(struct file *filep, char *buffer, size_t bufLen)
    int ret;

    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);
+
    node = (struct jffs2_inode *)filep->f_vnode->data;
    f = JFFS2_INODE_INFO(node);
    c = JFFS2_SB_INFO(node->i_sb);
@@ -319,6 +293,7 @@ ssize_t VfsJffs2Read(struct file *filep, char *buffer, size_t bufLen)
    off_t len = min(bufLen, (node->i_size - pos));
    ret = jffs2_read_inode_range(c, f, (unsigned char *)buffer, filep->f_pos, len);
    if (ret) {
+        PRINTK("VfsJffs2Read(): read_inode_range failed %d\n", ret);
        LOS_MuxUnlock(&g_jffs2FsLock);
        return ret;
    }
@@ -330,59 +305,6 @@ ssize_t VfsJffs2Read(struct file *filep, char *buffer, size_t bufLen)
    return len;
 }

-ssize_t VfsJffs2WritePage(struct Vnode *vnode, char *buffer, off_t pos, size_t buflen)
-{
-    struct jffs2_inode *node = NULL;
-    struct jffs2_inode_info *f = NULL;
-    struct jffs2_sb_info *c = NULL;
-    struct jffs2_raw_inode ri = {0};
-    struct IATTR attr = {0};
-    int ret;
-    uint32_t writtenLen;
-
-    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);
-
-    node = (struct jffs2_inode *)vnode->data;
-    f = JFFS2_INODE_INFO(node);
-    c = JFFS2_SB_INFO(node->i_sb);
-
-    if (pos < 0) {
-        LOS_MuxUnlock(&g_jffs2FsLock);
-        return -EINVAL;
-    }
-
-    ri.ino = cpu_to_je32(f->inocache->ino);
-    ri.mode = cpu_to_jemode(node->i_mode);
-    ri.uid = cpu_to_je16(node->i_uid);
-    ri.gid = cpu_to_je16(node->i_gid);
-    ri.atime = ri.ctime = ri.mtime = cpu_to_je32(Jffs2CurSec());
-
-    if (pos > node->i_size) {
-        int err;
-        attr.attr_chg_valid = CHG_SIZE;
-        attr.attr_chg_size = pos;
-        err = jffs2_setattr(node, &attr);
-        if (err) {
-            LOS_MuxUnlock(&g_jffs2FsLock);
-            return err;
-        }
-    }
-    ri.isize = cpu_to_je32(node->i_size);
-
-    ret = jffs2_write_inode_range(c, f, &ri, (unsigned char *)buffer, pos, buflen, &writtenLen);
-    if (ret) {
-        node->i_mtime = node->i_ctime = je32_to_cpu(ri.mtime);
-        LOS_MuxUnlock(&g_jffs2FsLock);
-        return ret;
-    }
-
-    node->i_mtime = node->i_ctime = je32_to_cpu(ri.mtime);
-
-    LOS_MuxUnlock(&g_jffs2FsLock);
-
-    return (ssize_t)writtenLen;
-}
-
 ssize_t VfsJffs2Write(struct file *filep, const char *buffer, size_t bufLen)
 {
    struct jffs2_inode *node = NULL;
@@ -669,16 +591,13 @@ int VfsJffs2Chattr(struct Vnode *pVnode, struct IATTR *attr)
 int VfsJffs2Rmdir(struct Vnode *parentVnode, struct Vnode *targetVnode, const char *path)
 {
    int ret;
-    struct jffs2_inode *parentInode = NULL;
-    struct jffs2_inode *targetInode = NULL;
+    struct jffs2_inode *parentInode = (struct jffs2_inode *)parentVnode->data;
+    struct jffs2_inode *targetInode = (struct jffs2_inode *)targetVnode->data;

    if (!parentVnode || !targetVnode) {
        return -EINVAL;
    }

-    parentInode = (struct jffs2_inode *)parentVnode->data;
-    targetInode = (struct jffs2_inode *)targetVnode->data;
-
    LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER);

    ret = jffs2_rmdir(parentInode, targetInode, (const unsigned char *)path);
@@ -888,11 +807,6 @@ int VfsJffs2Stat(struct Vnode *pVnode, struct stat *buf)
    buf->st_mtime = node->i_mtime;
    buf->st_ctime = node->i_ctime;

-    /* Adapt to kstat member long tv_sec */
-    buf->__st_atim32.tv_sec = (long)node->i_atime;
-    buf->__st_mtim32.tv_sec = (long)node->i_mtime;
-    buf->__st_ctim32.tv_sec = (long)node->i_ctime;
-
    LOS_MuxUnlock(&g_jffs2FsLock);

    return 0;
@@ -956,8 +870,6 @@ const struct MountOps jffs_operations = {
 struct VnodeOps g_jffs2Vops = {
    .Lookup = VfsJffs2Lookup,
    .Create = VfsJffs2Create,
-    .ReadPage = VfsJffs2ReadPage,
-    .WritePage = VfsJffs2WritePage,
    .Rename = VfsJffs2Rename,
    .Mkdir = VfsJffs2Mkdir,
    .Getattr = VfsJffs2Stat,
--- a/fs/nfs/BUILD.gn
+++ b/fs/nfs/BUILD.gn
@@ -1,40 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_FS_NFS)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [
-    "$LITEOSTHIRDPARTY/NuttX/fs/nfs/nfs_adapter.c",
-    "$LITEOSTHIRDPARTY/NuttX/fs/nfs/nfs_util.c",
-    "$LITEOSTHIRDPARTY/NuttX/fs/nfs/rpc_clnt.c",
-  ]
-}
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -3,6 +3,5 @@ config FS_NFS
    default y
    depends on FS_VFS
    depends on NET_LWIP_SACK
-    depends on DEBUG_VERSION
    help
      Answer Y to enable LiteOS support nfs filesystem.
--- a/fs/nfs/Makefile
+++ b/fs/nfs/Makefile
@@ -32,6 +32,7 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(notdir $(shell pwd))

 LOCAL_SRCS := $(wildcard $(LITEOSTHIRDPARTY)/NuttX/fs/nfs/*.c)
+LOCAL_INCLUDE := -I $(wildcard $(LITEOSTHIRDPARTY)/NuttX/include)

 LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openharmony_ci	b7030357cd	!469 -- 为hispark_taurus打开ADC模块编译宏 Merge pull request !469 from 王亚枫/OpenHarmony-2.3-Beta	2021-07-27 14:26:11 +00:00
yafeng_wang	6b4aa6a4c9	feat: Open macro for ADC moudule Signed-off-by: yafeng_wang <wangyafeng15@huawei.com>	2021-07-27 21:39:27 +08:00
				`@@ -0,0 +1 @@`
				`../../../../../../../../third_party/Linux_Kernel/fs/jffs2/mtd.h`
				`@@ -1 +0,0 @@`
				`../../../../../third_party/NuttX/fs/vfs/include/driver.h`