!719 当hilog/hievent驱动缓存出问题时，进行恢复处理

Merge pull request !719 from shenchenkai/cherry-pick-1637985969
fixed c121d0e from https://gitee.com/shenchenkai/kernel_liteos_a/pulls/670
2021-11-29 03:55:22 +00:00 · 2021-11-27 04:06:09 +00:00 · 2021-11-08 02:27:19 +00:00 · 2021-11-04 15:59:35 +08:00 · 2021-09-22 06:42:59 +00:00 · 2021-09-19 14:16:44 +08:00
2437 changed files with 160027 additions and 45961 deletions
--- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -1,6 +1,6 @@
 ### 相关的Issue

-
+  
 ### 原因（目的、解决的问题等）


@@ -8,14 +8,5 @@


 ### 测试用例（新增、改动、可能影响的功能）
-
-
-### 是否需要同步至release（如：3.0LTS ... ）分支？
-
-必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
- [ ] 是，需要同步的分支：
- [ ] 否
-
-理由：
-
-
+    
+    
--- 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,387 +28,55 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import("//build/lite/config/component/lite_component.gni")
-
-LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h")
-
-declare_args() {
-  tee_enable = false
-  liteos_name = "OHOS_Image"
-  liteos_skip_make = false
-  liteos_is_mini = false
-}
-
-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!")
-assert(ohos_build_compiler == "clang" == defined(LOSCFG_COMPILER_CLANG_LLVM),
-       "compiler 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/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,
-  ]
-  if (!defined(LOSCFG_LIBC_NEWLIB)) {
-    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",
-  ]
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    cflags += [ "-Wno-address-of-packed-member" ]
-  }
-  asmflags = cflags
-}
-
-config("dialect_config") {
-  cflags_c = [ "-std=c99" ]
-  cflags_cc = [ "-std=c++11" ]
-}
-
-config("misc_config") {
-  defines = [ "__LITEOS__" ]
-  defines += [ "__LITEOS_A__" ]
-  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",
-  ]
-}
-
-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")
-
-config("public") {
-  configs = [
-    "arch: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",
-    "security",
-    "shell",
-    "syscall",
-    "testsuites/kernel:kernel_test",
-  ]
-
-  deps += [
-    "//drivers/liteos",
-    HDFTOPDIR,
-  ]
-
-  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 = [ ":kernel" ]
-  if (!liteos_is_mini) {
-    deps += [
-      ":apps",
-      ":tests",
-      "//prebuilts/lite/sysroot/build:strip",
-    ]
-    if (liteos_skip_make == false) {
-      deps += [ ":make" ]
-    }
-  }
-}
-
-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",
-  ]
-
-  if (defined(LOSCFG_LIBC_NEWLIB)) {
-    ldflags += [
-      "-Wl,--wrap=_free_r",
-      "-Wl,--wrap,_malloc_usable_size_r",
-      "-Wl,--wrap,_malloc_r",
-      "-Wl,--wrap,_memalign_r",
-      "-Wl,--wrap,_realloc_r",
-      "-Wl,--wrap,_fseeko_r",
-    ]
-    ldflags -= [ "-nostdlib" ]
-  }
-  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 += [ "-nostartfiles" ]
-    inputs = [ "tools/build/liteos.ld" ]
-  }
-
-  inputs += [ "$root_out_dir/board.ld" ]
-
-  output_dir = target_out_dir
-
-  deps = [
-    ":modules",
-    "platform:copy_board.ld",
-  ]
-}
-
-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'"
 }

 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/136
+++ b/136
@@ -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-ohos" 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"
@@ -94,6 +57,15 @@ source "platform/Kconfig"
 ######################### config options of cpu arch ################
 source "arch/Kconfig"

+######################### config options of rootfs #####################
+source "kernel/common/Kconfig"
+######################### config options of patchfs #####################
+source "kernel/common/patchfs/Kconfig"
+######################### config options of blackbox #####################
+source "kernel/common/blackbox/Kconfig"
+######################### config options of hidumper #####################
+source "kernel/common/hidumper/Kconfig"
+
 config QUICK_START
    bool "Enable QUICK_START"
    default n
@@ -114,7 +86,35 @@ endmenu

 ######################## config options of filesystem ##################
 menu "FileSystem"
-source "fs/Kconfig"
+source "fs/vfs/Kconfig"
+source "fs/fat/Kconfig"
+source "fs/ramfs/Kconfig"
+source "fs/romfs/Kconfig"
+source "fs/nfs/Kconfig"
+source "fs/proc/Kconfig"
+source "fs/jffs2/Kconfig"
+config ENABLE_READ_BUFFER
+    bool "Enable read buffer Option"
+    default n
+    depends on FS_VFS
+    help
+      Answer Y to add enable read buffer Option.
+
+config MAX_VNODE_SIZE
+    int "Vnode max number"
+    range 0 512
+    default 512
+    depends on FS_VFS
+    help
+      vnode number, range from 0 to 512.
+
+config MAX_PATH_CACHE_SIZE
+    int "PathCache max number"
+    range 0 1024
+    default 512
+    depends on FS_VFS
+    help
+      pathCache number, range from 0 to 1024.
 endmenu

 ######################## config options of net ############################
@@ -122,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"
@@ -163,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.

@@ -186,10 +185,10 @@ 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 an opposite behaviour compared to release version.
+      That means you want a opposite behaviour compared to release version.

 config DEBUG_KERNEL
    bool "Enable Debug LiteOS Kernel Resource"
@@ -198,7 +197,7 @@ config DEBUG_KERNEL
    help
      If you select this option that means you enable debugging kernel resource.
      It also means you want to get queue, mutex, semaphore, memory debug information.
-      That means you want an opposite behaviour compared to release version.
+      That means you want a opposite behaviour compared to release version.

 config DEBUG_QUEUE
    bool "Enable Queue Debugging"
@@ -265,7 +264,7 @@ config MEM_LEAKCHECK
    default n
    depends on DEBUG_VERSION && MEM_DEBUG
    help
-      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the informations of mem node.
+      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the infomations of mem node.
 config BASE_MEM_NODE_INTEGRITY_CHECK
    bool "Enable integrity check or not"
    default n
@@ -286,10 +285,29 @@ endmenu

 ######################## config options os drivers ########################
 menu "Driver"
-source "drivers/Kconfig"
+config DRIVERS
+    bool "Enable Driver"
+    default y
+    help
+      Answer Y to enable LiteOS support driver.
+
+source "bsd/dev/usb/Kconfig"
+source "../../drivers/adapter/khdf/liteos/Kconfig"
+
+# Device driver Kconfig import
+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/liteos/tzdriver/Kconfig"
+source "../../drivers/liteos/hievent/Kconfig"
+
 endmenu

-######################## config options os security #######################
 menu "Security"
 source "security/Kconfig"
 endmenu
--- a/264
+++ b/264
@@ -27,51 +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
-
-# 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
@@ -87,115 +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 an 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 "-------------------------------------------------------"

-sysroot:
-	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
-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)" \
-		$(if $(LOSCFG_COMPILER_CLANG_LLVM),CLANG="$(LITEOS_COMPILER_PATH)clang",GCC="$(CC)") \
-		BUILD_DEBUG=$(if $(patsubst y,,$(or $(RELEASE:1=y),n)),true,false)
+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

-$(filter-out menuconfig,$(KCONFIG_CMDS)):
-	$(HIDE)$@ $(args)
+##### make sysroot #####
+sysroot:
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+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

-$(LITEOS_CONFIG_FILE): $(KCONFIG_CONFIG)
-	$(HIDE)env KCONFIG_CONFIG=$< genconfig --config-out $@ --header-path $(LITEOS_MENUCONFIG_H)
+##### make dynload #####
+-include $(LITEOS_MK_PATH)/dynload.mk

-update_config menuconfig:
-	$(HIDE)test -f "$(CONFIG)" && cp -v "$(CONFIG)" .config && menuconfig $(args) && savedefconfig --out "$(CONFIG)"
+#-----need move when make version-----#
+##### make lib #####
+$(__LIBS): $(OUT) $(CXX_INCLUDE)

-$(LITEOS_LIBS_TARGET): sysroot
-	$(HIDE)for dir in $(LIB_SUBDIRS); do $(MAKE) -C $$dir all || exit 1; done
+$(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_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
+$(BUILD):
+	$(HIDE)mkdir -p $(BUILD)

-$(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 $< >$@
+$(LITEOS_LIBS_TARGET): $(__LIBS) sysroot
+	$(HIDE)for dir in $(LIB_SUBDIRS); \
+		do $(MAKE) -C $$dir all || exit 1; \
+	done
+	$(HIDE)echo "=============== make lib done  ==============="

-$(APPS): sysroot
+##### make menuconfig #####
+menuconfig:
+	$(HIDE)menuconfig
+##### menuconfig end #######
+
+$(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
@@ -12,10 +12,9 @@
     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 by referring to OpenHarmony/tools_oat/README.
+    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>
@@ -23,7 +22,7 @@
        <licensefile></licensefile>
        <policylist>
            <policy name="projectPolicy" desc="">
-                <policyitem type="copyright" name="Huawei Device Co., Ltd. All rights reserved." path=".*" desc="original liteos copyright"/>
+                <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>
@@ -38,7 +37,7 @@
                <!--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 license header policies">
+            <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"/-->
--- a/README.md
+++ b/README.md
@@ -62,29 +62,31 @@ The OpenHarmony LiteOS Cortex-A is a new-generation kernel developed based on th
 ## Constraints<a name="section119744591305"></a>

 -   Programming languages: C and C++
-   Applicable development boards: Hi3516D V300
-   Hi3516D V300 uses the FAT file system by default.
+-   Applicable development boards: Hi3518E V300 and Hi3516D V300
+-   Hi3518E V300 uses the JFFS2 file system by default, and Hi3516D V300 uses the FAT file system by default.

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

-OpenHarmony LiteOS Cortex-A supports the  [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 this development board.
+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.

-   [Setting Up Ubuntu Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-env-setup.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-hi3516-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 Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3516-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/developing-the-first-example-program-running-on-hi3516.md)

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

@@ -92,5 +94,5 @@ For details about how to develop the first application, see:

 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README.md)

-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README.md)
+**kernel\_liteos\_a**

--- a/README_zh-HK.md
+++ b/README_zh-HK.md
@@ -54,6 +54,7 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代
 │ ├── hw # 時鐘與中斷相關邏輯代碼
 │ ├── include # 對外暴露頭文件存放目錄
 │ └── uart # 串口相關邏輯代碼
+├── platform # 支持不同的芯片平台代碼，如Hi3516DV300等
 ├── security # 安全特性相關的代碼，包括進程權限管理和虛擬id映射管理
 ├── syscall # 系統調用
 └── tools # 構建工具及相關配置和代碼
@@ -62,29 +63,31 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代
 ## 約束<a name="section119744591305"></a>

 - 開發語言：C/C++；
- 適用於Hi3516DV300單板；
- Hi3516DV300默認使用FAT文件系統。
+- 適用於Hi3518EV300、Hi3516DV300單板；
+- Hi3518EV300默認使用jffs2文件系統，Hi3516DV300默認使用FAT文件系統。

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

-OpenHarmony LiteOS-A內核支持Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.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上搭建編譯環境：

- [編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.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 Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-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/%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>

@@ -92,4 +95,4 @@ OpenHarmony LiteOS-A內核支持Hi3516DV300（[介紹](https://gitee.com/openhar

 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README_zh.md)

-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README_zh-HK.md) 
+**kernel\_liteos\_a** 
--- a/README_zh.md
+++ b/README_zh.md
@@ -53,6 +53,7 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 │   ├── hw                 # 时钟与中断相关逻辑代码
 │   ├── include            # 对外暴露头文件存放目录
 │   └── uart               # 串口相关逻辑代码
+├── platform               # 支持不同的芯片平台代码，如Hi3516DV300等
 ├── security               # 安全特性相关的代码，包括进程权限管理和虚拟id映射管理
 ├── syscall                # 系统调用
 └── tools                  # 构建工具及相关配置和代码
@@ -61,29 +62,31 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 ## 约束<a name="section119744591305"></a>

 -   开发语言：C/C++；
-   适用于Hi3516DV300单板；
-   Hi3516DV300默认使用FAT文件系统。
+-   适用于Hi3518EV300、Hi3516DV300单板；
+-   Hi3518EV300默认使用jffs2文件系统，Hi3516DV300默认使用FAT文件系统。

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

-OpenHarmony LiteOS-A内核支持[Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.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上搭建编译环境：

-   [编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.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 Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-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/%E8%BF%90%E8%A1%8CHello-OHOS.md)。

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

@@ -91,5 +94,5 @@ OpenHarmony LiteOS-A内核支持[Hi3516DV300](https://gitee.com/openharmony/docs

 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README_zh.md)

-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README_zh.md)
+**kernel\_liteos\_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/Makefile
+++ b/apps/Makefile
@@ -27,14 +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 clean:
-	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir $@ || exit 1; done
+HIDE := @
+APPS := app

-.PHONY: all clean
+all: $(APPS)
+
+# Make
+$(APPS):
+ifneq ($(APP_SUBDIRS), )
+	$(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; done
+endif
+
+.PHONY: all $(APPS) clean
--- a/apps/app.mk
+++ b/apps/app.mk
@@ -1,32 +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.
-
-override TARGET = $(OUT)/bin/$(APP_NAME)
-
-include $(MODULE)
--- 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
+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,30 +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
-
-ifeq ($(LOSCFG_DRIVERS_PERF), y)
-APP_SUBDIRS += perf
-endif
--- 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/init/src/init.c
+++ b/apps/init/src/init.c
@@ -48,7 +48,6 @@
 #endif
 int main(int argc, char * const *argv)
 {
-    (void)argv;
    int ret;
    pid_t gid;
    const char *shellPath = "/bin/mksh";
--- a/apps/lms/BUILD.gn
+++ b/apps/lms/BUILD.gn
@@ -1,77 +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")
-lite_component("LMS-Sample") {
-  features = [ ":sample_usr_lms" ]
-}
-executable("sample_usr_lms") {
-  output_name = "sample_usr_lms"
-  sources = [ "src/sample_usr_lms.c" ]
-  include_dirs = []
-  defines = []
-  if (ohos_build_compiler == "gcc") {
-    cflags_c = [
-      "-O0",
-      "-fsanitize=kernel-address",
-      "-funwind-tables",
-      "-fasynchronous-unwind-tables",
-    ]
-  } else {
-    cflags_c = [
-      "-O0",
-      "-fsanitize=kernel-address",
-      "-mllvm",
-      "-asan-instrumentation-with-call-threshold=0",
-      "-mllvm",
-      "-asan-stack=0",
-      "-mllvm",
-      "-asan-globals=0",
-      "-funwind-tables",
-      "-fasynchronous-unwind-tables",
-    ]
-  }
-  ldflags = [
-    "-rdynamic",
-    "-lunwind",
-    "-lusrlms",
-    "-Wl,--wrap=realloc",
-    "-Wl,--wrap=calloc",
-    "-Wl,--wrap=malloc",
-    "-Wl,--wrap=free",
-    "-Wl,--wrap=valloc",
-    "-Wl,--wrap=aligned_alloc",
-    "-Wl,--wrap=memset",
-    "-Wl,--wrap=memcpy",
-    "-Wl,--wrap=memmove",
-    "-Wl,--wrap=strcpy",
-    "-Wl,--wrap=strcat",
-  ]
-  deps = [ "//kernel/liteos_a/kernel/extended/lms/usr:usrlmslib" ]
-}
--- a/apps/lms/src/sample_usr_lms.c
+++ b/apps/lms/src/sample_usr_lms.c
@@ -1,248 +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>
-
-static void BufWriteTest(void *buf, int start, int end)
-{
-    for (int i = start; i <= end; i++) {
-        ((char *)buf)[i] = 'a';
-    }
-}
-
-static void BufReadTest(void *buf, int start, int end)
-{
-    char tmp;
-    for (int i = start; i <= end; i++) {
-        tmp = ((char *)buf)[i];
-    }
-}
-
-static void LmsMallocTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsMallocTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    printf("[LmsMallocTest] write overflow error should be triggered, write range[0, TEST_SIZE]\n");
-    BufWriteTest(buf, 0, TEST_SIZE);
-
-    free(buf);
-    printf("\n-------- LmsMallocTest End --------\n");
-}
-
-static void LmsReallocTest(void)
-{
-#define TEST_SIZE     64
-#define TEST_SIZE_MIN 32
-    printf("\n-------- LmsReallocTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    printf("[LmsReallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    char *buf1 = (char *)realloc(buf, TEST_SIZE_MIN);
-    if (buf1 == NULL) {
-        free(buf);
-        return;
-    }
-    buf = NULL;
-    printf("[LmsReallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE_MIN]\n");
-    BufReadTest(buf1, -1, TEST_SIZE_MIN);
-    free(buf1);
-    printf("\n-------- LmsReallocTest End --------\n");
-}
-
-static void LmsCallocTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsCallocTest Start --------\n");
-    char *buf = (char *)calloc(4, 4); /* 4: test size */
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsCallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    free(buf);
-    printf("\n-------- LmsCallocTest End --------\n");
-}
-
-static void LmsVallocTest(void)
-{
-#define TEST_SIZE 4096
-    printf("\n-------- LmsVallocTest Start --------\n");
-    char *buf = (char *)valloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsVallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    free(buf);
-    printf("\n-------- LmsVallocTest End --------\n");
-}
-
-static void LmsAlignedAllocTest(void)
-{
-#define TEST_ALIGN_SIZE 64
-#define TEST_SIZE       128
-    printf("\n-------- LmsAlignedAllocTest Start --------\n");
-    char *buf = (char *)aligned_alloc(TEST_ALIGN_SIZE, TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsAlignedAllocTest] read overflow & underflow error should be triggered, read range[-1,128]\n");
-    BufReadTest(buf, -1, 128);
-    free(buf);
-    printf("\n-------- LmsAlignedAllocTest End --------\n");
-}
-
-static void LmsMemsetTest(void)
-{
-#define TEST_SIZE 32
-    printf("\n-------- LmsMemsetTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMemsetTest] memset overflow & underflow error should be triggered, memset size:%d\n", TEST_SIZE + 1);
-    memset(buf, 0, TEST_SIZE + 1);
-    free(buf);
-    printf("\n-------- LmsMemsetTest End --------\n");
-}
-
-static void LmsMemcpyTest(void)
-{
-#define TEST_SIZE 20
-    printf("\n-------- LmsMemcpyTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    char localBuf[32] = {0}; /* 32: test size */
-    printf("[LmsMemcpyTest] memcpy overflow error should be triggered, memcpy size:%d\n", TEST_SIZE + 1);
-    memcpy(buf, localBuf, TEST_SIZE + 1);
-    free(buf);
-    printf("\n-------- LmsMemcpyTest End --------\n");
-}
-
-static void LmsMemmoveTest(void)
-{
-#define TEST_SIZE 20
-    printf("\n-------- LmsMemmoveTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMemmoveTest] memmove overflow error should be triggered\n");
-    memmove(buf + 12, buf, 10); /* 12 and 10: test size */
-    free(buf);
-    printf("\n-------- LmsMemmoveTest End --------\n");
-}
-
-static void LmsStrcpyTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsStrcpyTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    char *testStr = "bbbbbbbbbbbbbbbbb";
-    printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n", strlen(testStr) + 1);
-    strcpy(buf, testStr);
-    free(buf);
-    printf("\n-------- LmsStrcpyTest End --------\n");
-}
-
-static void LmsStrcatTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsStrcatTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    buf[0] = 'a';
-    buf[1] = 'b';
-    buf[2] = 0;
-    char *testStr = "cccccccccccccc";
-    printf("[LmsStrcatTest] strcat overflow error should be triggered, src string:%s dest string:%s"
-        "total buf size:%d\n",
-        testStr, buf, strlen(testStr) + strlen(buf) + 1);
-    strcat(buf, testStr);
-    free(buf);
-    printf("\n-------- LmsStrcatTest End --------\n");
-}
-
-static void LmsFreeTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsFreeTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsFreeTest] free size:%d\n", TEST_SIZE);
-    free(buf);
-    printf("[LmsFreeTest] Use after free error should be triggered, read range[1,1]\n");
-    BufReadTest(buf, 1, 1);
-    printf("[LmsFreeTest] double free error should be triggered\n");
-    free(buf);
-    printf("\n-------- LmsFreeTest End --------\n");
-}
-
-int main(int argc, char * const *argv)
-{
-    (void)argc;
-    (void)argv;
-    printf("\n############### Lms Test start ###############\n");
-    char *tmp = (char *)malloc(5000); /* 5000: test mem size */
-    if (tmp == NULL) {
-        return;
-    }
-    LmsMallocTest();
-    LmsReallocTest();
-    LmsCallocTest();
-    LmsVallocTest();
-    LmsAlignedAllocTest();
-    LmsMemsetTest();
-    LmsMemcpyTest();
-    LmsMemmoveTest();
-    LmsStrcpyTest();
-    LmsStrcatTest();
-    LmsFreeTest();
-    free(tmp);
-    printf("\n############### Lms Test End ###############\n");
-}
--- a/apps/mksh/BUILD.gn
+++ b/apps/mksh/BUILD.gn
@@ -1,100 +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")
-import("//third_party/mksh/mksh.gni")
-
-group("mksh") {
-  deps = [ ":build_mksh" ]
-}
-
-copy("copy_mksh_src") {
-  sources = MKSH_SRC_DIR
-  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,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
+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 -fstack-protector-strong -D_FORTIFY_SOURCE=2
+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
+
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+LOCAL_CFLAGS += -Oz --target=$(LLVM_TARGET) $(LLVM_SYSROOT)
+else
+LOCAL_CFLAGS += -O2
+endif
+
+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)/
+	$(HIDE)$(RM) $(BUILD_DIR) $(BUILD_LOG)

 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/perf/BUILD.gn
+++ b/apps/perf/BUILD.gn
@@ -1,63 +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("perf") {
-  sources = [
-    "src/main.c",
-    "src/option.c",
-    "src/perf.c",
-    "src/perf_list.c",
-    "src/perf_record.c",
-    "src/perf_stat.c",
-  ]
-  include_dirs = [ "include" ]
-  defines = []
-
-  if (defined(LOSCFG_PERF_HW_PMU)) {
-    defines += [ "LOSCFG_PERF_HW_PMU" ]
-  }
-
-  if (defined(LOSCFG_PERF_TIMED_PMU)) {
-    defines += [ "LOSCFG_PERF_TIMED_PMU" ]
-  }
-
-  if (defined(LOSCFG_PERF_SW_PMU)) {
-    defines += [ "LOSCFG_PERF_SW_PMU" ]
-  }
-
-  if (defined(LOSCFG_FS_VFS)) {
-    defines += [ "LOSCFG_FS_VFS" ]
-  }
-
-  defines += [ "LOSCFG_PERF_BUFFER_SIZE=$LOSCFG_PERF_BUFFER_SIZE" ]
-
-  deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ]
-}
--- a/apps/perf/include/perf.h
+++ b/apps/perf/include/perf.h
@@ -1,163 +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 _PERF_H
-#define _PERF_H
-
-#include <stdlib.h>
-
-#ifdef  __cplusplus
-#if  __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#define PERF_MAX_EVENT          7
-#define PERF_MAX_FILTER_TSKS    32
-
-#ifdef PERF_DEBUG
-#define printf_debug(fmt, ...) printf(fmt, ##__VA_ARGS__)
-#else
-#define printf_debug(fmt, ...)
-#endif
-
-/*
- * Perf types
- */
-enum PerfEventType {
-    PERF_EVENT_TYPE_HW,      /* boards common hw events */
-    PERF_EVENT_TYPE_TIMED,   /* hrtimer timed events */
-    PERF_EVENT_TYPE_SW,      /* software trace events */
-    PERF_EVENT_TYPE_RAW,     /* boards special hw events, see enum PmuEventType in corresponding arch headfile */
-
-    PERF_EVENT_TYPE_MAX
-};
-
-/*
- * Common hardware pmu events
- */
-enum PmuHwId {
-    PERF_COUNT_HW_CPU_CYCLES = 0,      /* cpu cycle event */
-    PERF_COUNT_HW_INSTRUCTIONS,        /* instruction event */
-    PERF_COUNT_HW_DCACHE_REFERENCES,   /* dcache access event */
-    PERF_COUNT_HW_DCACHE_MISSES,       /* dcache miss event */
-    PERF_COUNT_HW_ICACHE_REFERENCES,   /* icache access event */
-    PERF_COUNT_HW_ICACHE_MISSES,       /* icache miss event */
-    PERF_COUNT_HW_BRANCH_INSTRUCTIONS, /* software change of pc event */
-    PERF_COUNT_HW_BRANCH_MISSES,       /* branch miss event */
-
-    PERF_COUNT_HW_MAX,
-};
-
-/*
- * Common hrtimer timed events
- */
-enum PmuTimedId {
-    PERF_COUNT_CPU_CLOCK = 0,      /* hrtimer timed event */
-};
-
-/*
- * Common software pmu events
- */
-enum PmuSwId {
-    PERF_COUNT_SW_TASK_SWITCH = 1, /* task switch event */
-    PERF_COUNT_SW_IRQ_RESPONSE,    /* irq response event */
-    PERF_COUNT_SW_MEM_ALLOC,       /* memory alloc event */
-    PERF_COUNT_SW_MUX_PEND,        /* mutex pend event */
-
-    PERF_COUNT_SW_MAX,
-};
-
-/*
- * perf sample data types
- * Config it through PerfConfigAttr->sampleType.
- */
-enum PerfSampleType {
-    PERF_RECORD_CPU       = 1U << 0, /* record current cpuid */
-    PERF_RECORD_TID       = 1U << 1, /* record current task id */
-    PERF_RECORD_TYPE      = 1U << 2, /* record event type */
-    PERF_RECORD_PERIOD    = 1U << 3, /* record event period */
-    PERF_RECORD_TIMESTAMP = 1U << 4, /* record timestamp */
-    PERF_RECORD_IP        = 1U << 5, /* record instruction pointer */
-    PERF_RECORD_CALLCHAIN = 1U << 6, /* record backtrace */
-    PERF_RECORD_PID       = 1U << 7, /* record current process id */
-};
-
-/*
- * perf configuration sub event information
- *
- * This structure is used to config specific events attributes.
- */
-typedef struct {
-    unsigned int type;              /* enum PerfEventType */
-    struct {
-        unsigned int eventId;       /* the specific event corresponds to the PerfEventType */
-        unsigned int period;        /* event period, for every "period"th occurrence of the event a
-                                        sample will be recorded */
-    } events[PERF_MAX_EVENT];       /* perf event list */
-    unsigned int eventsNr;          /* total perf event number */
-    size_t predivided;              /* whether to prescaler (once every 64 counts),
-                                        which only take effect on cpu cycle hardware event */
-} PerfEventConfig;
-
-/*
- * perf configuration main information
- *
- * This structure is used to set perf sampling attributes, including events, tasks and other information.
- */
-typedef struct {
-    PerfEventConfig         eventsCfg;                      /* perf event config */
-    unsigned int            taskIds[PERF_MAX_FILTER_TSKS];  /* perf task filter list (allowlist) */
-    unsigned int            taskIdsNr;                      /* task numbers of task filter allowlist,
-                                                                 if set 0 perf will sample all tasks */
-    unsigned int            processIds[PERF_MAX_FILTER_TSKS];  /* perf process filter list (allowlist) */
-    unsigned int            processIdsNr;                      /* process numbers of process filter allowlist,
-                                                                 if set 0 perf will sample all processes */
-    unsigned int            sampleType;                     /* type of data to sample defined in PerfSampleType */
-    size_t                  needSample;                     /* whether to sample data */
-} PerfConfigAttr;
-
-void PerfUsage(void);
-void PerfDumpAttr(PerfConfigAttr *attr);
-int PerfConfig(int fd, PerfConfigAttr *attr);
-void PerfStart(int fd, size_t sectionId);
-void PerfStop(int fd);
-ssize_t PerfRead(int fd, char *buf, size_t size);
-void PerfPrintBuffer(const char *buf, ssize_t num);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif /* _PERF_H */
--- a/apps/perf/include/perf_record.h
+++ b/apps/perf/include/perf_record.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 _PERF_RECORD_H
-#define _PERF_RECORD_H
-
-#ifdef  __cplusplus
-#if  __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-void PerfRecord(int fd, int argc, char **argv);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif /* _PERF_RECORD_H */
--- a/apps/perf/src/option.c
+++ b/apps/perf/src/option.c
@@ -1,182 +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 <string.h>
-#include "option.h"
-#include "perf_list.h"
-
-static int ParseOption(char **argv, int *index, PerfOption *opts)
-{
-    int ret = 0;
-    const char *str = NULL;
-
-    while ((opts->name != NULL) && (*opts->name != 0)) {
-        if (strcmp(argv[*index], opts->name) == 0) {
-            switch (opts->type) {
-                case OPTION_TYPE_UINT:
-                    *opts->value = strtoul(argv[++(*index)], NULL, 0);
-                    break;
-                case OPTION_TYPE_STRING:
-                    *opts->str = argv[++(*index)];
-                    break;
-                case OPTION_TYPE_CALLBACK:
-                    str = argv[++(*index)];
-                    if ((*opts->cb)(str) != 0) {
-                        printf("parse error\n");
-                        ret = -1;
-                    }
-                    break;
-                default:
-                    printf("invalid option\n");
-                    ret = -1;
-                    break;
-            }
-            return ret;
-        }
-        opts++;
-    }
-
-    return -1;
-}
-
-int ParseOptions(int argc, char **argv, PerfOption *opts, SubCmd *cmd)
-{
-    int i;
-    int index = 0;
-
-    while ((index < argc) && (argv[index] != NULL) && (*argv[index] == '-')) {
-        if (ParseOption(argv, &index, opts) != 0) {
-            return -1;
-        }
-        index++;
-    }
-
-    if ((index < argc) && (argv[index] != NULL)) {
-        cmd->path = argv[index];
-        cmd->params[0] = argv[index];
-        index++;
-    } else {
-        printf("no subcmd to execute\n");
-        return -1;
-    }
-
-    for (i = 1; (index < argc) && (i < CMD_MAX_PARAMS); index++, i++) {
-        cmd->params[i] = argv[index];
-    }
-    printf_debug("subcmd = %s\n", cmd->path);
-    for (int j = 0; j < i; j++) {
-        printf_debug("paras[%d]:%s\n", j, cmd->params[j]);
-    }
-    return 0;
-}
-
-int ParseIds(const char *argv, int *arr, unsigned int *len)
-{
-    int res, ret;
-    unsigned int index  = 0;
-    char *sp = NULL;
-    char *this = NULL;
-    char *list = strdup(argv);
-
-    if (list == NULL) {
-        printf("no memory for ParseIds\n");
-        return -1;
-    }
-
-    sp = strtok_r(list, ",", &this);
-    while (sp) {
-        res = strtoul(sp, NULL, 0);
-        if (res < 0) {
-            ret = -1;
-            goto EXIT;
-        }
-        arr[index++] = res;
-        sp = strtok_r(NULL, ",", &this);
-    }
-    *len = index;
-    ret = 0;
-EXIT:
-    free(list);
-    return ret;
-}
-
-static inline const PerfEvent *StrToEvent(const char *str)
-{
-    const PerfEvent *evt = &g_events[0];
-
-    for (; evt->event != -1; evt++) {
-        if (strcmp(str, evt->name) == 0) {
-            return evt;
-        }
-    }
-    return NULL;
-}
-
-int ParseEvents(const char *argv, PerfEventConfig *eventsCfg, unsigned int *len)
-{
-    int ret;
-    unsigned int index  = 0;
-    const PerfEvent *event = NULL;
-    char *sp = NULL;
-    char *this = NULL;
-    char *list = strdup(argv);
-
-    if (list == NULL) {
-        printf("no memory for ParseEvents\n");
-        return -1;
-    }
-
-    sp = strtok_r(list, ",", &this);
-    while (sp) {
-        event = StrToEvent(sp);
-        if (event == NULL) {
-            ret = -1;
-            goto EXIT;
-        }
-
-        if (index == 0) {
-            eventsCfg->type = event->type;
-        } else if (eventsCfg->type != event->type) {
-            printf("events type must be same\n");
-            ret = -1;
-            goto EXIT;
-        }
-        eventsCfg->events[index].eventId = event->event;
-        sp = strtok_r(NULL, ",", &this);
-        index++;
-    }
-    *len = index;
-    ret = 0;
-EXIT:
-    free(list);
-    return ret;
-}
--- a/apps/perf/src/perf.c
+++ b/apps/perf/src/perf.c
@@ -1,136 +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 <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "perf.h"
-
-#define PERF_IOC_MAGIC     'T'
-#define PERF_START         _IO(PERF_IOC_MAGIC, 1)
-#define PERF_STOP          _IO(PERF_IOC_MAGIC, 2)
-
-void PerfUsage(void)
-{
-    printf("\nUsage: ./perf start [id]. Start perf.\n");
-    printf("\nUsage: ./perf stop. Stop perf.\n");
-    printf("\nUsage: ./perf read <nBytes>. Read nBytes raw data from perf buffer and print out.\n");
-    printf("\nUsage: ./perf list. List events to be used in -e.\n");
-    printf("\nUsage: ./perf stat/record [option] <command>. \n"
-                    "-e, event selector. use './perf list' to list available events.\n"
-                    "-p, event period.\n"
-                    "-o, perf data output filename.\n"
-                    "-t, taskId filter(allowlist), if not set perf will sample all tasks.\n"
-                    "-s, type of data to sample defined in PerfSampleType los_perf.h.\n"
-                    "-P, processId filter(allowlist), if not set perf will sample all processes.\n"
-                    "-d, whether to prescaler (once every 64 counts),"
-                    "which only take effect on cpu cycle hardware event.\n"
-    );
-}
-
-static void PerfSetPeriod(PerfConfigAttr *attr)
-{
-    int i;
-    for (i = 1; i < attr->eventsCfg.eventsNr; i++) {
-        attr->eventsCfg.events[i].period = attr->eventsCfg.events[0].period;
-    }
-}
-
-void PerfPrintBuffer(const char *buf, ssize_t num)
-{
-#define BYTES_PER_LINE  4
-    ssize_t i;
-    for (i = 0; i < num; i++) {
-        printf(" %02x", (unsigned char)buf[i]);
-        if (((i + 1) % BYTES_PER_LINE) == 0) {
-            printf("\n");
-        }
-    }
-    printf("\n");
-}
-
-void PerfDumpAttr(PerfConfigAttr *attr)
-{
-    int i;
-    printf_debug("attr->type: %d\n", attr->eventsCfg.type);
-    for (i = 0; i < attr->eventsCfg.eventsNr; i++) {
-        printf_debug("attr->events[%d]: %d, 0x%x\n", i, attr->eventsCfg.events[i].eventId,
-            attr->eventsCfg.events[i].period);
-    }
-    printf_debug("attr->predivided: %d\n", attr->eventsCfg.predivided);
-    printf_debug("attr->sampleType: 0x%x\n", attr->sampleType);
-
-    for (i = 0; i < attr->taskIdsNr; i++) {
-        printf_debug("attr->taskIds[%d]: %d\n", i, attr->taskIds[i]);
-    }
-
-    for (i = 0; i < attr->processIdsNr; i++) {
-        printf_debug("attr->processIds[%d]: %d\n", i, attr->processIds[i]);
-    }
-
-    printf_debug("attr->needSample: %d\n", attr->needSample);
-}
-
-
-void PerfStart(int fd, size_t sectionId)
-{
-    (void)ioctl(fd, PERF_START, sectionId);
-}
-
-void PerfStop(int fd)
-{
-    (void)ioctl(fd, PERF_STOP, NULL);
-}
-
-int PerfConfig(int fd, PerfConfigAttr *attr)
-{
-    if (attr == NULL) {
-        return -1;
-    }
-    PerfSetPeriod(attr);
-    PerfDumpAttr(attr);
-    return write(fd, attr, sizeof(PerfConfigAttr));
-}
-
-ssize_t PerfRead(int fd, char *buf, size_t size)
-{
-    ssize_t len;
-    if (buf == NULL) {
-        printf("Read buffer is null.\n");
-        return 0;
-    }
-
-    len = read(fd, buf, size);
-    return len;
-}
--- a/apps/perf/src/perf_list.c
+++ b/apps/perf/src/perf_list.c
@@ -1,129 +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 "perf.h"
-#include "perf_list.h"
-
-static const char *g_eventTypeStr[] = {
-    "[Hardware event]",
-    "[Timed event]",
-    "[Software event]",
-};
-
-const PerfEvent g_events[] = {
-#ifdef LOSCFG_PERF_HW_PMU
-    {
-        .name = "cycles",
-        .event = PERF_COUNT_HW_CPU_CYCLES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "instruction",
-        .event = PERF_COUNT_HW_INSTRUCTIONS,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "dcache",
-        .event = PERF_COUNT_HW_DCACHE_REFERENCES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "dcache-miss",
-        .event = PERF_COUNT_HW_DCACHE_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "icache",
-        .event = PERF_COUNT_HW_ICACHE_REFERENCES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "icache-miss",
-        .event = PERF_COUNT_HW_ICACHE_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "branch",
-        .event = PERF_COUNT_HW_BRANCH_INSTRUCTIONS,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "branch-miss",
-        .event = PERF_COUNT_HW_BRANCH_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-#endif
-#ifdef LOSCFG_PERF_TIMED_PMU
-    {
-        .name = "clock",
-        .event = PERF_COUNT_CPU_CLOCK,
-        .type = PERF_EVENT_TYPE_TIMED,
-    },
-#endif
-#ifdef LOSCFG_PERF_SW_PMU
-    {
-        .name = "task-switch",
-        .event = PERF_COUNT_SW_TASK_SWITCH,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "irq-in",
-        .event = PERF_COUNT_SW_IRQ_RESPONSE,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "mem-alloc",
-        .event = PERF_COUNT_SW_MEM_ALLOC,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "mux-pend",
-        .event = PERF_COUNT_SW_MUX_PEND,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-#endif
-    {
-        .name = "",
-        .event = -1,
-        .type = PERF_EVENT_TYPE_MAX,
-    }
-};
-
-void PerfList(void)
-{
-    const PerfEvent *evt = &g_events[0];
-    printf("\n");
-    for (; evt->event != -1; evt++) {
-        printf("\t %-25s%30s\n", evt->name, g_eventTypeStr[evt->type]);
-    }
-    printf("\n");
-}
--- a/apps/perf/src/perf_record.c
+++ b/apps/perf/src/perf_record.c
@@ -1,203 +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/wait.h>
-#include <securec.h>
-
-#ifdef LOSCFG_FS_VFS
-#include <fcntl.h>
-#include <errno.h>
-#endif
-
-#include "perf.h"
-#include "option.h"
-#include "perf_record.h"
-
-#define PERF_FILE_MODE 0644
-static PerfConfigAttr g_recordAttr;
-static const char *g_savePath = "/storage/data/perf.data";
-
-static inline int GetEvents(const char *argv)
-{
-    return ParseEvents(argv, &g_recordAttr.eventsCfg, &g_recordAttr.eventsCfg.eventsNr);
-}
-
-static inline int GetTids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_recordAttr.taskIds, &g_recordAttr.taskIdsNr);
-}
-
-static inline int GetPids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_recordAttr.processIds, &g_recordAttr.processIdsNr);
-}
-
-static PerfOption g_recordOpts[] = {
-    OPTION_CALLBACK("-e", GetEvents),
-    OPTION_CALLBACK("-t", GetTids),
-    OPTION_CALLBACK("-P", GetPids),
-    OPTION_STRING("-o", &g_savePath),
-    OPTION_UINT("-p", &g_recordAttr.eventsCfg.events[0].period),
-    OPTION_UINT("-s", &g_recordAttr.sampleType),
-    OPTION_UINT("-d", &g_recordAttr.eventsCfg.predivided),
-};
-
-static int PerfRecordAttrInit(void)
-{
-    PerfConfigAttr attr = {
-        .eventsCfg = {
-#ifdef LOSCFG_PERF_HW_PMU
-            .type = PERF_EVENT_TYPE_HW,
-            .events = {
-                [0] = {PERF_COUNT_HW_CPU_CYCLES, 0xFFFF},
-            },
-#elif defined LOSCFG_PERF_TIMED_PMU
-            .type = PERF_EVENT_TYPE_TIMED,
-            .events = {
-                [0] = {PERF_COUNT_CPU_CLOCK, 100},
-            },
-#elif defined LOSCFG_PERF_SW_PMU
-            .type = PERF_EVENT_TYPE_SW,
-            .events = {
-                [0] = {PERF_COUNT_SW_TASK_SWITCH, 1},
-            },
-#endif
-            .eventsNr = 1, /* 1 event */
-            .predivided = 0,
-        },
-        .taskIds = {0},
-        .taskIdsNr = 0,
-        .processIds = {0},
-        .processIdsNr = 0,
-        .needSample = 1,
-        .sampleType = PERF_RECORD_IP | PERF_RECORD_CALLCHAIN,
-    };
-
-    return memcpy_s(&g_recordAttr, sizeof(PerfConfigAttr), &attr, sizeof(PerfConfigAttr)) != EOK ? -1 : 0;
-}
-
-ssize_t PerfWriteFile(const char *filePath, const char *buf, ssize_t bufSize)
-{
-#ifdef LOSCFG_FS_VFS
-    int fd = -1;
-    ssize_t totalToWrite = bufSize;
-    ssize_t totalWrite = 0;
-
-    if (filePath == NULL || buf == NULL || bufSize == 0) {
-        return -1;
-    }
-
-    fd = open(filePath, O_CREAT | O_RDWR | O_TRUNC, PERF_FILE_MODE);
-    if (fd < 0) {
-        printf("create file [%s] failed, fd: %d, %s!\n", filePath, fd, strerror(errno));
-        return -1;
-    }
-    while (totalToWrite > 0) {
-        ssize_t writeThisTime = write(fd, buf, totalToWrite);
-        if (writeThisTime < 0) {
-            printf("failed to write file [%s], %s!\n", filePath, strerror(errno));
-            (void)close(fd);
-            return -1;
-        }
-        buf += writeThisTime;
-        totalToWrite -= writeThisTime;
-        totalWrite += writeThisTime;
-    }
-    (void)fsync(fd);
-    (void)close(fd);
-
-    return (totalWrite == bufSize) ? 0 : -1;
-#else
-    (void)filePath;
-    PerfPrintBuffer(buf, bufSize);
-    return 0;
-#endif
-}
-
-void PerfRecord(int fd, int argc, char **argv)
-{
-    int ret;
-    int child;
-    char *buf;
-    ssize_t len;
-    SubCmd cmd = {0};
-
-    if (argc < 3) { /* perf record argc is at least 3 */
-        return;
-    }
-
-    ret = PerfRecordAttrInit();
-    if (ret != 0) {
-        printf("perf record attr init failed\n");
-        return;
-    }
-
-    ret = ParseOptions(argc - 2, &argv[2], g_recordOpts, &cmd); /* parse option and cmd begin at index 2 */
-    if (ret != 0) {
-        printf("parse error\n");
-        return;
-    }
-
-    ret = PerfConfig(fd, &g_recordAttr);
-    if (ret != 0) {
-        printf("perf config failed\n");
-        return;
-    }
-
-    PerfStart(fd, 0);
-    child = fork();
-    if (child < 0) {
-        printf("fork error\n");
-        PerfStop(fd);
-        return;
-    } else if (child == 0) {
-        (void)execve(cmd.path, cmd.params, NULL);
-        exit(0);
-    }
-
-    waitpid(child, 0, 0);
-    PerfStop(fd);
-
-    buf = (char *)malloc(LOSCFG_PERF_BUFFER_SIZE);
-    if (buf == NULL) {
-        printf("no memory for read perf 0x%x\n", LOSCFG_PERF_BUFFER_SIZE);
-        return;
-    }
-    len = PerfRead(fd, buf, LOSCFG_PERF_BUFFER_SIZE);
-    ret = PerfWriteFile(g_savePath, buf, len);
-    if (ret == 0) {
-        printf("save perf data success at %s\n", g_savePath);
-    } else {
-        printf("save perf data failed at %s\n", g_savePath);
-    }
-    free(buf);
-}
--- a/apps/perf/src/perf_stat.c
+++ b/apps/perf/src/perf_stat.c
@@ -1,149 +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 <securec.h>
-#include <sys/wait.h>
-#include "perf.h"
-#include "option.h"
-#include "perf_stat.h"
-
-static PerfConfigAttr g_statAttr;
-
-static inline int GetEvents(const char *argv)
-{
-    return ParseEvents(argv, &g_statAttr.eventsCfg, &g_statAttr.eventsCfg.eventsNr);
-}
-
-static inline int GetTids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_statAttr.taskIds, &g_statAttr.taskIdsNr);
-}
-
-static inline int GetPids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_statAttr.processIds, &g_statAttr.processIdsNr);
-}
-
-static PerfOption g_statOpts[] = {
-    OPTION_CALLBACK("-e", GetEvents),
-    OPTION_CALLBACK("-t", GetTids),
-    OPTION_CALLBACK("-P", GetPids),
-    OPTION_UINT("-p", &g_statAttr.eventsCfg.events[0].period),
-    OPTION_UINT("-s", &g_statAttr.sampleType),
-    OPTION_UINT("-d", &g_statAttr.eventsCfg.predivided),
-};
-
-static int PerfStatAttrInit(void)
-{
-    PerfConfigAttr attr = {
-        .eventsCfg = {
-#ifdef LOSCFG_PERF_HW_PMU
-            .type = PERF_EVENT_TYPE_HW,
-            .events = {
-                [0] = {PERF_COUNT_HW_CPU_CYCLES, 0xFFFF},
-                [1] = {PERF_COUNT_HW_INSTRUCTIONS, 0xFFFFFF00},
-                [2] = {PERF_COUNT_HW_ICACHE_REFERENCES, 0xFFFF},
-                [3] = {PERF_COUNT_HW_DCACHE_REFERENCES, 0xFFFF},
-            },
-            .eventsNr = 4, /* 4 events */
-#elif defined LOSCFG_PERF_TIMED_PMU
-            .type = PERF_EVENT_TYPE_TIMED,
-            .events = {
-                [0] = {PERF_COUNT_CPU_CLOCK, 100},
-            },
-            .eventsNr = 1, /* 1 event */
-#elif defined LOSCFG_PERF_SW_PMU
-            .type = PERF_EVENT_TYPE_SW,
-            .events = {
-                [0] = {PERF_COUNT_SW_TASK_SWITCH, 1},
-                [1] = {PERF_COUNT_SW_IRQ_RESPONSE, 1},
-                [2] = {PERF_COUNT_SW_MEM_ALLOC, 1},
-                [3] = {PERF_COUNT_SW_MUX_PEND, 1},
-            },
-            .eventsNr = 4, /* 4 events */
-#endif
-            .predivided = 0,
-        },
-        .taskIds = {0},
-        .taskIdsNr = 0,
-        .processIds = {0},
-        .processIdsNr = 0,
-        .needSample = 0,
-        .sampleType = 0,
-    };
-
-    return memcpy_s(&g_statAttr, sizeof(PerfConfigAttr), &attr, sizeof(PerfConfigAttr)) != EOK ? -1 : 0;
-}
-
-void PerfStat(int fd, int argc, char **argv)
-{
-    int ret;
-    int child;
-    SubCmd cmd = {0};
-
-    if (argc < 3) { /* perf stat argc is at least 3 */
-        return;
-    }
-
-    ret = PerfStatAttrInit();
-    if (ret != 0) {
-        printf("perf stat attr init failed\n");
-        return;
-    }
-
-    ret = ParseOptions(argc - 2, &argv[2], g_statOpts, &cmd); /* parse option and cmd begin at index 2 */
-    if (ret != 0) {
-        printf("parse error\n");
-        return;
-    }
-
-    ret = PerfConfig(fd, &g_statAttr);
-    if (ret != 0) {
-        printf("perf config failed\n");
-        return;
-    }
-
-    PerfStart(fd, 0);
-    child = fork();
-    if (child < 0) {
-        printf("fork error\n");
-        goto EXIT;
-    } else if (child == 0) {
-        (void)execve(cmd.path, cmd.params, NULL);
-        exit(0);
-    }
-
-    (void)waitpid(child, 0, 0);
-EXIT:
-    PerfStop(fd);
-}
-
--- 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"
@@ -46,7 +48,7 @@ int Chdir(const char *tgtDir)

    ret = chdir(tgtDir);
    if (ret == 0) {
-        ret = OsShellSetWorkingDirectory(tgtDir, strlen(tgtDir) + 1); /* 1: the length of '\0' */
+        ret = OsShellSetWorkingDirtectory(tgtDir, strlen(tgtDir) + 1); /* 1: the length of '\0' */        
    }

    return ret;
--- a/apps/shell/include/shcmd.h
+++ b/apps/shell/include/shcmd.h
@@ -53,7 +53,7 @@ typedef struct {
 } CmdKeyLink;

 #define NEED_NEW_LINE(timesPrint, lineCap) ((timesPrint) % (lineCap) == 0)
-#define SCREEN_IS_FULL(timesPrint, lineCap) ((timesPrint) >= ((lineCap) * DEFAULT_SCREEN_HEIGHT))
+#define SCREEN_IS_FULL(timesPrint, lineCap) ((timesPrint) >= ((lineCap) * DEFAULT_SCREEN_HEIGNT))

 extern unsigned int OsCmdExec(CmdParsed *cmdParsed, char *cmdStr);
 extern unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size);
@@ -62,7 +62,7 @@ extern void OsShellCmdPush(const char *string, CmdKeyLink *cmdKeyLink);
 extern void OsShellHistoryShow(unsigned int value, ShellCB *shellCB);
 extern unsigned int OsShellKeyInit(ShellCB *shellCB);
 extern void OsShellKeyDeInit(CmdKeyLink *cmdKeyLink);
-extern int OsShellSetWorkingDirectory(const char *dir, size_t len);
+extern int OsShellSetWorkingDirtectory(const char *dir, size_t len);

 #ifdef __cplusplus
 #if __cplusplus
--- a/apps/shell/include/shell.h
+++ b/apps/shell/include/shell.h
@@ -54,7 +54,7 @@ extern "C" {
 #define CMD_HISTORY_LEN                 10
 #define CMD_MAX_PATH                    256
 #define DEFAULT_SCREEN_WIDTH            80
-#define DEFAULT_SCREEN_HEIGHT           24
+#define DEFAULT_SCREEN_HEIGNT           24

 #define SWITCH_QUOTES_STATUS(qu) do {   \
    if ((qu) == TRUE) {                 \
@@ -67,6 +67,7 @@ extern "C" {
 #define QUOTES_STATUS_CLOSE(qu) ((qu) == FALSE)
 #define QUOTES_STATUS_OPEN(qu)  ((qu) == TRUE)

+typedef size_t bool;

 typedef struct {
    unsigned int   consoleID;
--- a/apps/shell/include/shell_pri.h
+++ b/apps/shell/include/shell_pri.h
@@ -32,7 +32,9 @@
 #ifndef _SHELL_PRI_H
 #define _SHELL_PRI_H

-#include "shell.h"
+#include "sys/types.h"
+#include "bits/alltypes.h"
+#include "shcmd.h"

 #ifdef __cplusplus
 #if __cplusplus
@@ -40,7 +42,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-extern void ShellEntry(ShellCB *shellCB);
+extern void *ShellEntry(void *argv);
 extern void *ShellTask(void *argv);

 #ifdef __cplusplus
--- a/apps/shell/include/sherr.h
+++ b/apps/shell/include/sherr.h
@@ -32,6 +32,9 @@
 #ifndef _SHERR_H
 #define _SHERR_H

+#include "sys/types.h"
+#include "bits/alltypes.h"
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
--- a/apps/shell/include/shmsg.h
+++ b/apps/shell/include/shmsg.h
@@ -32,7 +32,6 @@
 #ifndef _SHMSG_H
 #define _SHMSG_H

-#include "shell_list.h"
 #include "shell.h"

 #ifdef __cplusplus
@@ -44,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)
@@ -60,9 +54,9 @@ extern "C" {
 #define COLOR_L_RED    "\e[1;31m"
 #define SHELL_PROMPT   COLOR_L_RED"OHOS # "COLOR_NONE

-typedef void (* OutputFunc)(const char *fmt, ...);
+typedef void (*OutputFunc)(const char *fmt, ...);
 extern int ShellTaskInit(ShellCB *shellCB);
-extern void ChildExec(const char *cmdName, char *const paramArray[], bool foreground);
+extern int ShellEntryInit(ShellCB *shellCB);
 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 *OsShellGetWorkingDirectory(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,18 +29,13 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

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

 ShellCB *g_shellCB = NULL;

@@ -80,70 +75,24 @@ static int OsShellCreateTask(ShellCB *shellCB)
        goto OUT;
    }

-    shellCB->shellEntryHandle = pthread_self();
-    return 0;
+    ret = ShellEntryInit(shellCB);
+    if (ret != SH_OK) {
+        goto OUT;
+    }
+
+    (void)pthread_join(shellCB->shellTaskHandle, NULL);
+    (void)pthread_join(shellCB->shellEntryHandle, NULL);

 OUT:
    ShellDeinit(shellCB);
    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, FALSE);
-    }
-    for (i = 0; argv[i]; i++) {
-        len += strlen(argv[i]);
-    }
-    len += i + 1;
-    cmdLine = (char *)malloc(len);
-    if (!cmdLine) {
-        return ret;
-    }
-    errno_t ret1 = memset_s(cmdLine, len, 0, len);
-    if (ret1 != EOK) {
-        free(cmdLine);
-        return ret1;
-    }
-
-    for (j = 0; j < i; j++) {
-        (void)strcat_s(cmdLine, len,  argv[j]);
-        (void)strcat_s(cmdLine, len, " ");
-    }
-
-    cmdLine[len - 2] = '\0'; /* 2, (len - 2) is the end of cmdline buf */
-    ret = syscall(__NR_shellexec, argv[0], cmdLine);
-    free(cmdLine);
-    return ret;
-}
-
-static void ShellSigChildHook(int sig)
-{
-    (void)sig;
-
-    while (waitpid(-1, NULL, WNOHANG) > 0) {
-        continue;
-    }
-}
-
-int main(int argc, char **argv)
+int main()
 {
    int ret = SH_NOK;
    ShellCB *shellCB = NULL;

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

    shellCB = (ShellCB *)malloc(sizeof(ShellCB));
@@ -174,12 +123,7 @@ int main(int argc, char **argv)
    sem_init(&shellCB->shellSem, 0, 0);

    g_shellCB = shellCB;
-    ret = OsShellCreateTask(shellCB);
-    if (ret != SH_OK) {
-        goto ERR_OUT3;
-    }
-
-    ShellEntry(shellCB);
+    return OsShellCreateTask(shellCB);

 ERR_OUT3:
    (void)pthread_mutex_destroy(&shellCB->historyMutex);
--- a/apps/shell/src/shcmd.c
+++ b/apps/shell/src/shcmd.c
@@ -36,6 +36,7 @@
 #include "dirent.h"
 #include "securec.h"

+
 #define SHELL_INIT_MAGIC_FLAG 0xABABABAB
 #define CTRL_C 0x03 /* 0x03: ctrl+c ASCII */

@@ -90,12 +91,12 @@ static int OsStrSeparateTabStrGet(const char **tabStr, CmdParsed *parsed, unsign
    return SH_OK;
 }

-char *OsShellGetWorkingDirectory(void)
+char *OsShellGetWorkingDirtectory()
 {
    return OsGetShellCb()->shellWorkingDirectory;
 }

-int OsShellSetWorkingDirectory(const char *dir, size_t len)
+int OsShellSetWorkingDirtectory(const char *dir, size_t len)
 {
    if (dir == NULL) {
        return SH_NOK;
@@ -114,7 +115,7 @@ static int OsStrSeparate(const char *tabStr, char *strPath, char *nameLooking, u
    char *strEnd = NULL;
    char *cutPos = NULL;
    CmdParsed parsed = {0};
-    char *shellWorkingDirectory = OsShellGetWorkingDirectory();
+    char *shellWorkingDirectory = OsShellGetWorkingDirtectory();
    int ret;

    ret = OsStrSeparateTabStrGet(&tabStr, &parsed, tabStrLen);
@@ -222,7 +223,7 @@ static int OsPrintMatchList(unsigned int count, const char *strPath, const char
        return (int)SH_ERROR;
    }

-    if (count > (lineCap * DEFAULT_SCREEN_HEIGHT)) {
+    if (count > (lineCap * DEFAULT_SCREEN_HEIGNT)) {
        ret = OsSurePrintAll(count);
        if (ret != 1) {
            return ret;
@@ -374,10 +375,10 @@ static int OsTabMatchFile(char *cmdKey, unsigned int *len)
 }

 /*
- * Description: Pass in the string and clear useless space ,which include:
+ * Description: Pass in the string and clear useless space ,which inlcude:
 *                1) The overmatch space which is not be marked by Quote's area
 *                   Squeeze the overmatch space into one space
- *                2) Clear all space before first valid character
+ *                2) Clear all space before first vaild charatctor
 * Input:       cmdKey : Pass in the buff string, which is ready to be operated
 *              cmdOut : Pass out the buffer string ,which has already been operated
 *              size : cmdKey length
@@ -406,17 +407,17 @@ unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size)

    /* Backup the 'output' start address */
    outputBak = output;
-    /* Scan each character in 'cmdKey',and squeeze the overmuch space and ignore invalid character */
+    /* Scan each charactor in 'cmdKey',and squeeze the overmuch space and ignore invaild charactor */
    for (; *cmdKey != '\0'; cmdKey++) {
        /* Detected a Double Quotes, switch the matching status */
        if (*(cmdKey) == '\"') {
            SWITCH_QUOTES_STATUS(quotes);
        }
-        /* Ignore the current character in following situation */
+        /* Ignore the current charactor in following situation */
        /* 1) Quotes matching status is FALSE (which said that the space is not been marked by double quotes) */
-        /* 2) Current character is a space */
-        /* 3) Next character is a space too, or the string is been seeked to the end already(\0) */
-        /* 4) Invalid character, such as single quotes */
+        /* 2) Current charactor is a space */
+        /* 3) Next charactor is a space too, or the string is been seeked to the end already(\0) */
+        /* 4) Invaild charactor, such as single quotes */
        if ((*cmdKey == ' ') && ((*(cmdKey + 1) == ' ') || (*(cmdKey + 1) == '\0')) && QUOTES_STATUS_CLOSE(quotes)) {
            continue;
        }
@@ -430,7 +431,7 @@ unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size)
    /* Restore the 'output' start address */
    output = outputBak;
    len = strlen(output);
-    /* Clear the space which is located at the first character in buffer */
+    /* Clear the space which is located at the first charactor in buffer */
    if (*output == ' ') {
        output++;
        len--;
@@ -584,6 +585,7 @@ END:

 unsigned int OsCmdExec(CmdParsed *cmdParsed, char *cmdStr)
 {
+    /* TODO: complete the usrspace command */
    unsigned int ret = SH_OK;
    if (cmdParsed && cmdStr) {
        ret = SH_NOK;
--- 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)
 {
@@ -133,7 +128,7 @@ int ShellNotify(ShellCB *shellCB)
 }

 enum {
-    STAT_NORMAL_KEY,
+    STAT_NOMAL_KEY,
    STAT_ESC_KEY,
    STAT_MULTI_KEY
 };
@@ -152,23 +147,23 @@ static int ShellCmdLineCheckUDRL(const char ch, ShellCB *shellCB)
    } else if (ch == 0x41) { /* up */
        if (shellCB->shellKeyType == STAT_MULTI_KEY) {
            OsShellHistoryShow(CMD_KEY_UP, shellCB);
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
            return ret;
        }
    } else if (ch == 0x42) { /* down */
        if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
            OsShellHistoryShow(CMD_KEY_DOWN, shellCB);
            return ret;
        }
    } else if (ch == 0x43) { /* right */
        if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
            return ret;
        }
    } else if (ch == 0x44) { /* left */
        if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
            return ret;
        }
    }
@@ -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;
    }

@@ -265,7 +246,7 @@ void ParseNormalChar(char ch, OutputFunc outputFunc, ShellCB *shellCB)
        outputFunc("%c", ch);
    }

-    shellCB->shellKeyType = STAT_NORMAL_KEY;
+    shellCB->shellKeyType = STAT_NOMAL_KEY;
 }

 void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB)
@@ -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 */
@@ -334,12 +312,12 @@ char *GetCmdName(const char *cmdline, unsigned int len)
        /* If reach a double quotes, switch the quotes matching status */
        if (*tmpStr == '\"') {
            SWITCH_QUOTES_STATUS(quotes);
-            /* Ignore the double quote character itself */
+            /* Ignore the double quote charactor itself */
            tmpStr++;
            continue;
        }
        /* If detected a space which the quotes matching status is false */
-        /* which said has detected the first space for separator, finish this scan operation */
+        /* which said has detected the first space for seperator, finish this scan operation */
        if ((*tmpStr == ' ') && (QUOTES_STATUS_CLOSE(quotes))) {
            break;
        }
@@ -351,94 +329,40 @@ char *GetCmdName(const char *cmdline, unsigned int len)
    return cmdName;
 }

-void ChildExec(const char *cmdName, char *const paramArray[], bool foreground)
+static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, const CmdParsed *cmdParsed)
 {
-    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);
-        exit(1);
-    }
-
-    if (!foreground) {
-        ret = tcsetpgrp(STDIN_FILENO, gid);
-        if (ret != 0) {
-            printf("tcsetpgrp failed, errno %d\n", errno);
-            exit(1);
-        }
-    }
-
-    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 = NULL;
-        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, CmdParsed *cmdParsed)
-{
-    bool foreground = FALSE;
    int ret;
    pid_t forkPid;
+    pid_t gid;

-    if (strncmp(cmdline, CMD_EXEC_COMMAND, CMD_EXEC_COMMAND_BYTES) == 0) {
-        if ((cmdParsed->paramCnt > 1) && (strcmp(cmdParsed->paramArray[cmdParsed->paramCnt - 1], "&") == 0)) {
-            free(cmdParsed->paramArray[cmdParsed->paramCnt - 1]);
-            cmdParsed->paramArray[cmdParsed->paramCnt - 1] = NULL;
-            cmdParsed->paramCnt--;
-            foreground = TRUE;
-        }
-
+    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, foreground);
-        } else {
-            if (!foreground) {
-                (void)waitpid(forkPid, 0, 0);
+            ret = setpgrp();
+            if (ret == -1) {
+                exit(1);
            }
-            ret = tcsetpgrp(STDIN_FILENO, getpid());
+
+            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);
    }
 }
@@ -473,7 +397,7 @@ static void ParseAndExecCmdline(CmdParsed *cmdParsed, const char *cmdline, unsig
    DoCmdExec(cmdName, cmdlineOrigin, len, cmdParsed);

    if (getcwd(shellWorkingDirectory, PATH_MAX) != NULL) {
-        (void)OsShellSetWorkingDirectory(shellWorkingDirectory, (PATH_MAX + 1));
+        (void)OsShellSetWorkingDirtectory(shellWorkingDirectory, (PATH_MAX + 1));
    }

 OUT:
@@ -493,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);
@@ -515,7 +439,7 @@ unsigned int PreHandleCmdline(const char *input, char **output, unsigned int *ou
    *output = shiftStr;
    *outputlen = shiftLen;

-    /* Check and parse "./", located at the first two characters of the cmd */
+    /* Check and parse "./", located at the first two charaters of the cmd */
    if ((shiftLen > removeLen) && (shiftStr[0] == '.') && (shiftStr[1] == '/')) {
        execLen = strlen(execCmd);
        newLen = execLen + shiftLen - removeLen; /* i.e., newLen - execLen == shiftLen - removeLen */
@@ -579,18 +503,24 @@ static void ExecCmdline(const char *cmdline)
    free(output);
 }

+void RecycleZombieChild(void)
+{
+    while (waitpid(-1, NULL, WNOHANG) > 0) {
+        continue;
+    }
+}
+
 static void ShellCmdProcess(ShellCB *shellCB)
 {
+    char *buf = NULL;
    while (1) {
-        char *buf = GetCmdline(shellCB);
+        /* recycle zombine child process */
+        RecycleZombieChild();
+        buf = GetCmdline(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;
@@ -656,19 +586,25 @@ static int ShellKernelReg(unsigned int shellHandle)
    return ioctl(STDIN_FILENO, CONSOLE_CONTROL_REG_USERTASK, shellHandle);
 }

-void ShellEntry(ShellCB *shellCB)
+void *ShellEntry(void *argv)
 {
    char ch;
    int ret;
    int n;
    pid_t tid = syscall(__NR_gettid);
+    ShellCB *shellCB = (ShellCB *)argv;

    if (shellCB == NULL) {
-        return;
+        return NULL;
    }

    (void)memset_s(shellCB->shellBuf, SHOW_MAX_LEN, 0, SHOW_MAX_LEN);

+    ret = prctl(PR_SET_NAME, "ShellEntry");
+    if (ret != SH_OK) {
+        return NULL;
+    }
+
    ret = ShellKernelReg((int)tid);
    if (ret != 0) {
        printf("another shell is already running!\n");
@@ -681,5 +617,32 @@ void ShellEntry(ShellCB *shellCB)
            ShellCmdLineParse(ch, (OutputFunc)printf, shellCB);
        }
    }
-    return;
+    return NULL;
 }
+
+int ShellEntryInit(ShellCB *shellCB)
+{
+    int ret;
+    size_t stackSize = SHELL_ENTRY_STACKSIZE;
+    void *arg = NULL;
+    pthread_attr_t attr;
+
+    if (shellCB == NULL) {
+        return SH_NOK;
+    }
+
+    ret = pthread_attr_init(&attr);
+    if (ret != SH_OK) {
+        return SH_NOK;
+    }
+
+    pthread_attr_setstacksize(&attr, stackSize);
+    arg = (void *)shellCB;
+    ret = pthread_create(&shellCB->shellEntryHandle, &attr, &ShellEntry, arg);
+    if (ret != SH_OK) {
+        return SH_NOK;
+    }
+
+    return ret;
+}
+
--- a/apps/tftp/BUILD.gn
+++ b/apps/tftp/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")
-
-executable("tftp") {
-  sources = [
-    "src/main.c",
-    "src/tftpc.c",
-  ]
-
-  deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ]
-
-  include_dirs = [ "include" ]
-}
--- 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/tftp/include/tftpc.h
+++ b/apps/tftp/include/tftpc.h
@@ -42,7 +42,7 @@ extern "C" {

 #define TFTP_NULL_UINT32        ((u32_t)0xffffffffUL)

-#define TFTP_NULL_INT32         (-1)
+#define TFTP_NULL_INT32       -1

 /** @cond liteos
 * @defgroup TFTP_Interfaces
@@ -114,7 +114,7 @@ typedef enum tagTFTPC_OpCode {
    TFTPC_OP_RRQ = 1,         /* read request */
    TFTPC_OP_WRQ,             /* write request */
    TFTPC_OP_DATA,            /* data packet */
-    TFTPC_OP_ACK,             /* acknowledgment */
+    TFTPC_OP_ACK,             /* acknowledgement */
    TFTPC_OP_ERROR,           /* error code */
    TFTPC_OP_OPT              /* option code */
 } TFTPC_OPCODE_E;
--- a/apps/tftp/src/main.c
+++ b/apps/tftp/src/main.c
@@ -50,11 +50,11 @@ static char *TftpError[] = {
    "Error while sending data to the peer\n",
    "Requested file is not found\n",
    "This is the error sent by the server when hostname cannot be resolved\n",
-    "Input parameters passed to TFTP interfaces are invalid\n",
+    "Input paramters passed to TFTP interfaces are invalid\n",
    "Error detected in TFTP packet or the error received from the TFTP server\n",
    "Error during packet synhronization while sending or unexpected packet is received\n",
    "File size limit crossed, Max block can be 0xFFFF, each block containing 512 bytes\n",
-    "File name length greater than 256\n",
+    "File name lenght greater than 256\n",
    "Hostname IP is not valid\n",
    "TFTP server returned file access error\n",
    "TFTP server returned error signifying that the DISK is full to write\n",
@@ -66,11 +66,11 @@ static char *TftpError[] = {
    "File create error\n",
    "File write error\n",
    "Max time expired while waiting for file to be recived\n",
-    "Error when the received packet is less than 4bytes(error length) or greater than 512bytes\n",
+    "Error when the received packet is less than 4bytes(error lenght) or greater than 512bytes\n",
    "Returned by TFTP server for protocol user error\n",
    "The destination file path length greater than 256\n",
    "Returned by TFTP server for undefined transfer ID\n",
-    "IOCTL function failed at TFTP client while setting the socket to non-block\n",
+    "IOCTL fucntion failed at TFTP client while setting the socket to non-block\n",
 };

 #ifndef ARRAY_SIZE
--- a/apps/tftp/src/tftpc.c
+++ b/apps/tftp/src/tftpc.c
@@ -189,7 +189,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
    if (iRet == -1) {
        return TFTPC_SELECT_ERROR;
    } else if (iRet == 0) {
-        return TFTPC_TIMEOUT_ERROR;         /* Select timeout occurred */
+        return TFTPC_TIMEOUT_ERROR;         /* Select timeout occured */
    }

    if (!FD_ISSET(iSockNum, &stReadfds)) {
@@ -218,7 +218,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
    usOpcode = ntohs(pstRecvBuf->usOpcode);
    /* if this packet is ERROR packet */
    if (usOpcode == TFTPC_OP_ERROR) {
-        ulError = ntohs(pstRecvBuf->u.stTFTP_Err.usErrNum);
+        ulError = ntohs (pstRecvBuf->u.stTFTP_Err.usErrNum);

        /*If the error is according to RFC,then convert to lwip error codes.
        Constant values are used in the cases as these error codes are as per
@@ -268,7 +268,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
    *pulSize = (u32_t)iRet;

    /* If received packet is first block of data(for get operation) or if
-       received packet is acknowledgment for write request (put operation)
+       received packet is acknowledgement for write request (put operation)
       store the received port number */
    if (((usOpcode == TFTPC_OP_DATA) &&
         (ntohs(pstRecvBuf->u.stTFTP_Data.usBlknum) == 1)) ||
@@ -687,7 +687,7 @@ u32_t lwip_tftp_get_file_by_filename(u32_t ulHostAddr,

        ulErrCode = lwip_tftp_recv_from_server(iSockNum, &ulRecvSize, pstRecvBuf,
                                               &ulIgnorePkt, &stServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
        if (ulErrCode == TFTPC_TIMEOUT_ERROR) {
            ulTotalTime++;
            if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -727,7 +727,7 @@ u32_t lwip_tftp_get_file_by_filename(u32_t ulHostAddr,
        }

        /* if this packet is unkonwn or incorrect packet */
-        if (ntohs(pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
+        if (ntohs (pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
            /* Send error packet to server */
            lwip_tftp_send_error(iSockNum,
                                 TFTPC_PROTOCOL_PROTO_ERROR,
@@ -982,7 +982,7 @@ u32_t lwip_tftp_put_file_by_filename(u32_t ulHostAddr, u16_t usTftpServPort, u8_
        return TFTPC_MEMALLOC_ERROR;
    }

-    /* First time initialize the buffer */
+    /* First time intialize the buffer */
    (void)memset_s((void *)pstSendBuf, sizeof(TFTPC_PACKET_S), 0, sizeof(TFTPC_PACKET_S));

    /* The destination path can only be one of the following:
@@ -1221,7 +1221,7 @@ u32_t lwip_tftp_inner_put_file(s32_t iSockNum,
        return TFTPC_MEMALLOC_ERROR;
    }

-    /* First time initialize the buffer */
+    /* First time intialize the buffer */
    (void)memset_s((void *)pstRecvBuf, sizeof(TFTPC_PACKET_S), 0, sizeof(TFTPC_PACKET_S));

    /* Initialize from address to the server address at first */
@@ -1235,7 +1235,7 @@ u32_t lwip_tftp_inner_put_file(s32_t iSockNum,
        ulError = lwip_tftp_recv_from_server(iSockNum, &ulPktSize,
                                             pstRecvBuf, &ulIgnorePkt,
                                             pstServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
        if (ulError == TFTPC_TIMEOUT_ERROR) {
            ulTotalTime++;
            if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -1526,7 +1526,7 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,

        ulErrCode = lwip_tftp_recv_from_server(iSockNum, &ulRecvSize, pstRecvBuf, &ulIgnorePkt,
                                               &stServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
        if (ulErrCode == TFTPC_TIMEOUT_ERROR) {
            ulTotalTime++;
            if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -1557,7 +1557,7 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,
        }

        /* if this packet is unkonwn or incorrect packet */
-        if (ntohs(pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
+        if (ntohs (pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
            /* Send error packet to server */
            lwip_tftp_send_error(iSockNum,
                                 TFTPC_PROTOCOL_PROTO_ERROR,
--- a/apps/toybox/BUILD.gn
+++ b/apps/toybox/BUILD.gn
@@ -1,84 +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")
-import("//third_party/toybox/toybox.gni")
-
-group("toybox") {
-  deps = [ ":build_toybox" ]
-}
-
-copy("copy_toybox_src") {
-  sources = TOYBOX_SRC_DIR
-  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_config",
-    ":copy_toybox_src",
-  ]
-  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,42 @@
 # 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:
-ifneq ($(wildcard $(BUILD_DIR)),)
-	$(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)/../
+CFLAGS := -D_FORTIFY_SOURCE=2 -fstack-protector-strong
+LDFLAGS :=
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
+CFLAGS += --target=$(LLVM_TARGET) $(LLVM_SYSROOT)
+LDFLAGS += --target=$(LLVM_TARGET) $(LLVM_SYSROOT)
 endif
-	$(HIDE)unset KCONFIG_CONFIG CROSS_COMPILE && \
-	env CC="$(CC)" OUTNAME="$(OUT)/bin/toybox" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" STRIP="$(STRIP)" \
+
+$(TOYBOX):
+ifneq ($(wildcard $(BUILD_DIR)),)
+	$(HIDE)echo "not clean, rebuilding now";
+else
+	$(HIDE)mkdir $(BUILD_DIR)
+	$(HIDE)$(CP) $(LITEOSTHIRDPARTY)/$(TOYBOX)/. $(BUILD_DIR)
+	$(HIDE)$(CP) -p $(LITEOSTHIRDPARTY)/$(TOYBOX)/porting/liteos_a/. $(BUILD_DIR)
+endif
+
+	$(HIDE)CFLAGS="$(CFLAGS)" CC="$(CC)" OUTNAME="$(OUTNAME)" \
+	LDFLAGS="$(LDFLAGS)" STRIP="$(STRIP)" \
 	make -C $(BUILD_DIR) toybox -j> $(BUILD_LOG) 2>&1
+	$(HIDE)$(CP) $(BUILD_DIR)/$(TOYBOX) .
+	$(HIDE)mkdir -p $(APPS_OUT)
+	$(HIDE)$(CP) $(TOYBOX) $(APPS_OUT)
+	$(HIDE)$(RM) $(BUILD_DIR) $(BUILD_LOG)

 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/BUILD.gn
+++ b/apps/trace/BUILD.gn
@@ -1,34 +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("trace") {
-  sources = [ "src/trace.c" ]
-}
--- a/apps/trace/src/trace.c
+++ b/apps/trace/src/trace.c
@@ -1,141 +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;
-    if (size <= 0) {
-        return;
-    }
-
-    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); /* 2, argv number  */
-    info.identity = strtoul(argv[3], NULL, 0); /* 3, argv number  */
-    /* 4, argc -4 means user argv that does not contain argv[0]~argv[3] */
-    int paramNum = (argc - 4) > TRACE_USR_MAX_PARAMS ? TRACE_USR_MAX_PARAMS : (argc - 4);
-
-    for (i = 0; i < paramNum; i++) {
-        /* 4, argc -4 means user argv that does not contain argv[0]~argv[3] */
-        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) { /* 2, argv num, no special meaning */
-        ioctl(fd, TRACE_START, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "stop") == 0) { /* 2, argv num, no special meaning */
-        ioctl(fd, TRACE_STOP, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "reset") == 0) { /* 2, argv num, no special meaning */
-        ioctl(fd, TRACE_RESET, NULL);
-    } else if (argc == 3 && strcmp(argv[1], "mask") == 0) { /* 3, argv num, no special meaning */
-        size_t mask = strtoul(argv[2], NULL, 0);
-        ioctl(fd, TRACE_SET_MASK, mask);
-    } else if (argc == 3 && strcmp(argv[1], "dump") == 0) { /* 3, argv num, no special meaning */
-        size_t flag = strtoul(argv[2], NULL, 0);
-        ioctl(fd, TRACE_DUMP, flag);
-    } else if (argc == 3 && strcmp(argv[1], "read") == 0) { /* 3, argv num, no special meaning */
-        size_t size = strtoul(argv[2], NULL, 0);
-        TraceRead(fd, size);
-    } else if (argc >= 4 && strcmp(argv[1], "write") == 0) { /* 4, argv num, no special meaning */
-        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,11 +66,37 @@ 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)
+    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_DISABLE
+else ifeq ($(LOSCFG_ARCH_FPU_VFP_D16), y)
+    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_VFP_D16
+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,96 +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/smp.c",
-    "src/strncpy_from_user.c",
-    "src/strnlen_user.c",
-    "src/user_copy.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_PERF_HW_PMU)) {
-    sources += [ "src/pmu/armv7_pmu.c" ]
-  }
-
-  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
@@ -32,8 +32,13 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(LOSCFG_ARCH_CPU)

 LOCAL_SRCS := $(wildcard src/*.c) $(wildcard src/*.S)
+LOCAL_INCLUDE := \
+	-I $(LITEOSTOPDIR)/kernel/base/include \
+	-I $(LITEOSTOPDIR)/kernel/extended/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

@@ -43,21 +48,7 @@ else
 LOCAL_SRCS += src/startup/reset_vector_up.S
 endif

-ifeq ($(LOSCFG_PERF_HW_PMU), y)
-LOCAL_SRCS += src/pmu/armv7_pmu.c
-endif
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
-
-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)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)

 ifeq ($(LOSCFG_GDB), y)
 LOCAL_FLAGS += $(AS_OBJS_LIBC_FLAGS)
--- a/arch/arm/arm/include/hal_timer.h
+++ b/arch/arm/arm/include/hal_timer.h
@@ -46,7 +46,7 @@ extern VOID HalClockInit(VOID);
 extern UINT64 HalClockGetCycles(VOID);
 extern VOID HalDelayUs(UINT32 usecs);
 extern UINT32 HalClockGetTickTimerCycles(VOID);
-extern UINT64 HalClockTickTimerReload(UINT64 cycles);
+extern VOID HalClockTickTimerReload(UINT64 cycles);

 extern UINT32 HrtimersInit(VOID);
 extern VOID HrtimerClockIrqClear(VOID);
--- a/arch/arm/arm/include/los_arch_mmu.h
+++ b/arch/arm/arm/include/los_arch_mmu.h
@@ -38,10 +38,7 @@
 #define __LOS_ARCH_MMU_H__

 #include "los_typedef.h"
-#include "los_vm_phys.h"
-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-#include "los_spinlock.h"
-#endif
+#include "los_mux.h"

 #ifdef __cplusplus
 #if __cplusplus
@@ -50,9 +47,7 @@ extern "C" {
 #endif /* __cplusplus */

 typedef struct ArchMmu {
-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-    SPIN_LOCK_S         lock;           /**< arch mmu page table entry modification spin lock */
-#endif
+    LosMux              mtx;            /**< arch mmu page table entry modification mutex lock */
    VADDR_T             *virtTtb;       /**< translation table base virtual addr */
    PADDR_T             physTtb;        /**< translation table base phys addr */
    UINT32              asid;           /**< TLB asid */
@@ -76,5 +71,5 @@ VADDR_T *OsGFirstTableGet(VOID);
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* __LOS_ARCH_MMU_H__ */
+#endif /* __LOS_VM_PAGE_H__ */

--- a/arch/arm/arm/include/los_atomic.h
+++ b/arch/arm/arm/include/los_atomic.h
@@ -246,7 +246,7 @@ STATIC INLINE INT32 LOS_AtomicIncRet(Atomic *v)
 * @brief Atomic auto-decrement.
 *
 * @par Description:
- * This API is used to implement the atomic auto-decrement.
+ * This API is used to implementating the atomic auto-decrement.
 * @attention
 * <ul>
 * <li>The pointer v must not be NULL.</li>
@@ -280,7 +280,7 @@ STATIC INLINE VOID LOS_AtomicDec(Atomic *v)
 * @brief Atomic auto-decrement.
 *
 * @par Description:
- * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
 * @attention
 * <ul>
 * <li>The pointer v must not be NULL.</li>
@@ -531,7 +531,7 @@ STATIC INLINE INT64 LOS_Atomic64IncRet(Atomic64 *v)
 * @brief Atomic64 auto-decrement.
 *
 * @par Description:
- * This API is used to implement the atomic64 auto-decrement.
+ * This API is used to implementating the atomic64 auto-decrement.
 * @attention
 * <ul>
 * <li>The pointer v must not be NULL.</li>
@@ -566,7 +566,7 @@ STATIC INLINE VOID LOS_Atomic64Dec(Atomic64 *v)
 * @brief Atomic64 auto-decrement.
 *
 * @par Description:
- * This API is used to implement the atomic64 auto-decrement and return the result of auto-decrement.
+ * This API is used to implementating the atomic64 auto-decrement and return the result of auto-decrement.
 * @attention
 * <ul>
 * <li>The pointer v must not be NULL.</li>
--- 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/include/los_pte_ops.h
+++ b/arch/arm/arm/include/los_pte_ops.h
@@ -69,11 +69,6 @@ STATIC INLINE VOID OsClearPte1(PTE_T *pte1Ptr)
    OsSavePte1(pte1Ptr, 0);
 }

-STATIC INLINE PADDR_T OsGetPte1Paddr(PADDR_T PhysTtb, vaddr_t va)
-{
-    return (PhysTtb + (OsGetPte1Index(va) * sizeof(PADDR_T)));
-}
-
 STATIC INLINE PTE_T *OsGetPte1Ptr(PTE_T *pte1BasePtr, vaddr_t va)
 {
    return (pte1BasePtr + OsGetPte1Index(va));
--- a/arch/arm/arm/src/arm_generic_timer.c
+++ b/arch/arm/arm/src/arm_generic_timer.c
@@ -31,6 +31,7 @@

 #include "los_hw_pri.h"
 #include "los_tick_pri.h"
+#include "los_sched_pri.h"
 #include "los_sys_pri.h"
 #include "gic_common.h"

@@ -138,6 +139,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalClockInit(VOID)

 LITE_OS_SEC_TEXT_INIT VOID HalClockStart(VOID)
 {
+    UINT32 ret = OsSchedSetTickTimerType(64); /* 64 bit tick timer */
+    if (ret != LOS_OK) {
+        return;
+    }
+
    HalIrqUnmask(OS_TICK_INT_NUM);

    /* triggle the first tick */
@@ -169,7 +175,7 @@ UINT32 HalClockGetTickTimerCycles(VOID)
    return (UINT32)((cval > cycles) ? (cval - cycles) : 0);
 }

-UINT64 HalClockTickTimerReload(UINT64 cycles)
+VOID HalClockTickTimerReload(UINT64 cycles)
 {
    HalIrqMask(OS_TICK_INT_NUM);
    HalIrqClear(OS_TICK_INT_NUM);
@@ -179,5 +185,4 @@ UINT64 HalClockTickTimerReload(UINT64 cycles)
    TimerCtlWrite(1);

    HalIrqUnmask(OS_TICK_INT_NUM);
-    return cycles;
 }
--- a/arch/arm/arm/src/include/armv7_pmu_pri.h
+++ b/arch/arm/arm/src/include/armv7_pmu_pri.h
@@ -1,108 +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 _ARMV7_PMU_PRI_H
-#define _ARMV7_PMU_PRI_H
-
-#include "los_typedef.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-/* counters overflow flag status reg */
-#define ARMV7_FLAG_MASK         0xffffffff                 /* Mask for writable bits */
-#define ARMV7_OVERFLOWED_MASK   ARMV7_FLAG_MASK            /* Mask for pmu overflowed */
-
-/* pmnc config reg */
-#define ARMV7_PMNC_E            (1U << 0)                  /* Enable all counters */
-#define ARMV7_PMNC_P            (1U << 1)                  /* Reset all counters */
-#define ARMV7_PMNC_C            (1U << 2)                  /* Cycle counter reset */
-#define ARMV7_PMNC_D            (1U << 3)                  /* CCNT counts every 64th cpu cycle */
-#define ARMV7_PMNC_X            (1U << 4)                  /* Export to ETM */
-#define ARMV7_PMNC_DP           (1U << 5)                  /* Disable CCNT if non-invasive debug */
-#define ARMV7_PMNC_MASK         0x3f                       /* Mask for writable bits */
-
-/* pmxevtyper event selection reg */
-#define ARMV7_EVTYPE_MASK       0xc80000ff                 /* Mask for writable bits */
-
-/* armv7 counters index */
-#define ARMV7_IDX_COUNTER0      1
-#define ARMV7_IDX_CYCLE_COUNTER 0
-#define ARMV7_IDX_MAX_COUNTER   9
-
-#define ARMV7_MAX_COUNTERS      32
-#define ARMV7_IDX_COUNTER_LAST  (ARMV7_IDX_CYCLE_COUNTER + ARMV7_MAX_COUNTERS - 1)
-#define ARMV7_COUNTER_MASK      (ARMV7_MAX_COUNTERS - 1)
-
-/* armv7 event counter index mapping */
-#define ARMV7_CNT2BIT(x)        (1UL << (x))
-#define ARMV7_IDX2CNT(x)        (((x) - ARMV7_IDX_COUNTER0) & ARMV7_COUNTER_MASK)
-
-enum PmuEventType {
-    ARMV7_PERF_HW_CYCLES                   = 0xFF,    /* cycles */
-    ARMV7_PERF_HW_INSTRUCTIONS             = 0x08,    /* instructions */
-    ARMV7_PERF_HW_DCACHES                  = 0x04,    /* dcache */
-    ARMV7_PERF_HW_DCACHE_MISSES            = 0x03,    /* dcache-misses */
-    ARMV7_PERF_HW_ICACHES                  = 0x14,    /* icache */
-    ARMV7_PERF_HW_ICACHE_MISSES            = 0x01,    /* icache-misses */
-    ARMV7_PERF_HW_BRANCHES                 = 0x0C,    /* software change of pc */
-    ARMV7_PERF_HW_BRANCE_MISSES            = 0x10,    /* branch-misses */
-    ARMV7_PERF_HW_PRED_BRANCH              = 0x12,    /* predictable branches */
-    ARMV7_PERF_HW_NUM_CYC_IRQ              = 0x50,    /* number of cycles Irqs are interrupted */
-    ARMV7_PERF_HW_EXC_TAKEN                = 0x09,    /* exception_taken */
-    ARMV7_PERF_HW_DATA_READ                = 0x06,    /* data read */
-    ARMV7_PERF_HW_DATA_WRITE               = 0x07,    /* data write */
-    ARMV7_PERF_HW_STREX_PASSED             = 0x80,    /* strex passed */
-    ARMV7_PERF_HW_STREX_FAILED             = 0x81,    /* strex failed */
-    ARMV7_PERF_HW_LP_IN_TCM                = 0x82,    /* literal pool in TCM region */
-    ARMV7_PERF_HW_DMB_STALL                = 0x90,    /* DMB stall */
-    ARMV7_PERF_HW_ITCM_ACCESS              = 0x91,    /* ITCM access */
-    ARMV7_PERF_HW_DTCM_ACCESS              = 0x92,    /* DTCM access */
-    ARMV7_PERF_HW_DATA_EVICTION            = 0x93,    /* data eviction */
-    ARMV7_PERF_HW_SCU                      = 0x94,    /* SCU coherency operation */
-    ARMV7_PERF_HW_INSCACHE_DEP_DW          = 0x95,    /* instruction cache dependent stall */
-    ARMV7_PERF_HW_DATA_CACHE_DEP_STALL     = 0x96,    /* data cache dependent stall */
-    ARMV7_PERF_HW_NOCACHE_NO_PER_DEP_STALL = 0x97,    /* non-cacheable no peripheral dependent stall */
-    ARMV7_PERF_HW_NOCACHE_PER_DEP_STALL    = 0x98,    /* non-Cacheable peripheral dependent stall */
-    ARMV7_PERF_HW_DATA_CACHE_HP_DEP_STALL  = 0x99,    /* data cache high priority dependent stall */
-    ARMV7_PERF_HW_AXI_FAST_PERIPHERAL      = 0x9A,    /* Accesses_to_AXI_fast_peripheral_port(reads_and_writes) */
-};
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#endif /* _ARMV7_PMU_PRI_H */
--- a/arch/arm/arm/src/include/los_exc_pri.h
+++ b/arch/arm/arm/src/include/los_exc_pri.h
@@ -44,24 +44,10 @@ extern "C" {
 #define OS_SYSTEM_EXC_CURR_CPU  1
 #define OS_SYSTEM_EXC_OTHER_CPU 2

-#define REGION_PATH_MAX 32
-
-typedef struct {
-#ifdef LOSCFG_KERNEL_VM
-    UINTPTR ip;
-    UINT32 len; /* f_path length */
-    CHAR f_path[REGION_PATH_MAX];
-#else
-    UINTPTR ip;
-#endif
-} IpInfo;
-
 extern UINT32 OsGetSystemStatus(VOID);
 extern VOID BackTraceSub(UINTPTR regFP);
 extern VOID OsExcInit(VOID);
 extern BOOL OsSystemExcIsReset(VOID);
-extern UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth);
-extern BOOL OsGetUsrIpInfo(UINTPTR ip, IpInfo *info);

 #ifdef __cplusplus
 #if __cplusplus
--- a/arch/arm/arm/src/include/los_hwi_pri.h
+++ b/arch/arm/arm/src/include/los_hwi_pri.h
@@ -55,8 +55,8 @@ extern "C" {
 #define HWI_IS_REGISTED(num)             ((&g_hwiForm[num])->pstNext != NULL)
 #endif
 extern VOID OsHwiInit(VOID);
-extern VOID OsIncHwiFormCnt(UINT16 cpuid, UINT32 index);
-extern UINT32 OsGetHwiFormCnt(UINT16 cpuid, UINT32 index);
+extern VOID OsIncHwiFormCnt(UINT32 index);
+extern UINT32 OsGetHwiFormCnt(UINT32 index);
 extern CHAR *OsGetHwiFormName(UINT32 index);
 extern VOID OsInterrupt(UINT32 intNum);
 extern VOID OsSyscallHandleInit(VOID);
--- a/arch/arm/arm/src/los_arch_mmu.c
+++ b/arch/arm/arm/src/los_arch_mmu.c
@@ -39,21 +39,14 @@
 #include "los_pte_ops.h"
 #include "los_tlb_v6.h"
 #include "los_printf.h"
+#include "los_vm_phys.h"
 #include "los_vm_common.h"
 #include "los_vm_map.h"
 #include "los_vm_boot.h"
 #include "los_mmu_descriptor_v6.h"
-#include "los_process_pri.h"
+

 #ifdef LOSCFG_KERNEL_MMU
-typedef struct {
-    LosArchMmu *archMmu;
-    VADDR_T *vaddr;
-    PADDR_T *paddr;
-    UINT32 *flags;
-} MmuMapInfo;
-
-#define TRY_MAX_TIMES 10

 __attribute__((aligned(MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS))) \
    __attribute__((section(".bss.prebss.translation_table"))) UINT8 \
@@ -68,75 +61,6 @@ extern CHAR __mmu_ttlb_begin; /* defined in .ld script */
 UINT8 *g_mmuJumpPageTable = (UINT8 *)&__mmu_ttlb_begin; /* temp page table, this is only used when system power up */
 #endif

-STATIC SPIN_LOCK_S *OsGetPteLock(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    SPIN_LOCK_S *lock = NULL;
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    LosVmPage *vmPage = NULL;
-
-    vmPage = OsVmPaddrToPage(paddr);
-    if (vmPage == NULL) {
-        return NULL;
-    }
-    lock = &vmPage->lock;
-#else
-    lock = &archMmu->lock;
-#endif
-
-    LOS_SpinLockSave(lock, intSave);
-    return lock;
-}
-
-STATIC SPIN_LOCK_S *OsGetPte1Lock(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    return OsGetPteLock(archMmu, paddr, intSave);
-}
-
-STATIC INLINE VOID OsUnlockPte1(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-    if (lock == NULL) {
-        return;
-    }
-    LOS_SpinUnlockRestore(lock, intSave);
-}
-
-STATIC SPIN_LOCK_S *OsGetPte1LockTmp(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    SPIN_LOCK_S *spinLock = NULL;
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    spinLock = OsGetPteLock(archMmu, paddr, intSave);
-#else
-    (VOID)archMmu;
-    (VOID)paddr;
-    (VOID)intSave;
-#endif
-    return spinLock;
-}
-
-STATIC INLINE VOID OsUnlockPte1Tmp(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    if (lock == NULL) {
-        return;
-    }
-    LOS_SpinUnlockRestore(lock, intSave);
-#else
-    (VOID)lock;
-    (VOID)intSave;
-#endif
-}
-
-STATIC INLINE SPIN_LOCK_S *OsGetPte2Lock(LosArchMmu *archMmu, PTE_T pte1, UINT32 *intSave)
-{
-    PADDR_T pa = MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1);
-    return OsGetPteLock(archMmu, pa, intSave);
-}
-
-STATIC INLINE VOID OsUnlockPte2(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-    return OsUnlockPte1(lock, intSave);
-}
-
 STATIC INLINE PTE_T *OsGetPte2BasePtr(PTE_T pte1)
 {
    PADDR_T pa = MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1);
@@ -248,30 +172,20 @@ STATIC VOID OsPutL2Table(const LosArchMmu *archMmu, UINT32 l1Index, paddr_t l2Pa
 #endif
 }

-STATIC VOID OsTryUnmapL1PTE(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t vaddr, UINT32 scanIndex, UINT32 scanCount)
+STATIC VOID OsTryUnmapL1PTE(const LosArchMmu *archMmu, vaddr_t vaddr, UINT32 scanIndex, UINT32 scanCount)
 {
    /*
     * Check if all pages related to this l1 entry are deallocated.
     * We only need to check pages that we did not clear above starting
-     * from scanIndex and wrapped around SECTION.
+     * from page_idx and wrapped around SECTION.
     */
    UINT32 l1Index;
+    PTE_T l1Entry;
    PTE_T *pte2BasePtr = NULL;
-    SPIN_LOCK_S *pte1Lock = NULL;
-    SPIN_LOCK_S *pte2Lock = NULL;
-    UINT32 pte1IntSave;
-    UINT32 pte2IntSave;
-    PTE_T pte1Val;
-    PADDR_T pte1Paddr;

-    pte1Paddr = OsGetPte1Paddr(archMmu->physTtb, vaddr);
-    pte2Lock = OsGetPte2Lock(archMmu, *l1Entry, &pte2IntSave);
-    if (pte2Lock == NULL) {
-        return;
-    }
-    pte2BasePtr = OsGetPte2BasePtr(*l1Entry);
+    pte2BasePtr = OsGetPte2BasePtr(OsGetPte1(archMmu->virtTtb, vaddr));
    if (pte2BasePtr == NULL) {
-        OsUnlockPte2(pte2Lock, pte2IntSave);
+        VM_ERR("pte2 base ptr is NULL");
        return;
    }

@@ -286,27 +200,15 @@ STATIC VOID OsTryUnmapL1PTE(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t vaddr,
    }

    if (!scanCount) {
-        /*
-         * The pte1 of kprocess is placed in kernel image when compiled. So the pte1Lock will be null.
-         * There is no situation to simultaneous access the pte1 of kprocess.
-         */
-        pte1Lock = OsGetPte1LockTmp(archMmu, pte1Paddr, &pte1IntSave);
-        if (!OsIsPte1PageTable(*l1Entry)) {
-            OsUnlockPte1Tmp(pte1Lock, pte1IntSave);
-            OsUnlockPte2(pte2Lock, pte2IntSave);
-            return;
-        }
-        pte1Val = *l1Entry;
-        /* we can kill l1 entry */
-        OsClearPte1(l1Entry);
        l1Index = OsGetPte1Index(vaddr);
+        l1Entry = archMmu->virtTtb[l1Index];
+        /* we can kill l1 entry */
+        OsClearPte1(&archMmu->virtTtb[l1Index]);
        OsArmInvalidateTlbMvaNoBarrier(l1Index << MMU_DESCRIPTOR_L1_SMALL_SHIFT);

        /* try to free l2 page itself */
-        OsPutL2Table(archMmu, l1Index, MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1Val));
-        OsUnlockPte1Tmp(pte1Lock, pte1IntSave);
+        OsPutL2Table(archMmu, l1Index, MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(l1Entry));
    }
-    OsUnlockPte2(pte2Lock, pte2IntSave);
 }

 STATIC UINT32 OsCvtSecCacheFlagsToMMUFlags(UINT32 flags)
@@ -438,54 +340,34 @@ STATIC VOID OsCvtSecAttsToFlags(PTE_T l1Entry, UINT32 *flags)
    }
 }

-STATIC UINT32 OsUnmapL2PTE(LosArchMmu *archMmu, PTE_T *pte1, vaddr_t vaddr, UINT32 *count)
+STATIC UINT32 OsUnmapL2PTE(const LosArchMmu *archMmu, vaddr_t vaddr, UINT32 *count)
 {
    UINT32 unmapCount;
    UINT32 pte2Index;
-    UINT32 intSave;
    PTE_T *pte2BasePtr = NULL;
-    SPIN_LOCK_S *lock = NULL;
+
+    pte2BasePtr = OsGetPte2BasePtr(OsGetPte1((PTE_T *)archMmu->virtTtb, vaddr));
+    if (pte2BasePtr == NULL) {
+        LOS_Panic("%s %d, pte2 base ptr is NULL\n", __FUNCTION__, __LINE__);
+    }

    pte2Index = OsGetPte2Index(vaddr);
    unmapCount = MIN2(MMU_DESCRIPTOR_L2_NUMBERS_PER_L1 - pte2Index, *count);

-    lock = OsGetPte2Lock(archMmu, *pte1, &intSave);
-    if (lock == NULL) {
-        return unmapCount;
-    }
-
-    pte2BasePtr = OsGetPte2BasePtr(*pte1);
-    if (pte2BasePtr == NULL) {
-        OsUnlockPte2(lock, intSave);
-        return unmapCount;
-    }
-
    /* unmap page run */
    OsClearPte2Continuous(&pte2BasePtr[pte2Index], unmapCount);

    /* invalidate tlb */
    OsArmInvalidateTlbMvaRangeNoBarrier(vaddr, unmapCount);
-    OsUnlockPte2(lock, intSave);

    *count -= unmapCount;
    return unmapCount;
 }

-STATIC UINT32 OsUnmapSection(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t *vaddr, UINT32 *count)
+STATIC UINT32 OsUnmapSection(LosArchMmu *archMmu, vaddr_t *vaddr, UINT32 *count)
 {
-    UINT32 intSave;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *lock = NULL;
-
-    pte1Paddr = OsGetPte1Paddr(archMmu->physTtb, *vaddr);
-    lock = OsGetPte1Lock(archMmu, pte1Paddr, &intSave);
-    if (!OsIsPte1Section(*l1Entry)) {
-        OsUnlockPte1(lock, intSave);
-        return 0;
-    }
    OsClearPte1(OsGetPte1Ptr((PTE_T *)archMmu->virtTtb, *vaddr));
    OsArmInvalidateTlbMvaNoBarrier(*vaddr);
-    OsUnlockPte1(lock, intSave);

    *vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
    *count -= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
@@ -502,9 +384,12 @@ BOOL OsArchMmuInit(LosArchMmu *archMmu, VADDR_T *virtTtb)
    }
 #endif

-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-    LOS_SpinInit(&archMmu->lock);
-#endif
+    status_t retval = LOS_MuxInit(&archMmu->mtx, NULL);
+    if (retval != LOS_OK) {
+        VM_ERR("Create mutex for arch mmu failed, status: %d", retval);
+        return FALSE;
+    }
+
    LOS_ListInit(&archMmu->ptList);
    archMmu->virtTtb = virtTtb;
    archMmu->physTtb = (VADDR_T)(UINTPTR)virtTtb - KERNEL_ASPACE_BASE + SYS_MEM_BASE;
@@ -553,55 +438,45 @@ STATUS_T LOS_ArchMmuQuery(const LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T *pad

 STATUS_T LOS_ArchMmuUnmap(LosArchMmu *archMmu, VADDR_T vaddr, size_t count)
 {
-    PTE_T *l1Entry = NULL;
+    PTE_T l1Entry;
    INT32 unmapped = 0;
    UINT32 unmapCount = 0;
-    INT32 tryTime = TRY_MAX_TIMES;

    while (count > 0) {
-        l1Entry = OsGetPte1Ptr(archMmu->virtTtb, vaddr);
-        if (OsIsPte1Invalid(*l1Entry)) {
+        l1Entry = OsGetPte1(archMmu->virtTtb, vaddr);
+        if (OsIsPte1Invalid(l1Entry)) {
            unmapCount = OsUnmapL1Invalid(&vaddr, &count);
-        } else if (OsIsPte1Section(*l1Entry)) {
+        } else if (OsIsPte1Section(l1Entry)) {
            if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(vaddr) && count >= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1) {
-                unmapCount = OsUnmapSection(archMmu, l1Entry, &vaddr, &count);
+                unmapCount = OsUnmapSection(archMmu, &vaddr, &count);
            } else {
                LOS_Panic("%s %d, unimplemented\n", __FUNCTION__, __LINE__);
            }
-        } else if (OsIsPte1PageTable(*l1Entry)) {
-            unmapCount = OsUnmapL2PTE(archMmu, l1Entry, vaddr, &count);
-            OsTryUnmapL1PTE(archMmu, l1Entry, vaddr, OsGetPte2Index(vaddr) + unmapCount,
-                            MMU_DESCRIPTOR_L2_NUMBERS_PER_L1);
+        } else if (OsIsPte1PageTable(l1Entry)) {
+            unmapCount = OsUnmapL2PTE(archMmu, vaddr, &count);
+            OsTryUnmapL1PTE(archMmu, vaddr, OsGetPte2Index(vaddr) + unmapCount,
+                            MMU_DESCRIPTOR_L2_NUMBERS_PER_L1 - unmapCount);
            vaddr += unmapCount << MMU_DESCRIPTOR_L2_SMALL_SHIFT;
        } else {
            LOS_Panic("%s %d, unimplemented\n", __FUNCTION__, __LINE__);
        }
-        tryTime = (unmapCount == 0) ? (tryTime - 1) : tryTime;
-        if (tryTime == 0) {
-            return LOS_ERRNO_VM_FAULT;
-        }
        unmapped += unmapCount;
    }
    OsArmInvalidateTlbBarrier();
    return unmapped;
 }

-STATIC UINT32 OsMapSection(MmuMapInfo *mmuMapInfo, UINT32 *count)
+STATIC UINT32 OsMapSection(const LosArchMmu *archMmu, UINT32 flags, VADDR_T *vaddr,
+                           PADDR_T *paddr, UINT32 *count)
 {
    UINT32 mmuFlags = 0;
-    UINT32 intSave;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *lock = NULL;

-    mmuFlags |= OsCvtSecFlagsToAttrs(*mmuMapInfo->flags);
-    pte1Paddr = OsGetPte1Paddr(mmuMapInfo->archMmu->physTtb, *mmuMapInfo->vaddr);
-    lock = OsGetPte1Lock(mmuMapInfo->archMmu, pte1Paddr, &intSave);
-    OsSavePte1(OsGetPte1Ptr(mmuMapInfo->archMmu->virtTtb, *mmuMapInfo->vaddr),
-        OsTruncPte1(*mmuMapInfo->paddr) | mmuFlags | MMU_DESCRIPTOR_L1_TYPE_SECTION);
-    OsUnlockPte1(lock, intSave);
+    mmuFlags |= OsCvtSecFlagsToAttrs(flags);
+    OsSavePte1(OsGetPte1Ptr(archMmu->virtTtb, *vaddr),
+        OsTruncPte1(*paddr) | mmuFlags | MMU_DESCRIPTOR_L1_TYPE_SECTION);
    *count -= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
-    *mmuMapInfo->vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
-    *mmuMapInfo->paddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
+    *vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
+    *paddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;

    return MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
 }
@@ -642,10 +517,27 @@ STATIC STATUS_T OsGetL2Table(LosArchMmu *archMmu, UINT32 l1Index, paddr_t *ppa)
    (VOID)memset_s(kvaddr, MMU_DESCRIPTOR_L2_SMALL_SIZE, 0, MMU_DESCRIPTOR_L2_SMALL_SIZE);

    /* get physical address */
-    *ppa = OsKVaddrToPaddr((VADDR_T)kvaddr) + l2Offset;
+    *ppa = LOS_PaddrQuery(kvaddr) + l2Offset;
    return LOS_OK;
 }

+STATIC VOID OsMapL1PTE(LosArchMmu *archMmu, PTE_T *pte1Ptr, vaddr_t vaddr, UINT32 flags)
+{
+    paddr_t pte2Base = 0;
+
+    if (OsGetL2Table(archMmu, OsGetPte1Index(vaddr), &pte2Base) != LOS_OK) {
+        LOS_Panic("%s %d, failed to allocate pagetable\n", __FUNCTION__, __LINE__);
+    }
+
+    *pte1Ptr = pte2Base | MMU_DESCRIPTOR_L1_TYPE_PAGE_TABLE;
+    if (flags & VM_MAP_REGION_FLAG_NS) {
+        *pte1Ptr |= MMU_DESCRIPTOR_L1_PAGETABLE_NON_SECURE;
+    }
+    *pte1Ptr &= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_MASK;
+    *pte1Ptr |= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_CLIENT; // use client AP
+    OsSavePte1(OsGetPte1Ptr(archMmu->virtTtb, vaddr), *pte1Ptr);
+}
+
 STATIC UINT32 OsCvtPte2CacheFlagsToMMUFlags(UINT32 flags)
 {
    UINT32 mmuFlags = 0;
@@ -726,93 +618,32 @@ STATIC UINT32 OsCvtPte2FlagsToAttrs(UINT32 flags)
    return mmuFlags;
 }

-STATIC UINT32 OsMapL1PTE(MmuMapInfo *mmuMapInfo, PTE_T *l1Entry, UINT32 *count)
-{
-    PADDR_T pte2Base = 0;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *pte1Lock = NULL;
-    SPIN_LOCK_S *pte2Lock = NULL;
-    PTE_T *pte2BasePtr = NULL;
-    UINT32 saveCounts, archFlags, pte1IntSave, pte2IntSave;
-
-    pte1Paddr = OsGetPte1Paddr(mmuMapInfo->archMmu->physTtb, *mmuMapInfo->vaddr);
-    pte1Lock = OsGetPte1Lock(mmuMapInfo->archMmu, pte1Paddr, &pte1IntSave);
-    if (!OsIsPte1Invalid(*l1Entry)) {
-        OsUnlockPte1(pte1Lock, pte1IntSave);
-        return 0;
-    }
-    if (OsGetL2Table(mmuMapInfo->archMmu, OsGetPte1Index(*mmuMapInfo->vaddr), &pte2Base) != LOS_OK) {
-        LOS_Panic("%s %d, failed to allocate pagetable\n", __FUNCTION__, __LINE__);
-    }
-
-    *l1Entry = pte2Base | MMU_DESCRIPTOR_L1_TYPE_PAGE_TABLE;
-    if (*mmuMapInfo->flags & VM_MAP_REGION_FLAG_NS) {
-        *l1Entry |= MMU_DESCRIPTOR_L1_PAGETABLE_NON_SECURE;
-    }
-    *l1Entry &= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_MASK;
-    *l1Entry |= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_CLIENT; // use client AP
-    OsSavePte1(OsGetPte1Ptr(mmuMapInfo->archMmu->virtTtb, *mmuMapInfo->vaddr), *l1Entry);
-    OsUnlockPte1(pte1Lock, pte1IntSave);
-
-    pte2Lock = OsGetPte2Lock(mmuMapInfo->archMmu, *l1Entry, &pte2IntSave);
-    if (pte2Lock == NULL) {
-        LOS_Panic("pte2 should not be null!\n");
-    }
-    pte2BasePtr = (PTE_T *)LOS_PaddrToKVaddr(pte2Base);
-
-    /* compute the arch flags for L2 4K pages */
-    archFlags = OsCvtPte2FlagsToAttrs(*mmuMapInfo->flags);
-    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*mmuMapInfo->vaddr), *mmuMapInfo->paddr | archFlags,
-                                      *count);
-    OsUnlockPte2(pte2Lock, pte2IntSave);
-    *mmuMapInfo->paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *mmuMapInfo->vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *count -= saveCounts;
-    return saveCounts;
-}
-
-STATIC UINT32 OsMapL2PageContinous(MmuMapInfo *mmuMapInfo, PTE_T *pte1, UINT32 *count)
+STATIC UINT32 OsMapL2PageContinous(PTE_T pte1, UINT32 flags, VADDR_T *vaddr, PADDR_T *paddr, UINT32 *count)
 {
    PTE_T *pte2BasePtr = NULL;
    UINT32 archFlags;
    UINT32 saveCounts;
-    UINT32 intSave;
-    SPIN_LOCK_S *lock = NULL;

-    lock = OsGetPte2Lock(mmuMapInfo->archMmu, *pte1, &intSave);
-    if (lock == NULL) {
-        return 0;
-    }
-    pte2BasePtr = OsGetPte2BasePtr(*pte1);
+    pte2BasePtr = OsGetPte2BasePtr(pte1);
    if (pte2BasePtr == NULL) {
-        OsUnlockPte2(lock, intSave);
-        return 0;
+        LOS_Panic("%s %d, pte1 %#x error\n", __FUNCTION__, __LINE__, pte1);
    }

    /* compute the arch flags for L2 4K pages */
-    archFlags = OsCvtPte2FlagsToAttrs(*mmuMapInfo->flags);
-    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*mmuMapInfo->vaddr), *mmuMapInfo->paddr | archFlags,
-                                      *count);
-    OsUnlockPte2(lock, intSave);
-    *mmuMapInfo->paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *mmuMapInfo->vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
+    archFlags = OsCvtPte2FlagsToAttrs(flags);
+    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*vaddr), *paddr | archFlags, *count);
+    *paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
+    *vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
    *count -= saveCounts;
    return saveCounts;
 }

 status_t LOS_ArchMmuMap(LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T paddr, size_t count, UINT32 flags)
 {
-    PTE_T *l1Entry = NULL;
+    PTE_T l1Entry;
    UINT32 saveCounts = 0;
    INT32 mapped = 0;
-    INT32 tryTime = TRY_MAX_TIMES;
    INT32 checkRst;
-    MmuMapInfo mmuMapInfo = {
-        .archMmu = archMmu,
-        .vaddr = &vaddr,
-        .paddr = &paddr,
-        .flags = &flags,
-    };

    checkRst = OsMapParamCheck(flags, vaddr, paddr);
    if (checkRst < 0) {
@@ -821,27 +652,24 @@ status_t LOS_ArchMmuMap(LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T paddr, size_

    /* see what kind of mapping we can use */
    while (count > 0) {
-        if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(*mmuMapInfo.vaddr) &&
-            MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(*mmuMapInfo.paddr) &&
+        if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(vaddr) &&
+            MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(paddr) &&
            count >= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1) {
            /* compute the arch flags for L1 sections cache, r ,w ,x, domain and type */
-            saveCounts = OsMapSection(&mmuMapInfo, &count);
+            saveCounts = OsMapSection(archMmu, flags, &vaddr, &paddr, &count);
        } else {
            /* have to use a L2 mapping, we only allocate 4KB for L1, support 0 ~ 1GB */
-            l1Entry = OsGetPte1Ptr(archMmu->virtTtb, *mmuMapInfo.vaddr);
-            if (OsIsPte1Invalid(*l1Entry)) {
-                saveCounts = OsMapL1PTE(&mmuMapInfo, l1Entry, &count);
-            } else if (OsIsPte1PageTable(*l1Entry)) {
-                saveCounts = OsMapL2PageContinous(&mmuMapInfo, l1Entry, &count);
+            l1Entry = OsGetPte1(archMmu->virtTtb, vaddr);
+            if (OsIsPte1Invalid(l1Entry)) {
+                OsMapL1PTE(archMmu, &l1Entry, vaddr, flags);
+                saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
+            } else if (OsIsPte1PageTable(l1Entry)) {
+                saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
            } else {
                LOS_Panic("%s %d, unimplemented tt_entry %x\n", __FUNCTION__, __LINE__, l1Entry);
            }
        }
        mapped += saveCounts;
-        tryTime = (saveCounts == 0) ? (tryTime - 1) : tryTime;
-        if (tryTime == 0) {
-            return LOS_ERRNO_VM_TIMED_OUT;
-        }
    }

    return mapped;
@@ -888,7 +716,7 @@ STATUS_T LOS_ArchMmuMove(LosArchMmu *archMmu, VADDR_T oldVaddr, VADDR_T newVaddr
    PADDR_T paddr = 0;

    if ((archMmu == NULL) || (oldVaddr == 0) || (newVaddr == 0) || (count == 0)) {
-        VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVaddr %p, count %d",
+        VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVddr %p, count %d",
               archMmu, oldVaddr, newVaddr, count);
        return LOS_NOK;
    }
@@ -962,9 +790,10 @@ STATUS_T LOS_ArchMmuDestroy(LosArchMmu *archMmu)
        LOS_PhysPageFree(page);
    }

-    OsArmWriteTlbiasidis(archMmu->asid);
+    OsArmWriteTlbiasid(archMmu->asid);
    OsFreeAsid(archMmu->asid);
 #endif
+    (VOID)LOS_MuxDestroy(&archMmu->mtx);
    return LOS_OK;
 }

@@ -1033,7 +862,7 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached)
    LosVmSpace *kSpace = LOS_GetKVmSpace();
    status_t status;
    UINT32 length;
-    INT32 i;
+    int i;
    LosArchMmuInitMapping *kernelMap = NULL;
    UINT32 kmallocLength;
    UINT32 flags;
@@ -1137,3 +966,4 @@ VOID OsInitMappingStartUp(VOID)
 }
 #endif

+
--- a/arch/arm/arm/src/los_dispatch.S
+++ b/arch/arm/arm/src/los_dispatch.S
@@ -147,14 +147,6 @@ OsIrqHandler:
    /* disable irq, switch to svc mode */
    CPSID   i, #0x13

-#ifdef LOSCFG_KERNEL_PERF
-    PUSH    {R0-R3, R12, LR}
-    MOV     R0, LR
-    MOV     R1, FP
-    BL      OsPerfSetIrqRegs
-    POP     {R0-R3, R12, LR}
-#endif
-
    STMFD   SP!, {R0-R3, R12, LR}
    STMFD   SP, {R13, R14}^
    SUB     SP, SP, #(4 * 4)
--- a/arch/arm/arm/src/los_exc.c
+++ b/arch/arm/arm/src/los_exc.c
@@ -33,7 +33,6 @@
 #include "los_memory_pri.h"
 #include "los_printf_pri.h"
 #include "los_task_pri.h"
-#include "los_percpu_pri.h"
 #include "los_hw_pri.h"
 #ifdef LOSCFG_SAVE_EXCINFO
 #include "los_excinfo_pri.h"
@@ -59,7 +58,6 @@
 #include "los_bitmap.h"
 #include "los_process_pri.h"
 #include "los_exc_pri.h"
-#include "los_sched_pri.h"
 #ifdef LOSCFG_FS_VFS
 #include "console.h"
 #endif
@@ -74,7 +72,7 @@

 STATIC UINTPTR g_minAddr;
 STATIC UINTPTR g_maxAddr;
-STATIC UINT32 g_currHandleExcCpuid = INVALID_CPUID;
+STATIC UINT32 g_currHandleExcCpuID = INVALID_CPUID;
 VOID OsExcHook(UINT32 excType, ExcContext *excBufAddr, UINT32 far, UINT32 fsr);
 UINT32 g_curNestCount[LOSCFG_KERNEL_CORE_NUM] = { 0 };
 BOOL g_excFromUserMode[LOSCFG_KERNEL_CORE_NUM];
@@ -88,7 +86,6 @@ STATIC UINT32 g_nextExcWaitCpu = INVALID_CPUID;
 #define OS_MAX_BACKTRACE    15U
 #define DUMPSIZE            128U
 #define DUMPREGS            12U
-#define COM_REGS            4U
 #define INSTR_SET_MASK      0x01000020U
 #define THUMB_INSTR_LEN     2U
 #define ARM_INSTR_LEN       4U
@@ -113,11 +110,11 @@ STATIC const StackInfo g_excStack[] = {
 UINT32 OsGetSystemStatus(VOID)
 {
    UINT32 flag;
-    UINT32 cpuid = g_currHandleExcCpuid;
+    UINT32 cpuID = g_currHandleExcCpuID;

-    if (cpuid == INVALID_CPUID) {
+    if (cpuID == INVALID_CPUID) {
        flag = OS_SYSTEM_NORMAL;
-    } else if (cpuid == ArchCurrCpuid()) {
+    } else if (cpuID == ArchCurrCpuid()) {
        flag = OS_SYSTEM_EXC_CURR_CPU;
    } else {
        flag = OS_SYSTEM_EXC_OTHER_CPU;
@@ -194,7 +191,7 @@ UINT32 OsArmSharedPageFault(UINT32 excType, ExcContext *frame, UINT32 far, UINT3
        return LOS_ERRNO_VM_NOT_FOUND;
    }
 #if defined(LOSCFG_KERNEL_SMP) && defined(LOSCFG_DEBUG_VERSION)
-    BOOL irqEnable = !(LOS_SpinHeld(&g_taskSpin) && OsSchedIsLock());
+    BOOL irqEnable = !(LOS_SpinHeld(&g_taskSpin) && (OsPercpuGet()->taskLockCnt != 0));
    if (irqEnable) {
        ArchIrqEnable();
    } else {
@@ -231,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)
@@ -248,7 +244,7 @@ UINT32 OsArmSharedPageFault(UINT32 excType, ExcContext *frame, UINT32 far, UINT3

 STATIC VOID OsExcType(UINT32 excType, ExcContext *excBufAddr, UINT32 far, UINT32 fsr)
 {
-    /* undefined exception handling or software interrupt */
+    /* undefinited exception handling or software interrupt */
    if ((excType == OS_EXCEPT_UNDEF_INSTR) || (excType == OS_EXCEPT_SWI)) {
        if ((excBufAddr->regCPSR & INSTR_SET_MASK) == 0) { /* work status: ARM */
            excBufAddr->PC = excBufAddr->PC - ARM_INSTR_LEN;
@@ -280,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;

@@ -300,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
@@ -483,7 +479,7 @@ STATIC VOID OsDumpProcessUsedMemRegion(LosProcessCB *runProcess, LosVmSpace *run
    RB_SCAN_SAFE_END(&space->regionRbTree, pstRbNodeTemp, pstRbNodeNext)
 }

-STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFlags)
+STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFalgs)
 {
    LosProcessCB *runProcess = NULL;
    LosVmSpace *runspace = NULL;
@@ -504,7 +500,7 @@ STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFlags)
        return;
    }

-    OsDumpProcessUsedMemRegion(runProcess, runspace, vmmFlags);
+    OsDumpProcessUsedMemRegion(runProcess, runspace, vmmFalgs);
    return;
 }
 #endif
@@ -517,22 +513,13 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)
        return;
    }

-    for (excReg = &(excBufAddr->R0); count < COM_REGS; excReg++, count++) {
+    for (excReg = &(excBufAddr->R0); count <= DUMPREGS; excReg++, count++) {
        if (IS_VALID_ADDR(*excReg)) {
            PrintExcInfo("\ndump mem around R%u:%p", count, (*excReg));
            OsDumpMemByte(DUMPSIZE, ((*excReg) - (DUMPSIZE >> 1)));
        }
    }
-    for (excReg = &(excBufAddr->R4); count < DUMPREGS; excReg++, count++) {
-        if (IS_VALID_ADDR(*excReg)) {
-            PrintExcInfo("\ndump mem around R%u:%p", count, (*excReg));
-            OsDumpMemByte(DUMPSIZE, ((*excReg) - (DUMPSIZE >> 1)));
-        }
-    }
-    if (IS_VALID_ADDR(excBufAddr->R12)) {
-        PrintExcInfo("\ndump mem around R12:%p", excBufAddr->R12);
-        OsDumpMemByte(DUMPSIZE, (excBufAddr->R12 - (DUMPSIZE >> 1)));
-    }
+
    if (IS_VALID_ADDR(excBufAddr->SP)) {
        PrintExcInfo("\ndump mem around SP:%p", excBufAddr->SP);
        OsDumpMemByte(DUMPSIZE, (excBufAddr->SP - (DUMPSIZE >> 1)));
@@ -541,15 +528,15 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)

 STATIC VOID OsExcRestore(VOID)
 {
-    UINT32 currCpuid = ArchCurrCpuid();
+    UINT32 currCpuID = ArchCurrCpuid();

-    g_excFromUserMode[currCpuid] = FALSE;
-    g_intCount[currCpuid] = 0;
-    g_curNestCount[currCpuid] = 0;
+    g_excFromUserMode[currCpuID] = FALSE;
+    g_intCount[currCpuID] = 0;
+    g_curNestCount[currCpuID] = 0;
 #ifdef LOSCFG_KERNEL_SMP
-    OsCpuStatusSet(CPU_RUNNING);
+    OsPercpuGet()->excFlag = CPU_RUNNING;
 #endif
-    OsSchedLockSet(0);
+    OsPercpuGet()->taskLockCnt = 0;
 }

 STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
@@ -566,16 +553,17 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
 #ifdef LOSCFG_KERNEL_SMP
    LOS_SpinLock(&g_excSerializerSpin);
    if (g_nextExcWaitCpu != INVALID_CPUID) {
-        g_currHandleExcCpuid = g_nextExcWaitCpu;
+        g_currHandleExcCpuID = g_nextExcWaitCpu;
        g_nextExcWaitCpu = INVALID_CPUID;
    } else {
-        g_currHandleExcCpuid = INVALID_CPUID;
+        g_currHandleExcCpuID = INVALID_CPUID;
    }
    g_currHandleExcPID = OS_INVALID_VALUE;
    LOS_SpinUnlock(&g_excSerializerSpin);
 #else
-    g_currHandleExcCpuid = INVALID_CPUID;
+    g_currHandleExcCpuID = INVALID_CPUID;
 #endif
+    runProcess->processStatus &= ~OS_PROCESS_FLAG_EXIT;

 #ifdef LOSCFG_KERNEL_SMP
 #ifdef LOSCFG_FS_VFS
@@ -592,14 +580,14 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
 #endif
    OsProcessExitCodeSignalSet(runProcess, SIGUSR2);

-    /* An exception was raised by a task during the exit process of
+    /* An exception was raised by a task that is not the current main thread during the exit process of
     * the current process.
     */
-    if (runProcess->processStatus & OS_PROCESS_FLAG_EXIT) {
+    if ((runProcess->processStatus & OS_PROCESS_FLAG_EXIT) && (runProcess->threadGroupID != runTask->taskID)) {
        SCHEDULER_UNLOCK(intSave);
        /* Exception handling All operations should be kept prior to that operation */
        OsExcRestore();
-        OsRunningTaskToExit(runTask, OS_PRO_EXIT_OK);
+        OsTaskToExit(runTask, OS_PRO_EXIT_OK);
    } else {
        SCHEDULER_UNLOCK(intSave);

@@ -655,7 +643,6 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
    const StackInfo *stack = NULL;
    vaddr_t kvaddr;

-#ifdef LOSCFG_KERNEL_VM
    if (g_excFromUserMode[ArchCurrCpuid()] == TRUE) {
        taskCB = OsCurrTaskGet();
        stackStart = taskCB->userMapBase;
@@ -666,7 +653,6 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
        }
        return found;
    }
-#endif

    /* Search in the task stacks */
    for (index = 0; index < g_taskMaxNum; index++) {
@@ -704,66 +690,20 @@ FOUND:
    return found;
 }

-BOOL OsGetUsrIpInfo(UINTPTR ip, IpInfo *info)
-{
-    if (info == NULL) {
-        return FALSE;
-    }
-#ifdef LOSCFG_KERNEL_VM
-    BOOL ret = FALSE;
-    const CHAR *name = NULL;
-    LosVmMapRegion *region = NULL;
-    LosProcessCB *runProcess = OsCurrProcessGet();
-
-    if (LOS_IsUserAddress((VADDR_T)ip) == FALSE) {
-        info->ip = ip;
-        name = "kernel";
-        ret = FALSE;
-        goto END;
-    }
-
-    region = LOS_RegionFind(runProcess->vmSpace, (VADDR_T)ip);
-    if (region == NULL) {
-        info->ip = ip;
-        name = "invalid";
-        ret = FALSE;
-        goto END;
-    }
-
-    info->ip = ip - OsGetTextRegionBase(region, runProcess);
-    name = OsGetRegionNameOrFilePath(region);
-    ret = TRUE;
-    if (strcmp(name, "/lib/libc.so") != 0) {
-        PRINT_ERR("ip = 0x%x, %s\n", info->ip, name);
-    }
-END:
-    info->len = strlen(name);
-    if (strncpy_s(info->f_path, REGION_PATH_MAX, name, REGION_PATH_MAX - 1) != EOK) {
-        info->f_path[0] = '\0';
-        info->len = 0;
-        PRINT_ERR("copy f_path failed, %s\n", name);
-    }
-    return ret;
-#else
-    info->ip = ip;
-    return FALSE;
-#endif
-}
-
-UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
+VOID BackTraceSub(UINTPTR regFP)
 {
    UINTPTR tmpFP, backLR;
    UINTPTR stackStart, stackEnd;
    UINTPTR backFP = regFP;
    UINT32 count = 0;
-    BOOL ret;
    VADDR_T kvaddr;
+#ifdef LOSCFG_KERNEL_VM
+    LosProcessCB *runProcess = OsCurrProcessGet();
+#endif

    if (FindSuitableStack(regFP, &stackStart, &stackEnd, &kvaddr) == FALSE) {
-        if (callChain == NULL) {
-            PrintExcInfo("traceback error fp = 0x%x\n", regFP);
-        }
-        return 0;
+        PrintExcInfo("traceback error fp = 0x%x\n", regFP);
+        return;
    }

    /*
@@ -775,9 +715,7 @@ UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
    tmpFP = *(UINTPTR *)(UINTPTR)kvaddr;
    if (IsValidFP(tmpFP, stackStart, stackEnd, NULL) == TRUE) {
        backFP = tmpFP;
-        if (callChain == NULL) {
-            PrintExcInfo("traceback fp fixed, trace using   fp = 0x%x\n", backFP);
-        }
+        PrintExcInfo("traceback fp fixed, trace using   fp = 0x%x\n", backFP);
    }

    while (IsValidFP(backFP, stackStart, stackEnd, &kvaddr) == TRUE) {
@@ -785,49 +723,38 @@ UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
 #ifdef LOSCFG_COMPILER_CLANG_LLVM
        backFP = *(UINTPTR *)(UINTPTR)kvaddr;
        if (IsValidFP(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
-            if (callChain == NULL) {
-                PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
-            }
-            return 0;
+            PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
+            return;
        }
        backLR = *(UINTPTR *)(UINTPTR)kvaddr;
 #else
        backLR = *(UINTPTR *)(UINTPTR)kvaddr;
        if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
-            if (callChain == NULL) {
-                PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
-            }
-            return 0;
+            PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
+            return;
        }
        backFP = *(UINTPTR *)(UINTPTR)kvaddr;
 #endif
-        IpInfo info = {0};
-        ret = OsGetUsrIpInfo((VADDR_T)backLR, &info);
-        if (callChain == NULL) {
-            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x ", count, backLR, backFP);
-            if (ret) {
 #ifdef LOSCFG_KERNEL_VM
-                PrintExcInfo("lr in %s --> 0x%x\n", info.f_path, info.ip);
-#else
-                PrintExcInfo("\n");
+        LosVmMapRegion *region = NULL;
+        if (LOS_IsUserAddress((VADDR_T)backLR) == TRUE) {
+            region = LOS_RegionFind(runProcess->vmSpace, (VADDR_T)backLR);
+        }
+        if (region != NULL) {
+            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x lr in %s --> 0x%x\n", count, backLR, backFP,
+                         OsGetRegionNameOrFilePath(region),
+                         backLR - OsGetTextRegionBase(region, runProcess));
+            region = NULL;
+        } else
 #endif
-            } else {
-                PrintExcInfo("\n");
-            }
-        } else {
-            (VOID)memcpy_s(&callChain[count], sizeof(IpInfo), &info, sizeof(IpInfo));
+        {
+            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x\n", count, backLR, backFP);
        }
        count++;
-        if ((count == maxDepth) || (backFP == tmpFP)) {
+        if ((count == OS_MAX_BACKTRACE) || (backFP == tmpFP)) {
            break;
        }
    }
-    return count;
-}
-
-VOID BackTraceSub(UINTPTR regFP)
-{
-    (VOID)BackTraceGet(regFP, NULL, OS_MAX_BACKTRACE);
 }

 VOID BackTrace(UINT32 regFP)
@@ -991,14 +918,36 @@ VOID OsDataAbortExcHandleEntry(ExcContext *excBufAddr)
 #define EXC_WAIT_INTER 50U
 #define EXC_WAIT_TIME  2000U

-STATIC VOID WaitAllCpuStop(UINT32 cpuid)
+STATIC VOID OsAllCpuStatusOutput(VOID)
+{
+    UINT32 i;
+
+    for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
+        switch (g_percpu[i].excFlag) {
+            case CPU_RUNNING:
+                PrintExcInfo("cpu%u is running.\n", i);
+                break;
+            case CPU_HALT:
+                PrintExcInfo("cpu%u is halted.\n", i);
+                break;
+            case CPU_EXC:
+                PrintExcInfo("cpu%u is in exc.\n", i);
+                break;
+            default:
+                break;
+        }
+    }
+    PrintExcInfo("The current handling the exception is cpu%u !\n", ArchCurrCpuid());
+}
+
+STATIC VOID WaitAllCpuStop(UINT32 cpuID)
 {
    UINT32 i;
    UINT32 time = 0;

    while (time < EXC_WAIT_TIME) {
        for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
-            if ((i != cpuid) && !OsCpuStatusIsHalt(i)) {
+            if ((i != cpuID) && (g_percpu[i].excFlag != CPU_HALT)) {
                LOS_Mdelay(EXC_WAIT_INTER);
                time += EXC_WAIT_INTER;
                break;
@@ -1012,19 +961,19 @@ STATIC VOID WaitAllCpuStop(UINT32 cpuid)
    return;
 }

-STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuid)
+STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuID)
 {
    while (1) {
        LOS_SpinLock(&g_excSerializerSpin);
-        if ((g_currHandleExcCpuid == INVALID_CPUID) || (g_currHandleExcCpuid == currCpuid)) {
-            g_currHandleExcCpuid = currCpuid;
+        if ((g_currHandleExcCpuID == INVALID_CPUID) || (g_currHandleExcCpuID == currCpuID)) {
+            g_currHandleExcCpuID = currCpuID;
            g_currHandleExcPID = OsCurrProcessGet()->processID;
            LOS_SpinUnlock(&g_excSerializerSpin);
            break;
        }

        if (g_nextExcWaitCpu == INVALID_CPUID) {
-            g_nextExcWaitCpu = currCpuid;
+            g_nextExcWaitCpu = currCpuID;
        }
        LOS_SpinUnlock(&g_excSerializerSpin);
        LOS_Mdelay(EXC_WAIT_INTER);
@@ -1033,25 +982,23 @@ STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuid)

 STATIC VOID OsCheckAllCpuStatus(VOID)
 {
-    UINT32 currCpuid = ArchCurrCpuid();
+    UINT32 currCpuID = ArchCurrCpuid();
    UINT32 ret, target;

-    OsCpuStatusSet(CPU_EXC);
+    OsPercpuGet()->excFlag = CPU_EXC;
    LOCKDEP_CLEAR_LOCKS();

    LOS_SpinLock(&g_excSerializerSpin);
-    /* Only the current CPU anomaly */
-    if (g_currHandleExcCpuid == INVALID_CPUID) {
-        g_currHandleExcCpuid = currCpuid;
+    /* Only the current nuclear anomaly */
+    if (g_currHandleExcCpuID == INVALID_CPUID) {
+        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));
+        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) {
+    } 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
         */
@@ -1063,24 +1010,23 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
        }
        LOS_SpinUnlock(&g_excSerializerSpin);

-        OsWaitOtherCoresHandleExcEnd(currCpuid);
+        OsWaitOtherCoresHandleExcEnd(currCpuID);
    } else {
-        if ((g_currHandleExcCpuid < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuid] == TRUE)) {
-            g_currHandleExcCpuid = currCpuid;
+        if ((g_currHandleExcCpuID < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuID] == TRUE)) {
+            g_currHandleExcCpuID = currCpuID;
            LOS_SpinUnlock(&g_excSerializerSpin);
-            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuid));
+            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID));
            HalIrqSendIpi(target, LOS_MP_IPI_HALT);
        } else {
            LOS_SpinUnlock(&g_excSerializerSpin);
            while (1) {}
        }
    }
-#ifndef LOSCFG_SAVE_EXCINFO
+
    /* use halt ipi to stop other active cores */
    if (g_excFromUserMode[ArchCurrCpuid()] == FALSE) {
-        WaitAllCpuStop(currCpuid);
+        WaitAllCpuStop(currCpuID);
    }
-#endif
 }
 #endif

@@ -1089,7 +1035,7 @@ STATIC VOID OsCheckCpuStatus(VOID)
 #ifdef LOSCFG_KERNEL_SMP
    OsCheckAllCpuStatus();
 #else
-    g_currHandleExcCpuid = ArchCurrCpuid();
+    g_currHandleExcCpuID = ArchCurrCpuid();
 #endif
 }

@@ -1144,15 +1090,15 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsPrintExcHead(UINT32 far)
 STATIC VOID OsSysStateSave(UINT32 *intCount, UINT32 *lockCount)
 {
    *intCount = g_intCount[ArchCurrCpuid()];
-    *lockCount = OsSchedLockCountGet();
+    *lockCount = OsPercpuGet()->taskLockCnt;
    g_intCount[ArchCurrCpuid()] = 0;
-    OsSchedLockSet(0);
+    OsPercpuGet()->taskLockCnt = 0;
 }

 STATIC VOID OsSysStateRestore(UINT32 intCount, UINT32 lockCount)
 {
    g_intCount[ArchCurrCpuid()] = intCount;
-    OsSchedLockSet(lockCount);
+    OsPercpuGet()->taskLockCnt = lockCount;
 }
 #endif

@@ -1169,7 +1115,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd
 #endif

    /* Task scheduling is not allowed during exception handling */
-    OsSchedLock();
+    OsPercpuGet()->taskLockCnt++;

    g_curNestCount[ArchCurrCpuid()]++;

@@ -1230,10 +1176,10 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...)
 {
    va_list ap;
    va_start(ap, fmt);
-    OsVprintf(fmt, ap, EXC_OUTPUT);
+    UartVprintf(fmt, ap);
    va_end(ap);
    __asm__ __volatile__("swi 0");
-    while (1) {}
+    while (1);
 }

 /* stack protector */
--- 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);
@@ -46,11 +46,16 @@ LITE_OS_SEC_BSS  SPIN_LOCK_INIT(g_hwiSpin);
 size_t g_intCount[LOSCFG_KERNEL_CORE_NUM] = {0};
 HwiHandleForm g_hwiForm[OS_HWI_MAX_NUM];
 STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-STATIC UINT32 g_hwiFormCnt[LOSCFG_KERNEL_CORE_NUM][OS_HWI_MAX_NUM] = {0};
+STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};

-UINT32 OsGetHwiFormCnt(UINT16 cpuid, UINT32 index)
+VOID OsIncHwiFormCnt(UINT32 index)
 {
-    return g_hwiFormCnt[cpuid][index];
+    g_hwiFormCnt[index]++;
+}
+
+UINT32 OsGetHwiFormCnt(UINT32 index)
+{
+    return g_hwiFormCnt[index];
 }

 CHAR *OsGetHwiFormName(UINT32 index)
@@ -69,18 +74,17 @@ VOID OsInterrupt(UINT32 intNum)
 {
    HwiHandleForm *hwiForm = NULL;
    UINT32 *intCnt = NULL;
-    UINT16 cpuid = ArchCurrCpuid();

    /* Must keep the operation at the beginning of the interface */
-    intCnt = &g_intCount[cpuid];
+    intCnt = &g_intCount[ArchCurrCpuid()];
    *intCnt = *intCnt + 1;

+    OsSchedIrqStartTime();
+
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-    OsCpupIrqStart(cpuid);
+    OsCpupIrqStart();
 #endif

-    OsSchedIrqStartTime();
-    OsHookCall(LOS_HOOK_TYPE_ISR_ENTER, intNum);
    hwiForm = (&g_hwiForm[intNum]);
 #ifndef LOSCFG_NO_SHARED_IRQ
    while (hwiForm->pstNext != NULL) {
@@ -101,14 +105,13 @@ VOID OsInterrupt(UINT32 intNum)
 #ifndef LOSCFG_NO_SHARED_IRQ
    }
 #endif
-    ++g_hwiFormCnt[cpuid][intNum];
-
-    OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, intNum);
-    OsSchedIrqUsedTimeUpdate();
+    ++g_hwiFormCnt[intNum];

 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-    OsCpupIrqEnd(cpuid, intNum);
+    OsCpupIrqEnd(intNum);
 #endif
+    OsSchedIrqUpdateUsedTime();
+
    /* Must keep the operation at the end of the interface */
    *intCnt = *intCnt - 1;
 }
--- a/arch/arm/arm/src/pmu/armv7_pmu.c
+++ b/arch/arm/arm/src/pmu/armv7_pmu.c
@@ -1,373 +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 "armv7_pmu_pri.h"
-#include "perf_pmu_pri.h"
-#include "los_hw_cpu.h"
-#include "asm/platform.h"
-
-OS_PMU_INTS(LOSCFG_KERNEL_CORE_NUM, g_pmuIrqNr);
-STATIC HwPmu g_armv7Pmu;
-
-STATIC INLINE UINT32 Armv7PmncRead(VOID)
-{
-    UINT32 value = 0;
-    __asm__ volatile("mrc p15, 0, %0, c9, c12, 0" : "=r"(value));
-    return value;
-}
-
-STATIC INLINE VOID Armv7PmncWrite(UINT32 value)
-{
-    value &= ARMV7_PMNC_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 0" : : "r"(value));
-    ISB;
-}
-
-STATIC INLINE UINT32 Armv7PmuOverflowed(UINT32 pmnc)
-{
-    return pmnc & ARMV7_OVERFLOWED_MASK;
-}
-
-STATIC INLINE UINT32 Armv7PmuCntOverflowed(UINT32 pmnc, UINT32 index)
-{
-    return pmnc & ARMV7_CNT2BIT(ARMV7_IDX2CNT(index));
-}
-
-STATIC INLINE UINT32 Armv7CntValid(UINT32 index)
-{
-    return index <= ARMV7_IDX_COUNTER_LAST;
-}
-
-STATIC INLINE VOID Armv7PmuSelCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (counter));
-    ISB;
-}
-
-STATIC INLINE VOID Armv7PmuSetCntPeriod(UINT32 index, UINT32 period)
-{
-    if (!Armv7CntValid(index)) {
-        PRINT_ERR("CPU writing wrong counter %u\n", index);
-    } else if (index == ARMV7_IDX_CYCLE_COUNTER) {
-        __asm__ volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (period));
-    } else {
-        Armv7PmuSelCnt(index);
-        __asm__ volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (period));
-    }
-}
-
-STATIC INLINE VOID Armv7BindEvt2Cnt(UINT32 index, UINT32 value)
-{
-    PRINT_DEBUG("bind event: %u to counter: %u\n", value, index);
-    Armv7PmuSelCnt(index);
-    value &= ARMV7_EVTYPE_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (value));
-}
-
-STATIC INLINE VOID Armv7EnableCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    PRINT_DEBUG("index : %u, counter: %u\n", index, counter);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (ARMV7_CNT2BIT(counter)));
-}
-
-STATIC INLINE VOID Armv7DisableCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    PRINT_DEBUG("index : %u, counter: %u\n", index, counter);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (ARMV7_CNT2BIT(counter)));
-}
-
-STATIC INLINE VOID Armv7EnableCntInterrupt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c14, 1" : : "r" (ARMV7_CNT2BIT(counter)));
-    ISB;
-}
-
-STATIC INLINE VOID Armv7DisableCntInterrupt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c14, 2" : : "r" (ARMV7_CNT2BIT(counter)));
-    /* Clear the overflow flag in case an interrupt is pending. */
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (ARMV7_CNT2BIT(counter)));
-    ISB;
-}
-
-STATIC INLINE UINT32 Armv7PmuGetOverflowStatus(VOID)
-{
-    UINT32 value;
-
-    __asm__ volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (value));
-    value &= ARMV7_FLAG_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (value));
-
-    return value;
-}
-
-STATIC VOID Armv7EnableEvent(Event *event)
-{
-    UINT32 cnt = event->counter;
-
-    if (!Armv7CntValid(cnt)) {
-        PRINT_ERR("CPU enabling wrong PMNC counter IRQ enable %u\n", cnt);
-        return;
-    }
-
-    if (event->period == 0) {
-        PRINT_INFO("event period value not valid, counter: %u\n", cnt);
-        return;
-    }
-    /*
-     * Enable counter and interrupt, and set the counter to count
-     * the event that we're interested in.
-     */
-    UINT32 intSave = LOS_IntLock();
-
-    Armv7DisableCnt(cnt);
-
-    /*
-     * Set event (if destined for PMNx counters)
-     * We only need to set the event for the cycle counter if we
-     * have the ability to perform event filtering.
-     */
-    if (cnt != ARMV7_IDX_CYCLE_COUNTER) {
-        Armv7BindEvt2Cnt(cnt, event->eventId);
-    }
-
-    /* Enable interrupt for this counter */
-    Armv7EnableCntInterrupt(cnt);
-    Armv7EnableCnt(cnt);
-    LOS_IntRestore(intSave);
-
-    PRINT_DEBUG("enabled event: %u cnt: %u\n", event->eventId, cnt);
-}
-
-STATIC VOID Armv7DisableEvent(Event *event)
-{
-    UINT32 cnt = event->counter;
-
-    if (!Armv7CntValid(cnt)) {
-        PRINT_ERR("CPU enabling wrong PMNC counter IRQ enable %u\n", cnt);
-        return;
-    }
-
-    UINT32 intSave = LOS_IntLock();
-    Armv7DisableCnt(cnt);
-    Armv7DisableCntInterrupt(cnt);
-    LOS_IntRestore(intSave);
-}
-
-
-STATIC VOID Armv7StartAllCnt(VOID)
-{
-    PRINT_DEBUG("starting pmu...\n");
-
-    /* Enable all counters */
-    UINT32 reg = Armv7PmncRead() | ARMV7_PMNC_E;
-    if (g_armv7Pmu.cntDivided) {
-        reg |= ARMV7_PMNC_D;
-    } else {
-        reg &= ~ARMV7_PMNC_D;
-    }
-
-    Armv7PmncWrite(reg);
-    HalIrqUnmask(g_pmuIrqNr[ArchCurrCpuid()]);
-}
-
-STATIC VOID Armv7StopAllCnt(VOID)
-{
-    PRINT_DEBUG("stopping pmu...\n");
-    /* Disable all counters */
-    Armv7PmncWrite(Armv7PmncRead() & ~ARMV7_PMNC_E);
-
-    HalIrqMask(g_pmuIrqNr[ArchCurrCpuid()]);
-}
-
-STATIC VOID Armv7ResetAllCnt(VOID)
-{
-    UINT32 index;
-
-    /* The counter and interrupt enable registers are unknown at reset. */
-    for (index = ARMV7_IDX_CYCLE_COUNTER; index < ARMV7_IDX_MAX_COUNTER; index++) {
-        Armv7DisableCnt(index);
-        Armv7DisableCntInterrupt(index);
-    }
-
-    /* Initialize & Reset PMNC: C and P bits and D bits */
-    UINT32 reg = ARMV7_PMNC_P | ARMV7_PMNC_C | (g_armv7Pmu.cntDivided ? ARMV7_PMNC_D : 0);
-    Armv7PmncWrite(reg);
-}
-
-STATIC VOID Armv7SetEventPeriod(Event *event)
-{
-    if (event->period != 0) {
-        PRINT_INFO("counter: %u, period: 0x%x\n", event->counter, event->period);
-        Armv7PmuSetCntPeriod(event->counter, PERIOD_CALC(event->period));
-    }
-}
-
-STATIC UINTPTR Armv7ReadEventCnt(Event *event)
-{
-    UINT32 value = 0;
-    UINT32 index = event->counter;
-
-    if (!Armv7CntValid(index)) {
-        PRINT_ERR("CPU reading wrong counter %u\n", index);
-    } else if (index == ARMV7_IDX_CYCLE_COUNTER) {
-        __asm__ volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (value));
-    } else {
-        Armv7PmuSelCnt(index);
-        __asm__ volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (value));
-    }
-
-    if (value < PERIOD_CALC(event->period)) {
-        if (Armv7PmuCntOverflowed(Armv7PmuGetOverflowStatus(), event->counter)) {
-            value += event->period;
-        }
-    } else {
-        value -= PERIOD_CALC(event->period);
-    }
-    return value;
-}
-
-STATIC const UINT32 g_armv7Map[] = {
-    [PERF_COUNT_HW_CPU_CYCLES]          = ARMV7_PERF_HW_CYCLES,
-    [PERF_COUNT_HW_INSTRUCTIONS]        = ARMV7_PERF_HW_INSTRUCTIONS,
-    [PERF_COUNT_HW_DCACHE_REFERENCES]   = ARMV7_PERF_HW_DCACHES,
-    [PERF_COUNT_HW_DCACHE_MISSES]       = ARMV7_PERF_HW_DCACHE_MISSES,
-    [PERF_COUNT_HW_ICACHE_REFERENCES]   = ARMV7_PERF_HW_ICACHES,
-    [PERF_COUNT_HW_ICACHE_MISSES]       = ARMV7_PERF_HW_ICACHE_MISSES,
-    [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERF_HW_BRANCHES,
-    [PERF_COUNT_HW_BRANCH_MISSES]       = ARMV7_PERF_HW_BRANCE_MISSES,
-};
-
-UINT32 Armv7PmuMapEvent(UINT32 eventType, BOOL reverse)
-{
-    if (!reverse) {  /* Common event to armv7 real event */
-        if (eventType < ARRAY_SIZE(g_armv7Map)) {
-            return g_armv7Map[eventType];
-        }
-        return eventType;
-    } else {        /* Armv7 real event to common event */
-        UINT32 i;
-        for (i = 0; i < ARRAY_SIZE(g_armv7Map); i++) {
-            if (g_armv7Map[i] == eventType) {
-                return i;
-            }
-        }
-        return PERF_HW_INVALID_EVENT_TYPE;
-    }
-}
-
-STATIC VOID Armv7PmuIrqHandler(VOID)
-{
-    UINT32 index;
-    PerfRegs regs;
-
-    PerfEvent *events = &(g_armv7Pmu.pmu.events);
-    UINT32 eventNum = events->nr;
-
-    /* Get and reset the IRQ flags */
-    UINT32 pmnc = Armv7PmuGetOverflowStatus();
-    if (!Armv7PmuOverflowed(pmnc)) {
-        return;
-    }
-
-    (VOID)memset_s(&regs, sizeof(PerfRegs), 0, sizeof(PerfRegs));
-    OsPerfFetchIrqRegs(&regs);
-
-    Armv7StopAllCnt();
-
-    for (index = 0; index < eventNum; index++) {
-        Event *event = &(events->per[index]);
-        /*
-         * We have a single interrupt for all counters. Check that
-         * each counter has overflowed before we process it.
-         */
-        if (!Armv7PmuCntOverflowed(pmnc, event->counter) || (event->period == 0)) {
-            continue;
-        }
-
-        Armv7PmuSetCntPeriod(event->counter, PERIOD_CALC(event->period));
-
-        OsPerfUpdateEventCount(event, event->period);
-        OsPerfHandleOverFlow(event, &regs);
-    }
-    Armv7StartAllCnt();
-}
-
-UINT32 OsGetPmuMaxCounter(VOID)
-{
-    return ARMV7_IDX_MAX_COUNTER;
-}
-
-UINT32 OsGetPmuCycleCounter(VOID)
-{
-    return ARMV7_IDX_CYCLE_COUNTER;
-}
-
-UINT32 OsGetPmuCounter0(VOID)
-{
-    return ARMV7_IDX_COUNTER0;
-}
-
-STATIC HwPmu g_armv7Pmu = {
-    .canDivided = TRUE,
-    .enable     = Armv7EnableEvent,
-    .disable    = Armv7DisableEvent,
-    .start      = Armv7StartAllCnt,
-    .stop       = Armv7StopAllCnt,
-    .clear      = Armv7ResetAllCnt,
-    .setPeriod  = Armv7SetEventPeriod,
-    .readCnt    = Armv7ReadEventCnt,
-    .mapEvent   = Armv7PmuMapEvent,
-};
-
-UINT32 OsHwPmuInit(VOID)
-{
-    UINT32 ret;
-    UINT32 index;
-
-    for (index = 0; index < LOSCFG_KERNEL_CORE_NUM; index++) {
-        ret = LOS_HwiCreate(g_pmuIrqNr[index], 0, 0, Armv7PmuIrqHandler, 0);
-        if (ret != LOS_OK) {
-            PRINT_ERR("pmu %u irq handler register failed\n", g_pmuIrqNr[index]);
-            return ret;
-        }
-#ifdef LOSCFG_KERNEL_SMP
-        HalIrqSetAffinity(g_pmuIrqNr[index], CPUID_TO_AFFI_MASK(index));
-#endif
-    }
-    ret = OsPerfHwInit(&g_armv7Pmu);
-    return ret;
-}
--- 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"

@@ -121,9 +126,8 @@ reset_vector:
    mcr     p15, 0, r0, c13, c0, 4
    /* do some early cpu setup: i/d cache disable, mmu disabled */
    mrc     p15, 0, r0, c1, c0, 0
-    bic     r0, #(1 << 12)          /* i cache */
-    bic     r0, #(1 << 2)           /* d cache */
-    bic     r0, #(1 << 0)           /* mmu */
+    bic     r0, #(1<<12)
+    bic     r0, #(1<<2 | 1<<0)
    mcr     p15, 0, r0, c1, c0, 0

    /* enable fpu+neon */
@@ -180,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
@@ -204,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 */
@@ -283,11 +286,11 @@ mmu_setup:
    mcr    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxlliary Control Register */
    dsb
    mrc     p15, 0, r12, c1, c0, 0
-    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
-    orr     r12, #(1 << 0)                      /* mmu enable */
+    bic     r12, #(1 << 29 | 1 << 28)
+    orr     r12, #(1 << 0)
    bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)                     /* D cache enable */
-    orr     r12, #(1 << 12)                    /* I cache enable */
+    orr     r12, #(1 << 2)
+    orr     r12, #(1 << 12)
    mcr     p15, 0, r12, c1, c0, 0              /* Set SCTLR with r12: Turn on the MMU, I/D cache Disable TRE/AFE */
    isb
    ldr     pc,  =1f                            /* Convert to VA */
@@ -314,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 */
@@ -328,8 +330,7 @@ cpu_start:

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

 secondary_cpu_init:
@@ -369,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 */
@@ -379,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++ */
@@ -421,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"

@@ -101,9 +108,8 @@ __exception_handlers:
 reset_vector:
    /* do some early cpu setup: i/d cache disable, mmu disabled */
    mrc     p15, 0, r0, c1, c0, 0
-    bic     r0, #(1 << 12)          /* i cache */
-    bic     r0, #(1 << 2)           /* d cache */
-    bic     r0, #(1 << 0)           /* mmu */
+    bic     r0, #(1<<12)
+    bic     r0, #(1<<2 | 1<<0)
    mcr     p15, 0, r0, c1, c0, 0

    /* enable fpu+neon */
@@ -155,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
@@ -228,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
@@ -270,11 +276,11 @@ mmu_setup:
    isb

    mrc     p15, 0, r12, c1, c0, 0
-    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
-    orr     r12, #(1 << 0)                      /* mmu enable */
+    bic     r12, #(1 << 29 | 1 << 28)
+    orr     r12, #(1 << 0)
    bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)                      /* D cache enable */
-    orr     r12, #(1 << 12)                     /* I cache enable */
+    orr     r12, #(1 << 2)
+    orr     r12, #(1 << 12)
    mcr     p15, 0, r12, c1, c0, 0              /* Set SCTLR with r12: Turn on the MMU, I/D cache Disable TRE/AFE */
    isb

@@ -304,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
@@ -325,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 */
@@ -335,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++ */
@@ -377,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/arch/arm/gic/Makefile
+++ b/arch/arm/gic/Makefile
@@ -31,10 +31,18 @@ include $(LITEOSTOPDIR)/config.mk

 MODULE_NAME := $(notdir $(shell pwd))

+# LOCAL_SRCS := $(wildcard *.c)
+
 ifeq ($(LOSCFG_ARCH_GIC_V2), y)
 LOCAL_SRCS := gic_v2.c
 else ifeq ($(LOSCFG_ARCH_GIC_V3), y)
 LOCAL_SRCS := gic_v3.c
 endif

+LOCAL_INCLUDE := \
+	-I $(LITEOSTOPDIR)/kernel/base/include \
+	-I $(LITEOSTOPDIR)/arch/arm/include \
+	-I $(LITEOSTOPDIR)/arch/arm/arm/src/include \
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 include $(MODULE)
--- a/arch/arm/gic/gic_v2.c
+++ b/arch/arm/gic/gic_v2.c
@@ -49,7 +49,7 @@ STATIC UINT32 g_curIrqNum = 0;
 */
 STATIC VOID GicWriteSgi(UINT32 vector, UINT32 cpuMask, UINT32 filter)
 {
-    UINT32 val = ((filter & 0x3) << 24) | ((cpuMask & 0xFF) << 16) | /* 24, 16: Register bit offset */
+    UINT32 val = ((filter & 0x3) << 24) | ((cpuMask & 0xFF) << 16) |
                 (vector & 0xF);

    GIC_REG_32(GICD_SGIR) = val;
@@ -62,7 +62,7 @@ VOID HalIrqSendIpi(UINT32 target, UINT32 ipi)

 VOID HalIrqSetAffinity(UINT32 vector, UINT32 cpuMask)
 {
-    UINT32 offset = vector / 4; /* 4: Interrupt bit width */
+    UINT32 offset = vector / 4;
    UINT32 index = vector & 0x3;

    GIC_REG_8(GICD_ITARGETSR(offset) + index) = cpuMask;
@@ -80,7 +80,7 @@ VOID HalIrqMask(UINT32 vector)
        return;
    }

-    GIC_REG_32(GICD_ICENABLER(vector / 32)) = 1U << (vector % 32); /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_ICENABLER(vector / 32)) = 1U << (vector % 32);
 }

 VOID HalIrqUnmask(UINT32 vector)
@@ -89,7 +89,7 @@ VOID HalIrqUnmask(UINT32 vector)
        return;
    }

-    GIC_REG_32(GICD_ISENABLER(vector >> 5)) = 1U << (vector % 32); /* 5, 32: Register bit offset */
+    GIC_REG_32(GICD_ISENABLER(vector >> 5)) = 1U << (vector % 32);
 }

 VOID HalIrqPending(UINT32 vector)
@@ -98,7 +98,7 @@ VOID HalIrqPending(UINT32 vector)
        return;
    }

-    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32); /* 5, 32: Register bit offset */
+    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32);
 }

 VOID HalIrqClear(UINT32 vector)
@@ -119,24 +119,24 @@ VOID HalIrqInit(VOID)
 {
    UINT32 i;

-    /* set external interrupts to be level triggered, active low. */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) { /* 32: Start interrupt number, 16: Interrupt bit width */
-        GIC_REG_32(GICD_ICFGR(i / 16)) = 0; /* 16: Register bit offset */
+    /* set externel interrupts to be level triggered, active low. */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) {
+        GIC_REG_32(GICD_ICFGR(i / 16)) = 0;
    }

-    /* set external interrupts to CPU 0 */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 4) { /* 32: Start interrupt number, 4: Interrupt bit width */
+    /* set externel interrupts to CPU 0 */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 4) {
        GIC_REG_32(GICD_ITARGETSR(i / 4)) = 0x01010101;
    }

    /* set priority on all interrupts */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 4) { /* 4: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 4) {
        GIC_REG_32(GICD_IPRIORITYR(i / 4)) = GICD_INT_DEF_PRI_X4;
    }

    /* disable all interrupts. */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = ~0; /* 32: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = ~0;
    }

    HalIrqInitPercpu();
@@ -149,9 +149,6 @@ VOID HalIrqInit(VOID)
    (VOID)LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
    (VOID)LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
    (VOID)LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpHaltHandler, 0);
-#ifdef LOSCFG_KERNEL_SMP_CALL
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_FUNC_CALL, 0xa0, 0, OsMpFuncCallHandler, 0);
-#endif
 #endif
 }

@@ -172,7 +169,7 @@ VOID HalIrqHandler(VOID)

    OsInterrupt(vector);

-    /* use original iar to do the EOI */
+    /* use orignal iar to do the EOI */
    GIC_REG_32(GICC_EOIR) = iar;
 }

--- a/arch/arm/gic/gic_v3.c
+++ b/arch/arm/gic/gic_v3.c
@@ -42,9 +42,9 @@ STATIC UINT32 g_curIrqNum = 0;

 STATIC INLINE UINT64 MpidrToAffinity(UINT64 mpidr)
 {
-    return ((MPIDR_AFF_LEVEL(mpidr, 3) << 32) | /* 3: Serial number, 32: Register bit offset */
-            (MPIDR_AFF_LEVEL(mpidr, 2) << 16) | /* 2: Serial number, 16: Register bit offset */
-            (MPIDR_AFF_LEVEL(mpidr, 1) << 8)  | /* 1: Serial number, 8: Register bit offset */
+    return ((MPIDR_AFF_LEVEL(mpidr, 3) << 32) |
+            (MPIDR_AFF_LEVEL(mpidr, 2) << 16) |
+            (MPIDR_AFF_LEVEL(mpidr, 1) << 8)  |
            (MPIDR_AFF_LEVEL(mpidr, 0)));
 }

@@ -106,10 +106,10 @@ STATIC VOID GicSgi(UINT32 irq, UINT32 cpuMask)
            tList = GicTargetList(&cpu, cpuMask, cluster);

            /* Generates a Group 1 interrupt for the current security state */
-            val = ((MPIDR_AFF_LEVEL(cluster, 3) << 48) | /* 3: Serial number, 48: Register bit offset */
-                   (MPIDR_AFF_LEVEL(cluster, 2) << 32) | /* 2: Serial number, 32: Register bit offset */
-                   (MPIDR_AFF_LEVEL(cluster, 1) << 16) | /* 1: Serial number, 16: Register bit offset */
-                   (irq << 24) | tList); /* 24: Register bit offset */
+            val = ((MPIDR_AFF_LEVEL(cluster, 3) << 48) |
+                   (MPIDR_AFF_LEVEL(cluster, 2) << 32) |
+                   (MPIDR_AFF_LEVEL(cluster, 1) << 16) |
+                   (irq << 24) | tList);

            GiccSetSgi1r(val);
        }
@@ -150,9 +150,9 @@ STATIC INLINE VOID GicdSetGroup(UINT32 irq)
 {
    /* configure spi as group 0 on secure mode and group 1 on unsecure mode */
 #ifdef LOSCFG_ARCH_SECURE_MONITOR_MODE
-    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0; /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0;
 #else
-    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0xffffffff; /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0xffffffff;
 #endif
 }

@@ -248,13 +248,13 @@ UINT32 HalCurIrqGet(VOID)
 VOID HalIrqMask(UINT32 vector)
 {
    INT32 i;
-    const UINT32 mask = 1U << (vector % 32); /* 32: Interrupt bit width */
+    const UINT32 mask = 1U << (vector % 32);

    if ((vector > OS_USER_HWI_MAX) || (vector < OS_USER_HWI_MIN)) {
        return;
    }

-    if (vector < 32) { /* 32: Interrupt bit width */
+    if (vector < 32) {
        for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
            GIC_REG_32(GICR_ICENABLER0(i)) = mask;
            GicWaitForRwp(GICR_CTLR(i));
@@ -268,19 +268,19 @@ VOID HalIrqMask(UINT32 vector)
 VOID HalIrqUnmask(UINT32 vector)
 {
    INT32 i;
-    const UINT32 mask = 1U << (vector % 32); /* 32: Interrupt bit width */
+    const UINT32 mask = 1U << (vector % 32);

    if ((vector > OS_USER_HWI_MAX) || (vector < OS_USER_HWI_MIN)) {
        return;
    }

-    if (vector < 32) { /* 32: Interrupt bit width */
+    if (vector < 32) {
        for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
            GIC_REG_32(GICR_ISENABLER0(i)) = mask;
            GicWaitForRwp(GICR_CTLR(i));
        }
    } else {
-        GIC_REG_32(GICD_ISENABLER(vector >> 5)) = mask; /* 5: Register bit offset */
+        GIC_REG_32(GICD_ISENABLER(vector >> 5)) = mask;
        GicWaitForRwp(GICD_CTLR);
    }
 }
@@ -291,7 +291,7 @@ VOID HalIrqPending(UINT32 vector)
        return;
    }

-    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32); /* 5: Register bit offset, 32: Interrupt bit width */
+    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32);
 }

 VOID HalIrqClear(UINT32 vector)
@@ -362,30 +362,30 @@ VOID HalIrqInit(VOID)
    GicWaitForRwp(GICD_CTLR);
    ISB;

-    /* set external interrupts to be level triggered, active low. */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) { /* 32: Start interrupt number, 16: Interrupt bit width */
+    /* set externel interrupts to be level triggered, active low. */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) {
        GIC_REG_32(GICD_ICFGR(i / 16)) = 0;
    }

    /* config distributer, mask and clear all spis, set group x */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Start interrupt number, 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICPENDR(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_IGRPMODR(i / 32)) = 0; /* 32: Interrupt bit width */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff;
+        GIC_REG_32(GICD_ICPENDR(i / 32)) = 0xffffffff;
+        GIC_REG_32(GICD_IGRPMODR(i / 32)) = 0;

        GicdSetGroup(i);
    }

    /* set spi priority as default */
-    for (i = 32; i < OS_HWI_MAX_NUM; i++) { /* 32: Start interrupt number */
+    for (i = 32; i < OS_HWI_MAX_NUM; i++) {
        GicdSetPmr(i, MIN_INTERRUPT_PRIORITY);
    }

    GicWaitForRwp(GICD_CTLR);

    /* disable all interrupts. */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff;
    }

    /* enable distributor with ARE, group 1 enabled */
@@ -393,7 +393,7 @@ VOID HalIrqInit(VOID)

    /* set spi to boot cpu only. ARE must be enabled */
    affinity = MpidrToAffinity(AARCH64_SYSREG_READ(mpidr_el1));
-    for (i = 32; i < OS_HWI_MAX_NUM; i++) { /* 32: Start interrupt number */
+    for (i = 32; i < OS_HWI_MAX_NUM; i++) {
        GIC_REG_64(GICD_IROUTER(i)) = affinity;
    }

@@ -401,12 +401,9 @@ VOID HalIrqInit(VOID)

 #ifdef LOSCFG_KERNEL_SMP
    /* register inter-processor interrupt */
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpScheduleHandler, 0);
-#ifdef LOSCFG_KERNEL_SMP_CALL
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_FUNC_CALL, 0xa0, 0, OsMpFuncCallHandler, 0);
-#endif
+    LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
+    LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
+    LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpScheduleHandler, 0);
 #endif
 }

--- a/arch/arm/include/gic_common.h
+++ b/arch/arm/include/gic_common.h
@@ -77,8 +77,8 @@ enum {
 #define GICD_PIDR2V3                    (GICD_OFFSET + 0xffe8)

 #ifdef LOSCFG_ARCH_GIC_V3
-#define GICD_IGRPMODR(n)                (GICD_OFFSET + 0x0d00 + (n) * 4) /* Interrupt Group Mode Registers */
-#define GICD_IROUTER(n)                 (GICD_OFFSET + 0x6000 + (n) * 8) /* Interrupt Rounter Registers */
+#define GICD_IGRPMODR(n)                (GICD_OFFSET + 0x0d00 + (n) * 4) /* Interrupt Group Mode Reisters */
+#define GICD_IROUTER(n)                 (GICD_OFFSET + 0x6000 + (n) * 8) /* Interrupt Rounter Reisters */
 #endif

 #define GIC_REG_8(reg)                  (*(volatile UINT8 *)((UINTPTR)(GIC_BASE_ADDR + (reg))))
--- a/arch/arm/include/gic_v3.h
+++ b/arch/arm/include/gic_v3.h
--- a/arch/arm/include/perf.h
+++ b/arch/arm/include/perf.h
@@ -1,61 +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 _PERF_H
-#define _PERF_H
-
-#include "los_typedef.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#define OsPerfArchFetchCallerRegs(regs) \
-    do { \
-        (regs)->pc = (UINTPTR)__builtin_return_address(0); \
-        (regs)->fp = (UINTPTR)__builtin_frame_address(0);  \
-    } while (0)
-
-#define OsPerfArchFetchIrqRegs(regs, tcb) \
-    do { \
-        (regs)->pc = (tcb)->pc; \
-        (regs)->fp = (tcb)->fp; \
-    } while (0)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#endif /* _PERF_H */
--- a/bsd/BUILD.gn
+++ b/bsd/BUILD.gn
@@ -1,86 +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 = "libbsd"
-kernel_module(module_name) {
-  sources = [
-    "kern/bus_if.c",
-    "kern/device_if.c",
-    "kern/kern_condvar.c",
-    "kern/kern_timeout.c",
-    "kern/subr_bus.c",
-    "kern/subr_kobj.c",
-  ]
-
-  if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
-    sources += [
-      "arm/autoconf.c",
-      "arm/hw_user_copy.S",
-      "arm/in_cksum.c",
-      "arm/in_cksum_arm.S",
-      "arm/nexus.c",
-    ]
-  }
-
-  if (defined(LOSCFG_DRIVERS_RANDOM)) {
-    sources += [
-      "crypto/rijndael/rijndael-alg-fst.c",
-      "crypto/rijndael/rijndael-api-fst.c",
-      "crypto/sha2/sha256c.c",
-      "dev/random/hash.c",
-      "dev/random/yarrow.c",
-      "libkern/explicit_bzero.c",
-    ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-group("bsd") {
-  public_deps = [ ":$module_name" ]
-
-  deps = [
-    "compat/linuxkpi",
-    "dev/usb",
-  ]
-}
-
-config("public") {
-  include_dirs = [
-    ".",
-    "kern",
-  ]
-  configs = [
-    "compat/linuxkpi:public",
-    "dev/usb:public",
-  ]
-}
--- 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,14 +33,22 @@ 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) \
              $(wildcard crypto/sha2/*.c) \
              $(wildcard dev/random/*.c) \
              $(wildcard libkern/*.c)
+
 endif

+LOCAL_INCLUDE := \
+        -I $(LITEOSTOPDIR)/kernel/base/include \
+        -I $(LITEOSTOPDIR)/bsd \
+        -I $(LITEOSTOPDIR)/bsd/kern \
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+
 include $(MODULE)
--- 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/Makefile
+++ b/bsd/compat/linuxkpi/Makefile
@@ -37,4 +37,10 @@ ifneq ($(LOSCFG_HRTIMER_ENABLE), y)
 LOCAL_SRCS := $(filter-out src/linux_hrtimer.c, $(LOCAL_SRCS))
 endif

+LOCAL_INCLUDE := \
+        -I $(LITEOSTOPDIR)/kernel/base/include \
+        -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+
 include $(MODULE)
--- 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,149 +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") {
-  defines = [ "USB_DEBUG_VAR=5" ]
-  include_dirs = [ "." ]
-  include_dirs += [ "$LITEOSTHIRDPARTY/FreeBSD/sys/dev/evdev" ]
-}
--- a/bsd/dev/usb/Makefile
+++ b/bsd/dev/usb/Makefile
@@ -135,4 +135,6 @@ LOCAL_SRCS += $(INPUT_SRC)/uhid.c  \
              $(CORE_SRC)/usb_hid.c
 endif

+LOCAL_FLAGS += $(LITEOS_GCOV_OPTS)
+
 include $(HDF_DRIVER)
--- 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,65 +0,0 @@
-{
-    "name": "@ohos/liteos_a",
-    "version": "3.1.0",
-    "description": "liteos-a kernel",
-    "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": {},
-    "contributors": [],
-    "segment": {
-        "destPath": "kernel/liteos_a"
-    },
-    "component": {
-        "name": "liteos_a",
-        "subsystem": "kernel",
-        "syscap": [
-            "SystemCapability.Kernel.liteos-a"
-        ],
-        "features": [],
-        "adated_system_type": [
-            "small"
-        ],
-        "rom": "1.5MB",
-        "ram": "2MB",
-        "deps": {
-            "components": [
-            ], 
-            "third_party": [
-                "bounds_checking_function",
-                "toybox",
-                "NuttX",
-                "FatFs",
-                "mksh",
-                "musl",
-                "mbedtls",
-                "FreeBSD",
-                "zlib",
-                "lwip",
-                "optimized-routines",
-                "googletest"
-            ]
-        },
-        "build": {
-            "sub_component": [
-                "//kernel/liteos_a:liteos_a"
-            ],
-            "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/Makefile
+++ b/compat/posix/Makefile
@@ -33,8 +33,10 @@ MODULE_NAME := $(notdir $(shell pwd))

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

-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/compat/posix/src
+LOCAL_INCLUDE := \
+    -I $(LITEOSTOPDIR)/compat/posix/src \
+    -I $(LITEOSTOPDIR)/kernel/base/include \

-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)

 include $(MODULE)
--- a/compat/posix/include/mqueue.h
+++ b/compat/posix/include/mqueue.h
@@ -71,7 +71,7 @@ extern "C" {
 /* CONSTANTS */

 #define MQ_USE_MAGIC  0x89abcdef
-/* not support prio */
+/* not suppurt prio */
 #define MQ_PRIO_MAX 1

 typedef union send_receive_t {
@@ -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;
 };
@@ -297,7 +292,7 @@ extern int mq_send(mqd_t personal, const char *msg, size_t msgLen, unsigned int
 * <li><b>EAGAIN</b>: The message queue is empty.</li>
 * <li><b>EINVAL</b>: invalid parameter.</li>
 * <li><b>EMSGSIZE</b>: The message to be received is too long.</li>
- * <li><b>ETIMEDOUT</b>: The operation times out.</li>
+ * <li><b>ETIMEDOUT</b>: The operaton times out.</li>
 * </ul>
 *
 * @par Dependency:
@@ -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/include/time_posix.h
+++ b/compat/posix/include/time_posix.h
@@ -86,7 +86,6 @@ STATIC INLINE VOID OsTick2TimeSpec(struct timespec *tp, UINT32 tick)
 }

 int OsTimerCreate(clockid_t, struct ksigevent *__restrict, timer_t *__restrict);
-void OsAdjTime(void);

 #ifdef __cplusplus
 #if __cplusplus
--- 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)
-{
-    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)
-{
-    if (size == 0) {
-        return NULL;
-    }
-
-    return LOS_KernelMalloc((UINT32) size);
-}
-
-void *zalloc(size_t size)
-{
-    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,79 +140,3 @@ pid_t getpid(void)
    return ((LosTaskCB *)(OsCurrTaskGet()))->taskID;
 }

-int getrlimit(int resource, struct rlimit *rlim)
-{
-    unsigned int intSave;
-    LosProcessCB *pcb = OsCurrProcessGet();
-    struct rlimit *resourceLimit = pcb->resourceLimit;
-
-    switch (resource) {
-        case RLIMIT_NOFILE:
-        case RLIMIT_FSIZE:
-            break;
-        default:
-            return -EINVAL;
-    }
-
-    if (resourceLimit == NULL) {
-        rlim->rlim_cur = 0;
-        rlim->rlim_max = 0;
-
-        return 0;
-    }
-
-    SCHEDULER_LOCK(intSave);
-    rlim->rlim_cur = resourceLimit[resource].rlim_cur;
-    rlim->rlim_max = resourceLimit[resource].rlim_max;
-    SCHEDULER_UNLOCK(intSave);
-
-    return 0;
-}
-
-#define FSIZE_RLIMIT 0XFFFFFFFF
-#ifndef NR_OPEN_DEFAULT
-#define NR_OPEN_DEFAULT 1024
-#endif
-int setrlimit(int resource, const struct rlimit *rlim)
-{
-    unsigned int intSave;
-    struct rlimit *resourceLimit = NULL;
-    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;
-    }
-
-    if (pcb->resourceLimit == NULL) {
-        resourceLimit = LOS_MemAlloc((VOID *)m_aucSysMem0, RLIM_NLIMITS * sizeof(struct rlimit));
-        if (resourceLimit == NULL) {
-            return -EINVAL;
-        }
-    }
-
-    SCHEDULER_LOCK(intSave);
-    if (pcb->resourceLimit == NULL) {
-        pcb->resourceLimit = resourceLimit;
-        resourceLimit = NULL;
-    }
-    pcb->resourceLimit[resource].rlim_cur = rlim->rlim_cur;
-    pcb->resourceLimit[resource].rlim_max = rlim->rlim_max;
-    SCHEDULER_UNLOCK(intSave);
-
-    (VOID)LOS_MemFree((VOID *)m_aucSysMem0, resourceLimit);
-    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
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device 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:
@@ -158,7 +158,7 @@ STATIC VOID SetPthreadAttr(const _pthread_data *self, const pthread_attr_t *attr
    }
    if (outAttr->inheritsched == PTHREAD_INHERIT_SCHED) {
        if (self->task == NULL) {
-            outAttr->schedparam.sched_priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
+            outAttr->schedparam.sched_priority = ((LosTaskCB *)(OsCurrTaskGet()))->priority;
        } else {
            outAttr->schedpolicy = self->attr.schedpolicy;
            outAttr->schedparam  = self->attr.schedparam;
@@ -248,7 +248,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
        taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED;
    } else {
        /* Set the pthread default joinable */
-        taskInitParam.uwResved = LOS_TASK_ATTR_JOINABLE;
+        taskInitParam.uwResved = 0;
    }

    PthreadReap();
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
openharmony_ci	16593d9349	!719 当hilog/hievent驱动缓存出问题时，进行恢复处理 Merge pull request !719 from shenchenkai/cherry-pick-1637985969	2021-11-29 03:55:22 +00:00
shenchenkai	724f4de0b7	fixed `c121d0e` from https://gitee.com/shenchenkai/kernel_liteos_a/pulls/670 Description:[fix] clean hilog/hievent ring buffer after memory verification failed Change-Id: I9310fe807ec95721be78deb60ed9728ef9b56e48 Signed-off-by: shenchenkai <shenchenkai@huawei.com>	2021-11-27 04:06:09 +00:00
openharmony_ci	744a2db71f	!698 修改blackbox生成的文件和文件夹权限 Merge pull request !698 from mgceshuang/upload_2.3	2021-11-08 02:27:19 +00:00
YOUR_NAME	f360b21d20	add blackbox to 2.3 Signed-off-by: YOUR_NAME <mashuang9@huawei.com>	2021-11-04 15:59:35 +08:00
openharmony_ci	b20adcf0a3	!627 codex问题修复 Merge pull request !627 from LeonChan/b2	2021-09-22 06:42:59 +00:00
LeonChan	a6552607ed	fix: profs file mode close: #I4B28O Signed-off-by: LeonChan <chenwei26@huawei.com>	2021-09-19 14:16:44 +08:00
openharmony_ci	390181a2d5	!625 procfs 使用统一的权限 Merge pull request !625 from LeonChan/procfs_mode-2	2021-09-18 03:41:27 +00:00
Leon Chan	bf7afbc1c3	fix: same file mode for procfs files close: #I4ACTC Signed-off-by: Leon Chan <chenwei26@huawei.com>	2021-09-18 09:54:43 +08:00
openharmony_ci	87ad9f74dc	!604 升级optimized-routines到v21.02 Merge pull request !604 from Caoruihong/pick-1ec8d5a	2021-09-07 07:41:15 +00:00
Caoruihong	8cb09c5866	feat(libc): upgrade optimized-routines to v21.02 Signed-off-by: Caoruihong <crh.cao@huawei.com> Change-Id: I5cdca0ee82d3e8a164120fe3ecb6e94f2f89d600	2021-09-03 11:24:16 +08:00
openharmony_ci	301a06be89	!549 去除冗余strip操作 Merge pull request !549 from MGY917/cherry-pick-1629079265	2021-08-16 07:23:09 +00:00
Guangyao Ma	d90c4d4b65	fixed `7819d15` from https://gitee.com/mgy917/kernel_liteos_a/pulls/479 fix: 去掉冗余的strip操作 toybox源码编译时，默认会进行strip操作，如下步骤： //third_party/toybox/scripts/make.sh:340: ! do_loudly ${CROSS_COMPILE}${STRIP} "$UNSTRIPPED" -o "$OUTNAME" 因此在打包的Makefile中再进行STRIP操作是冗余的。 close #I43767 Change-Id: I10a9861b682eb8e556b7af7519c9109eef0b3a94 Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com>	2021-08-16 02:01:08 +00:00
openharmony_ci	4e44ff9124	!531 删除二进制文件，并且新增oat屏蔽 Merge pull request !531 from SimonLi/cherry-pick-1628505983	2021-08-10 00:12:10 +00:00
SimonLi	83bb250511	fixed `7a98cad` from https://gitee.com/kkup180/kernel_liteos_a/pulls/515 chore(oat): 删除二进制文件，并且新增oat屏蔽 Signed-off-by: SimonLi <likailong@huawei.com>	2021-08-09 10:46:24 +00:00
openharmony_ci	08d166af4b	!524 license修复跳单到2.2beta2 Merge pull request !524 from lnlan/to2.2beta2_	2021-08-09 08:49:28 +00:00
openharmony_ci	ce274d0d7a	!524 license修复跳单到2.2beta2 Merge pull request !524 from lnlan/to2.2beta2_	2021-08-09 08:49:28 +00:00
openharmony_ci	f27d03ef15	!522 fix: clang相关编译选项隔离 Merge pull request !522 from MGY917/cherry-pick-1628489618	2021-08-09 07:50:57 +00:00
vcbchang	fea55a8559	style：修改 liteos_a unittest 测试文件的 licence 注释【背景】解除告警【修改方案】格式化修改告警文件的文件头注释格式 re #I44497 Signed-off-by: vcbchang <vcbchang@qq.com> Change-Id: I7a0d31e11603f591a5370e64505879e1a324d72d	2021-08-09 07:38:16 +00:00
Kiita	e6e0278c74	style: 格式化修改liteos_a unittest 测试文件头的许可注释【背景】解除告警【修改方案】格式化修改告警文件的文件头注释格式 re #I44497 Signed-off-by: yansira <yansira@hotmail.com> Change-Id: I88c7ade73b086fd0ee13574229d2a4b9795580ec	2021-08-09 07:38:02 +00:00
lnlan	a8a9c598b3	style：修改 liteos_a unittest 测试文件的 licence 注释【背景】解除告警【修改方案】格式化修改告警文件的文件头注释格式 re #I44497 Signed-off-by: lanleinan <lanleinan@163.com> Change-Id: If9fa5de0f896ddf8c3fc88408c8f88f633fdb3e7	2021-08-09 07:37:02 +00:00
openharmony_ci	e15ec31ba7	!523 liteos_a下nuttx文件放回原处 Merge pull request !523 from 野生毛霉君/OpenHarmony-2.2-Beta2	2021-08-09 07:29:04 +00:00
mucor	c14dd37783	fix: move nuttx file back close: #I4443Q Signed-off-by: mucor <mucorwang@gmail.com>	2021-08-09 14:48:53 +08:00
Guangyao Ma	34989f3083	fixed `77dcef4` from https://gitee.com/mgy917/kernel_liteos_a/pulls/513 fix: clang相关编译选项隔离 liteos_a在apps/mksh和apps/toybox编译中，clang相关编译选项未进行隔离。之后支持其他类似gcc编译时，可能存在编译问题。其中 --target=$(LLVM_TARGET) $(LLVM_SYSROOT) 是clang编译特有的编译选项，需要被隔离。 close #I444AV Signed-off-by: Guangyao Ma <guangyao.ma@outlook.com> Change-Id: Ib11453aa0b3ee6bcdf3104d13d166c65f2202527	2021-08-09 06:13:42 +00:00
openharmony_ci	e32b3a00fa	!499 LiteOS_A BBOX Codex整改 Merge pull request !499 from pcwlno1/cherry-pick-1628038487	2021-08-04 06:54:09 +00:00
pcwlno1	7a72cbfef6	fixed `6a5a032` from https://gitee.com/pcwlno1/kernel_liteos_a/pulls/498 fix: LiteOS_A BBOX Codex整改 1、判断安全函数的返回值。 Close #I43RQU Signed-off-by: pcwlno1 <qidechun@huawei.com>	2021-08-04 00:54:49 +00:00
openharmony_ci	9c2c417ac0	!491 调整IPC_MSG_DATA_SZ_MAX保持与用户态的IPC_IO_DATA_MAX约束一致 Merge pull request !491 from Caoruihong/cherry-pick-1627961356	2021-08-03 04:05:51 +00:00
Caoruihong	41ecb2e4af	fixed `4dc421e` from https://gitee.com/caoruihong/kernel_liteos_a/pulls/485 fix: liteipc max data size too small use IPC_IO_DATA_MAX from liteipc_adapter.h Signed-off-by: Caoruihong <crh.cao@huawei.com> Change-Id: I94f2dd2ff148e8a03ffb2c7b38ab06a34a2d2827	2021-08-03 03:29:17 +00:00
openharmony_ci	404f99d698	!483 BBOX使用预留物理内存缓存故障日志 Merge pull request !483 from pcwlno1/cherry-pick-1627866669	2021-08-02 01:36:12 +00:00
pcwlno1	184d870f88	fixed `2ad176e` from https://gitee.com/pcwlno1/kernel_liteos_a/pulls/463 fix: BBOX使用预留物理内存缓存故障日志 1、允许用户自己指定预留物理内存的起始地址和长度。 2、在适配层中增加对预留物理内存的映射。 3、在bbox的Kcondfig中增加有关预留物理内存的编译选项。 4、在bbox的Makefile增加有关内存函数头文件的引用。 Close #I41YIZ Signed-off-by: pcwlno1 <qidechun@huawei.com>	2021-08-02 01:11:14 +00:00
openharmony_ci	5f78ff093f	!482 确保BBOX抓取的故障日志落盘 Merge pull request !482 from pcwlno1/cherry-pick-1627723436	2021-08-02 01:06:03 +00:00
pcwlno1	f5f8d5ebf6	fixed `8f6a1dd` from https://gitee.com/pcwlno1/kernel_liteos_a/pulls/449 fix: 修改某些平台保存bbox日志失败的问题 1、在日志写如完成之后执行fsync确保落盘。 Close #I41UTP Signed-off-by: qidechun <qidechun@huawei.com>	2021-07-31 09:24:02 +00:00
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`