diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig
index 6239ffa42..b5f0bada1 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig
@@ -65,4 +65,4 @@ CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig
index fff76d485..fed8fba0d 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig
@@ -62,4 +62,4 @@ CONFIG_ADAPTER_BLUETOOTH_HC08="hc08"
 CONFIG_ADAPTER_HC08_WORK_ROLE="M"
 CONFIG_ADAPTER_HC08_DRIVER_EXTUART=y
 CONFIG_ADAPTER_HC08_DRIVER="/dev/extuart_dev2"
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig
index ed458a723..acf1c865c 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig
@@ -54,4 +54,4 @@ CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig
index 7083d8a39..304500ada 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_READLINE_CMD_HISTORY_LEN=100
 CONFIG_READLINE_CMD_HISTORY_LINELEN=120
 CONFIG_READLINE_TABCOMPLETION=y
 
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
 
 CONFIG_IMXRT_LPI2C=y
 CONFIG_IMXRT_LCD=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig
index f347bad94..c2b770c43 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig
@@ -53,4 +53,4 @@ CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig
index 7d41f2298..8ad286859 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig
@@ -62,4 +62,4 @@ CONFIG_ADAPTER_E220_DRIVER_EXTUART=y
 CONFIG_ADAPTER_E220_DRIVER="/dev/extuart_dev3"
 CONFIG_ADAPTER_E220_M0_PATH="/dev/gpout0"
 CONFIG_ADAPTER_E220_M1_PATH="/dev/gpout1"
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig
index 901df0b65..2439c324a 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig
@@ -76,4 +76,4 @@ CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig
index a03e3c01f..ee2b9261a 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig
@@ -51,4 +51,4 @@ CONFIG_FS_ROMFS=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig
index 8f33ec725..11d835a88 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig
@@ -70,4 +70,4 @@ CONFIG_READLINE_CMD_HISTORY_LEN=100
 CONFIG_READLINE_CMD_HISTORY_LINELEN=120
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig
index 0b3687f87..977fcd639 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig
@@ -69,4 +69,4 @@ CONFIG_READLINE_CMD_HISTORY_LEN=100
 CONFIG_READLINE_CMD_HISTORY_LINELEN=120
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_BOARDCTL_RESET=y
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig
index 9f77feaf2..9f7149a76 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig
@@ -58,4 +58,4 @@ CONFIG_CONNECTION_ADAPTER_WIFI=y
 CONFIG_ADAPTER_ESP07S_WIFI=y
 CONFIG_ADAPTER_WIFI_ESP07S="esp07s_wifi"
 CONFIG_ADAPTER_ESP07S_DRIVER="/dev/ttyS2"
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
index deb156dfa..11e21116a 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
@@ -61,4 +61,4 @@ CONFIG_ADAPTER_E18=y
 CONFIG_ADAPTER_ZIGBEE_E18="e18"
 CONFIG_AS_END_DEVICE_ROLE=y
 CONFIG_ADAPTER_E18_DRIVER="/dev/extuart_dev1"
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_INIT_ENTRYPOINT="nsh_main"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile
index 147b40f82..b3fae6a11 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile
@@ -22,29 +22,18 @@ include $(TOPDIR)/Make.defs
 
 # The entry point name (if none is provided in the .config file)
 
-CONFIG_USER_ENTRYPOINT ?= user_start
-ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT))
+CONFIG_INIT_ENTRYPOINT ?= user_start
+ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
 
 # Get the paths to the libraries and the links script path in format that
 # is appropriate for the host OS
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  # Windows-native toolchains
-  USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
-  USER_LDSCRIPT = -T "${shell cygpath -w $(BOARD_DIR)$(DELIM)scripts$(DELIM)memory.ld}"
-  USER_LDSCRIPT += -T "${shell cygpath -w $(BOARD_DIR)$(DELIM)scripts$(DELIM)user-space.ld}"
-  USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}"
-  USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}"
-  USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}"
-else
-  # Linux/Cygwin-native toolchain
-  USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS)))
-  USER_LDSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)memory.ld
-  USER_LDSCRIPT += -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)user-space.ld
-  USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex"
-  USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec"
-  USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin"
-endif
+USER_LIBPATHS = $(addprefix -L,$(call CONVERT_PATH,$(addprefix $(TOPDIR)$(DELIM),$(dir $(USERLIBS)))))
+USER_LDSCRIPT = -T $(call CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)memory.ld)
+USER_LDSCRIPT += -T $(call CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)user-space.ld)
+USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
+USER_SRECFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.srec)
+USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)
 
 USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
 USER_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(USERLIBS))))
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c
index 6735ddec2..930aca044 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c
@@ -64,10 +64,10 @@
  * They are only used meaningfully in the following way:
  *
  *  - The linker script defines, for example, the symbol_sdata.
- *  - The declareion extern uint32_t _sdata; makes C happy.  C will believe
+ *  - The declaration extern uint32_t _sdata; makes C happy.  C will believe
  *    that the value _sdata is the address of a uint32_t variable _data (it
  *    is not!).
- *  - We can recoved the linker value then by simply taking the address of
+ *  - We can recover the linker value then by simply taking the address of
  *    of _data.  like:  uint32_t *pdata = &_sdata;
  */
 
@@ -81,13 +81,13 @@ extern uint32_t _ebss;            /* End+1 of .bss */
 
 /* This is the user space entry point */
 
-int CONFIG_USER_ENTRYPOINT(int argc, char *argv[]);
+int CONFIG_INIT_ENTRYPOINT(int argc, char *argv[]);
 
 const struct userspace_s userspace locate_data(".userspace") =
 {
   /* General memory map */
 
-  .us_entrypoint    = (main_t)CONFIG_USER_ENTRYPOINT,
+  .us_entrypoint    = (main_t)CONFIG_INIT_ENTRYPOINT,
   .us_textstart     = (uintptr_t)&_stext,
   .us_textend       = (uintptr_t)&_etext,
   .us_datasource    = (uintptr_t)&_eronly,
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs
index c3fecc52d..6f5b898bd 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs
@@ -28,11 +28,7 @@ else
   LDSCRIPT = flash-ocram.ld
 endif
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  ARCHSCRIPT = -T "${shell cygpath -w $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}"
-else
-  ARCHSCRIPT = -T$(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-endif
+ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
@@ -42,8 +38,13 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += $(MAXOPTIMIZATION)
 endif
 
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
+ARCHCFLAGS = -fno-common
+ifeq ($(CONFIG_CXX_EXCEPTION),y)
+  ARCHCXXFLAGS = -fno-common
+else
+  ARCHCXXFLAGS = -fno-common -fno-exceptions -fcheck-new -fno-rtti
+endif
+
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -fno-strict-aliasing
 ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
@@ -64,11 +65,7 @@ LDNXFLATFLAGS = -e main -s 2048
 CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
 
 LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
-else
-  LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
-endif
+LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS += -g
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c
index b5283cb71..b92eb368b 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c
@@ -40,7 +40,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h
index 866bdde0a..65db16c35 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h
@@ -55,7 +55,7 @@
 #include <fcntl.h>
 
 #include <arch/board/board.h>
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c
index 1f495ec14..d2f258462 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c
@@ -40,7 +40,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "imxrt_lpspi.h"
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c
index 673eaec0b..ac757d516 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c
@@ -41,7 +41,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/board/board.h>
 
-#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"