diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/Kconfig
similarity index 81%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/Kconfig
index e729e70d3..2f080eff2 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/Kconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/Kconfig
@@ -3,85 +3,85 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_BOARD_XIDATONG
+if ARCH_BOARD_XIDATONG_ARM32
 
 choice
     prompt "Boot Flash"
-    default XIDATONG_QSPI_FLASH
+    default XIDATONG_ARM32_QSPI_FLASH
 
-config XIDATONG_HYPER_FLASH
+config XIDATONG_ARM32_HYPER_FLASH
     bool "HYPER Flash"
 
-config XIDATONG_QSPI_FLASH
+config XIDATONG_ARM32_QSPI_FLASH
     bool "QSPI Flash"
 
 endchoice # Boot Flash
 
-config XIDATONG_SDRAM
+config XIDATONG_ARM32_SDRAM
     bool "Enable SDRAM"
     default y
     select IMXRT_SEMC_INIT_DONE
     ---help---
         Activate DCD configuration of SDRAM
 
-config XIDATONG_SDIO_AUTOMOUNT
+config XIDATONG_ARM32_SDIO_AUTOMOUNT
     bool "SD card automounter"
     default n
     depends on FS_AUTOMOUNTER && IMXRT_USDHC
 
-if XIDATONG_SDIO_AUTOMOUNT
+if XIDATONG_ARM32_SDIO_AUTOMOUNT
 
-config XIDATONG_SDIO_AUTOMOUNT_FSTYPE
+config XIDATONG_ARM32_SDIO_AUTOMOUNT_FSTYPE
     string "SD card file system type"
     default "vfat"
 
-config XIDATONG_SDIO_AUTOMOUNT_BLKDEV
+config XIDATONG_ARM32_SDIO_AUTOMOUNT_BLKDEV
     string "SD card block device"
     default "/dev/mmcsd0"
 
-config XIDATONG_SDIO_AUTOMOUNT_MOUNTPOINT
+config XIDATONG_ARM32_SDIO_AUTOMOUNT_MOUNTPOINT
     string "SD card mount point"
     default "/mnt/sdcard"
 
-config XIDATONG_SDIO_AUTOMOUNT_DDELAY
+config XIDATONG_ARM32_SDIO_AUTOMOUNT_DDELAY
     int "SD card debounce delay (milliseconds)"
     default 1000
 
-config XIDATONG_SDIO_AUTOMOUNT_UDELAY
+config XIDATONG_ARM32_SDIO_AUTOMOUNT_UDELAY
     int "SD card unmount retry delay (milliseconds)"
     default 2000
 
-endif # XIDATONG_SDIO_AUTOMOUNT
+endif # XIDATONG_ARM32_SDIO_AUTOMOUNT
 
-config XIDATONG_USB_AUTOMOUNT
+config XIDATONG_ARM32_USB_AUTOMOUNT
     bool "USB Mass Storage automounter"
     default n
     depends on USBHOST_MSC && USBHOST_MSC_NOTIFIER
 
-if XIDATONG_USB_AUTOMOUNT
+if XIDATONG_ARM32_USB_AUTOMOUNT
 
-config XIDATONG_USB_AUTOMOUNT_FSTYPE
+config XIDATONG_ARM32_USB_AUTOMOUNT_FSTYPE
     string "USB file system type"
     default "vfat"
 
-config XIDATONG_USB_AUTOMOUNT_BLKDEV
+config XIDATONG_ARM32_USB_AUTOMOUNT_BLKDEV
     string "USB block device prefix"
     default "/dev/sd"
 
-config XIDATONG_USB_AUTOMOUNT_MOUNTPOINT
+config XIDATONG_ARM32_USB_AUTOMOUNT_MOUNTPOINT
     string "USB mount point prefix"
     default "/mnt/usb"
 
-config XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV
+config XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV
     int "Number of block devices to monitor."
     range 1 26
     default 4
 
-config XIDATONG_USB_AUTOMOUNT_UDELAY
+config XIDATONG_ARM32_USB_AUTOMOUNT_UDELAY
     int "USB unmount retry delay (milliseconds)"
     default 2000
 
-endif # XIDATONG_USB_AUTOMOUNT
+endif # XIDATONG_ARM32_USB_AUTOMOUNT
 
 menuconfig BSP_USING_CH438
     bool "Using CH438 device"
@@ -202,4 +202,4 @@ endmenu
 
 endif # BSP_USING_CH438
 
-endif # ARCH_BOARD_XIDATONG
+endif # ARCH_BOARD_XIDATONG_ARM32
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig
index b5f0bada1..e77bb4385 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/4gnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/4gnsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig
index fed8fba0d..9b7af5b16 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/btnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/btnsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/Make.defs b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/Make.defs
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/Make.defs
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/Make.defs
index 3b7371cf7..00b339b61 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/Make.defs
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/xidatong/configs/knsh/Make.defs
+# boards/arm/imxrt/xidatong-arm32/configs/knsh/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/defconfig
similarity index 91%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/defconfig
index acf1c865c..ff39028e0 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/knsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/knsh/defconfig
@@ -8,8 +8,8 @@
 # CONFIG_ARCH_RAMFUNCS is not set
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
@@ -35,7 +35,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x60200000
-CONFIG_PASS1_BUILDIR="boards/arm/imxrt/xidatong/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/imxrt/xidatong-arm32/kernel"
 CONFIG_RAM_SIZE=524288
 CONFIG_RAM_START=0x20200000
 CONFIG_RAW_BINARY=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig
index 304500ada..df2f82504 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/lcdnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/lcdnsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/Make.defs b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/Make.defs
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/Make.defs
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/Make.defs
index 8d5a217a8..e743b5926 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/Make.defs
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/xidatong/configs/libcxxtest/Make.defs
+# boards/arm/imxrt/xidatong-arm32/configs/libcxxtest/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/defconfig
similarity index 95%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/defconfig
index c2b770c43..9ebbdc50c 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/libcxxtest/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/libcxxtest/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig
index 8ad286859..6bc0d0567 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/loransh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/loransh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig
index 2439c324a..9c4f04b90 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/netnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/netnsh/defconfig
@@ -8,8 +8,8 @@
 # CONFIG_ARCH_LEDS is not set
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig
similarity index 95%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig
index ee2b9261a..9bbac573a 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/nsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/nsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig
similarity index 94%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig
index 11d835a88..09b581648 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/sdionsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/sdionsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
@@ -63,7 +63,7 @@ CONFIG_START_MONTH=3
 CONFIG_SYSTEM_CLE_CMD_HISTORY=y
 CONFIG_SYSTEM_COLOR_CLE=y
 CONFIG_FS_AUTOMOUNTER=y
-CONFIG_XIDATONG_SDIO_AUTOMOUNT=y
+CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LEN=100
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig
similarity index 94%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig
index 977fcd639..fbb2ab1d2 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/usbnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/usbnsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
@@ -62,7 +62,7 @@ CONFIG_USBDEV=y
 CONFIG_USBHOST=y
 CONFIG_USBHOST_MSC=y
 CONFIG_USBHOST_MSC_NOTIFIER=y
-CONFIG_XIDATONG_USB_AUTOMOUNT=y
+CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT=y
 CONFIG_DEV_GPIO=y
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LEN=100
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig
similarity index 95%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig
index 9f7149a76..6fe18f3ff 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/wifinsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig
index 11e21116a..f2bb2dd5a 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/zbnsh/defconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/configs/zbnsh/defconfig
@@ -7,8 +7,8 @@
 #
 CONFIG_ADD_NUTTX_FETURES=y
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="xidatong"
-CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_BOARD="xidatong-arm32"
+CONFIG_ARCH_BOARD_XIDATONG_ARM32=y
 CONFIG_ARCH_CHIP="imxrt"
 CONFIG_ARCH_CHIP_IMXRT=y
 CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/Adapter4GTest b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/Adapter4GTest
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/Adapter4GTest
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/Adapter4GTest
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/hello b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/hello
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/hello
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/hello
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/rcS b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/rcS
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/etc/init.d/rcS
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/etc/init.d/rcS
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/NXPBootUtility_1.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/NXPBootUtility_1.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/NXPBootUtility_1.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/NXPBootUtility_1.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/NXPBootUtility_2.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/NXPBootUtility_2.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/NXPBootUtility_2.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/NXPBootUtility_2.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/flashconfig.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/flashconfig.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/flashconfig.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/flashconfig.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfig.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfig.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfig.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfig.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfig1.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfig1.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfig1.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfig1.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfigexit.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfigexit.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/menuconfigexit.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/menuconfigexit.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/terminal.png b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/terminal.png
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/terminal.png
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/terminal.png
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/vscode.jpg b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/vscode.jpg
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/img/vscode.jpg
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/img/vscode.jpg
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/include/board.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/include/board.h
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/include/board.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/include/board.h
index 3614852cf..7f44f7d27 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/include/board.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/include/board.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/include/board.h
+ * boards/arm/imxrt/xidatong-arm32/include/board.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,8 +27,8 @@
 * @date 2022-03-23
 */
 
-#ifndef __BOARDS_ARM_IMXRT_XIDATONG_INCLUDE_BOARD_H
-#define __BOARDS_ARM_IMXRT_XIDATONG_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_IMXRT_XIDATONG_ARM32_INCLUDE_BOARD_H
+#define __BOARDS_ARM_IMXRT_XIDATONG_ARM32_INCLUDE_BOARD_H
 
 /****************************************************************************
  * Included Files
@@ -360,4 +360,4 @@ extern "C"
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_IMXRT_XIDATONG_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_IMXRT_XIDATONG_ARM32_INCLUDE_BOARD_H */
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/include/nsh_romfsimg.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/include/nsh_romfsimg.h
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/include/nsh_romfsimg.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/include/nsh_romfsimg.h
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/Makefile
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/Makefile
index b3fae6a11..030395723 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/Makefile
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/xidatong/kernel/Makefile
+# boards/arm/imxrt/xidatong-arm32/kernel/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/imxrt_userspace.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/imxrt_userspace.c
index 94f1b8c4b..94fe85ed3 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/kernel/imxrt_userspace.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/kernel/imxrt_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/kernel/imxrt_userspace.c
+ * boards/arm/imxrt/xidatong-arm32/kernel/imxrt_userspace.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/readme.md b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/readme.md
similarity index 99%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/readme.md
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/readme.md
index 01a71f401..c0cf863c9 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/readme.md
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/readme.md
@@ -1,6 +1,6 @@
 # 从零开始构建矽璓工业物联操作系统：使用ARM架构的矽达通
 
-# xidatong
+# xidatong-arm32
 
 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓XiUOS是一款面向智慧车间的工业物联网操作系统，主要由一个极简的微型实时操作系统内核和其上的工业物联框架构成，通过高效管理工业物联网设备、支撑工业物联应用，在生产车间内实现智能化的“感知环境、联网传输、知悉识别、控制调整”，促进以工业设备和工业控制系统为核心的人、机、物深度互联，帮助提升生产线的数字化和智能化水平。
 
@@ -137,7 +137,7 @@ source build.sh
 
 执行完毕会自动进入./Ubiquitous/Nuttx_Fusion_XiUOS/nuttx下，继续执行
 
-./tools/configure.sh xidatong:nsh
+./tools/configure.sh xidatong-arm32:nsh
 make menuconfig
 视情况而定，如果需要前面加sudo
 ```
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/Make.defs
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/Make.defs
index 6f5b898bd..eae5fa7b9 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/Make.defs
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/xidatong/scripts/Make.defs
+# boards/arm/imxrt/xidatong-arm32/scripts/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/flash-ocram.ld b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/flash-ocram.ld
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/flash-ocram.ld
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/flash-ocram.ld
index fb625d802..ff8aa17c3 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/flash-ocram.ld
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/flash-ocram.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/scripts/flash-ocram.ld
+ * boards/arm/imxrt/xidatong-arm32/scripts/flash-ocram.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/kernel-space.ld b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/kernel-space.ld
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/kernel-space.ld
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/kernel-space.ld
index 7ad3587d0..40f222ed9 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/kernel-space.ld
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/kernel-space.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/scripts/kernel-space.ld
+ * boards/arm/imxrt/xidatong-arm32/scripts/kernel-space.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/memory.ld b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/memory.ld
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/memory.ld
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/memory.ld
index fea61bc8d..921c16aff 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/memory.ld
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/memory.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/scripts/memory.ld
+ * boards/arm/imxrt/xidatong-arm32/scripts/memory.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/user-space.ld b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/user-space.ld
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/user-space.ld
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/user-space.ld
index ed09f8110..dd499d000 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/scripts/user-space.ld
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/scripts/user-space.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/scripts/user-space.ld
+ * boards/arm/imxrt/xidatong-arm32/scripts/user-space.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/Makefile
similarity index 94%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/Makefile
index 528b9f1cc..41b485d50 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/Makefile
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/imxrt/xidatong/src/Makefile
+# boards/arm/imxrt/xidatong-arm32/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_DEV_GPIO),y)
 CSRCS += imxrt_gpio.c
 endif
 
-ifeq ($(CONFIG_XIDATONG_SDRAM),y)
+ifeq ($(CONFIG_XIDATONG_ARM32_SDRAM),y)
 CSRCS += imxrt_sdram_ini_dcd.c
 endif
 
@@ -78,7 +78,7 @@ ifeq ($(CONFIG_IMXRT_USDHC),y)
 CSRCS += imxrt_mmcsd.c
 endif
 
-ifeq ($(CONFIG_XIDATONG_SDIO_AUTOMOUNT),y)
+ifeq ($(CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT),y)
 CSRCS += imxrt_mmcsd_automount.c
 endif
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/ch438_demo.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/ch438_demo.c
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/ch438_demo.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/ch438_demo.c
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_appinit.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_appinit.c
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_appinit.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_appinit.c
index 15ed456e4..8b9e79d14 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_appinit.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_appinit.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_appinit.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -37,7 +37,7 @@
 
 #include <nuttx/board.h>
 
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #ifdef CONFIG_BOARDCTL
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_autoleds.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_autoleds.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_autoleds.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_autoleds.c
index 7c1013985..a4b1814bd 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_autoleds.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_autoleds.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_autoleds.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -74,7 +74,7 @@
 
 #include "imxrt_gpio.h"
 #include "imxrt_iomuxc.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #include <arch/board/board.h>
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_boot.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_boot.c
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_boot.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_boot.c
index 93cb30b5b..cf8972cd6 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_boot.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_boot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_boot.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_boot.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -37,7 +37,7 @@
 #include <arch/board/board.h>
 
 #include "imxrt_start.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_bringup.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_bringup.c
index ac6b0b397..5c478f958 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_bringup.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_bringup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_bringup.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_bringup.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -55,7 +55,7 @@
 #include "imxrt_gt9xx.h"
 #endif
 
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #include <arch/board/board.h>  /* Must always be included last */
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_buttons.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_buttons.c
index 037deebec..18a593a83 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_buttons.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_buttons.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_buttons.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -45,7 +45,7 @@
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ch438.c
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ch438.c
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ch438.h
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ch438.h
index 65db16c35..6ba50105e 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ch438.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ch438.h
@@ -18,8 +18,8 @@
  * @date 2022.04.26
  */
 
-#ifndef __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_CH438_H
-#define __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_CH438_H
+#ifndef __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_CH438_H
+#define __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_CH438_H
 
 /****************************************************************************
  * Included Files
@@ -60,7 +60,7 @@
 #include "imxrt_config.h"
 #include "imxrt_irq.h"
 #include "imxrt_gpio.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 /******************************************************************************************/
 
@@ -365,5 +365,5 @@
 void board_ch438_initialize(void);
 #endif
 
-#endif /* __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_CH438_H */
+#endif /* __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_CH438_H */
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ethernet.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ethernet.c
similarity index 99%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ethernet.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ethernet.c
index 7ea1fedb6..5c7d4096a 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_ethernet.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_ethernet.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_ethernet.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_ethernet.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -54,7 +54,7 @@
 #include "imxrt_gpio.h"
 #include "imxrt_enet.h"
 
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #include <arch/board/board.h>
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.c
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.c
index f0791cd07..eb46883e5 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_flexspi_nor_boot.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_flexspi_nor_boot.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.h
similarity index 92%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.h
index f421cd24a..3a5e3dbcf 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_boot.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_boot.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_flexspi_nor_boot.h
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_flexspi_nor_boot.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,8 +27,8 @@
 * @date 2022-03-23
 */
 
-#ifndef __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_BOOT_H
-#define __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_BOOT_H
+#ifndef __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_BOOT_H
+#define __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_BOOT_H
 
 /****************************************************************************
  * Included Files
@@ -71,7 +71,7 @@
 #define FLASH_END                   0x7f7fffff
 #define SCLK 1
 
-#ifdef CONFIG_XIDATONG_SDRAM
+#ifdef CONFIG_XIDATONG_ARM32_SDRAM
 #  define DCD_ADDRESS               &g_dcd_data
 #else
 #  define DCD_ADDRESS               0
@@ -144,8 +144,8 @@ struct boot_data_s
 
 extern const struct boot_data_s g_boot_data;
 
-#ifdef CONFIG_XIDATONG_SDRAM
+#ifdef CONFIG_XIDATONG_ARM32_SDRAM
 extern const uint8_t g_dcd_data[];
 #endif
 
-#endif /* __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */
+#endif /* __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.c
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.c
index 0b24a7096..52ade4d09 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_flexspi_nor_flash.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_flexspi_nor_flash.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -37,7 +37,7 @@
  * Public Data
  ****************************************************************************/
 
-#if defined (CONFIG_XIDATONG_HYPER_FLASH)
+#if defined (CONFIG_XIDATONG_ARM32_HYPER_FLASH)
 locate_data(".boot_hdr.conf")
 const struct flexspi_nor_config_s g_flash_config =
 {
@@ -84,7 +84,7 @@ const struct flexspi_nor_config_s g_flash_config =
   .is_uniform_blocksize     = 1,
 };
 
-#elif defined (CONFIG_XIDATONG_QSPI_FLASH)
+#elif defined (CONFIG_XIDATONG_ARM32_QSPI_FLASH)
 locate_data(".boot_hdr.conf")
 const struct flexspi_nor_config_s g_flash_config =
 {
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.h
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.h
index 0f4d2e40a..ee94af96a 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_flexspi_nor_flash.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_flexspi_nor_flash.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_flexspi_nor_flash.h
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_flexspi_nor_flash.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,8 +27,8 @@
 * @date 2022-03-23
 */
 
-#ifndef __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_FLASH_H
-#define __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_FLASH_H
+#ifndef __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_FLASH_H
+#define __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_FLASH_H
 
 /****************************************************************************
  * Included Files
@@ -356,4 +356,4 @@ struct flexspi_nor_config_s
   uint32_t reserve2[11];                  /* Reserved for future use */
 };
 
-#endif /* __BOARDS_ARM_IMXRT_XIDATONG_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */
+#endif /* __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gpio.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gpio.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gpio.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gpio.c
index b3542796f..b7e801522 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gpio.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gpio.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_gpio.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_gpio.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -46,7 +46,7 @@
 #include "chip.h"
 
 #include <imxrt_gpio.h>
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #if defined(CONFIG_DEV_GPIO) && !defined(CONFIG_GPIO_LOWER_HALF)
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gt9xx.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gt9xx.c
similarity index 99%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gt9xx.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gt9xx.c
index 427f79a9c..fac40b358 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gt9xx.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gt9xx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_gt9xx.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_gt9xx.c
  *
  *   Copyright 2019 ElFaro LAB S.L. All rights reserved.
  *   Author: Fabio Balzano <fabio@elfarolab.com>
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gt9xx.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gt9xx.h
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gt9xx.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_gt9xx.h
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_lcd.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_lcd.c
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_lcd.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_lcd.c
index 1600548d3..c2fc34840 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_lcd.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_lcd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_lcd.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_lcd.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -39,7 +39,7 @@
 #include "imxrt_lcd.h"
 #include "imxrt_gpio.h"
 
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd.c
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd.c
index be2238c36..869fa25b9 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #ifdef CONFIG_IMXRT_USDHC
 
@@ -67,7 +67,7 @@ int nsh_sdmmc_initialize(void)
       return ret;
     }
 
-#ifdef CONFIG_XIDATONG_SDIO_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT
       imxrt_automount_initialize();
       imxrt_usdhc_set_sdio_card_isr(sdmmc, imxrt_sdhc_automount_event, NULL);
 #else
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_automount.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_automount.c
similarity index 96%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_automount.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_automount.c
index 84b8e539b..a21d53a74 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_automount.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_automount.c
@@ -35,7 +35,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/fs/automount.h>
 #include "hardware/imxrt_pinmux.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -94,11 +94,11 @@ static const struct imxrt_automount_config_s g_sdhc_config =
 {
   .lower        =
     {
-    .fstype     = CONFIG_XIDATONG_SDIO_AUTOMOUNT_FSTYPE,
-    .blockdev   = CONFIG_XIDATONG_SDIO_AUTOMOUNT_BLKDEV,
-    .mountpoint = CONFIG_XIDATONG_SDIO_AUTOMOUNT_MOUNTPOINT,
-    .ddelay     = MSEC2TICK(CONFIG_XIDATONG_SDIO_AUTOMOUNT_DDELAY),
-    .udelay     = MSEC2TICK(CONFIG_XIDATONG_SDIO_AUTOMOUNT_UDELAY),
+    .fstype     = CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT_FSTYPE,
+    .blockdev   = CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT_BLKDEV,
+    .mountpoint = CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT_MOUNTPOINT,
+    .ddelay     = MSEC2TICK(CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT_DDELAY),
+    .udelay     = MSEC2TICK(CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT_UDELAY),
     .attach     = imxrt_sdhc_attach,
     .enable     = imxrt_sdhc_enable,
     .inserted   = imxrt_sdhc_inserted
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_spi.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_spi.c
index 4f67e9bf6..63de0a743 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_mmcsd_spi.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_mmcsd_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_mmcsd_spi.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_mmcsd_spi.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_reset.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_reset.c
similarity index 100%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_reset.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_reset.c
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdram_ini_dcd.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_sdram_ini_dcd.c
similarity index 99%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdram_ini_dcd.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_sdram_ini_dcd.c
index abd738011..66343a81b 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_sdram_ini_dcd.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_sdram_ini_dcd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_sdram_ini_dcd.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_sdram_ini_dcd.c
  *
  *   Copyright (C) 2017, NXP Semiconductors, Inc.
  *
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_spi.c
similarity index 98%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_spi.c
index 356f607b0..8fec30c3f 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_spi.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_spi.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_spi.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -46,7 +46,7 @@
 #include "imxrt_config.h"
 #include "imxrt_lpspi.h"
 #include "imxrt_gpio.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #if defined(CONFIG_IMXRT_LPSPI1) || defined(CONFIG_IMXRT_LPSPI2) || \
     defined(CONFIG_IMXRT_LPSPI3) || defined(CONFIG_IMXRT_LPSPI4)
@@ -59,7 +59,7 @@
  * Name: imxrt_spidev_initialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the xidatong
+ *   Called to configure SPI chip select GPIO pins for the xidatong-arm32
  *    board.
  *
  ****************************************************************************/
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_usbhost.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_usbhost.c
similarity index 92%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_usbhost.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_usbhost.c
index fd584d3dc..85d9e82f0 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_usbhost.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_usbhost.c
@@ -48,7 +48,7 @@
 #include "hardware/imxrt_pinmux.h"
 #include "hardware/imxrt_usbotg.h"
 #include "imxrt_periphclks.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #include <arch/board/board.h>  /* Must always be included last */
 
@@ -78,10 +78,10 @@
 
 static struct usbhost_connection_s *g_ehciconn;
 
-#ifdef CONFIG_XIDATONG_USB_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT
 /* Unmount retry timer */
 
-static struct wdog_s g_umount_tmr[CONFIG_XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV];
+static struct wdog_s g_umount_tmr[CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV];
 #endif
 
 /****************************************************************************
@@ -127,7 +127,7 @@ static int ehci_waiter(int argc, char *argv[])
  * Public Functions
  ****************************************************************************/
 
-#ifdef CONFIG_XIDATONG_USB_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT
 /****************************************************************************
  * Name: usb_msc_connect
  *
@@ -146,7 +146,7 @@ static void usb_msc_connect(FAR void *arg)
   char mntpnt[32];
 
   DEBUGASSERT(index >= 0 &&
-              index < CONFIG_XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV);
+              index < CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV);
 
   wd_cancel(&g_umount_tmr[index]);
 
@@ -156,14 +156,14 @@ static void usb_msc_connect(FAR void *arg)
       sdchar, arg);
 
   snprintf(blkdev, sizeof(blkdev), "%s%c",
-      CONFIG_XIDATONG_USB_AUTOMOUNT_BLKDEV, sdchar);
+      CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_BLKDEV, sdchar);
   snprintf(mntpnt, sizeof(mntpnt), "%s%c",
-      CONFIG_XIDATONG_USB_AUTOMOUNT_MOUNTPOINT, sdchar);
+      CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_MOUNTPOINT, sdchar);
 
   /* Mount */
 
   ret = nx_mount((FAR const char *)blkdev, (FAR const char *)mntpnt,
-      CONFIG_XIDATONG_USB_AUTOMOUNT_FSTYPE, 0, NULL);
+      CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_FSTYPE, 0, NULL);
   if (ret < 0)
     {
       ferr("ERROR: Mount failed: %d\n", ret);
@@ -197,7 +197,7 @@ static void unmount_retry_timeout(wdparm_t arg)
 
   finfo("Timeout!\n");
   DEBUGASSERT(index >= 0 &&
-              index < CONFIG_XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV);
+              index < CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV);
 
   /* Resend the notification. */
 
@@ -221,7 +221,7 @@ static void usb_msc_disconnect(FAR void *arg)
   char mntpnt[32];
 
   DEBUGASSERT(index >= 0 &&
-              index < CONFIG_XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV);
+              index < CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV);
 
   wd_cancel(&g_umount_tmr[index]);
 
@@ -231,7 +231,7 @@ static void usb_msc_disconnect(FAR void *arg)
       sdchar, arg);
 
   snprintf(mntpnt, sizeof(mntpnt), "%s%c",
-      CONFIG_XIDATONG_USB_AUTOMOUNT_MOUNTPOINT, sdchar);
+      CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_MOUNTPOINT, sdchar);
 
   /* Unmount */
 
@@ -250,7 +250,7 @@ static void usb_msc_disconnect(FAR void *arg)
           /* Start a timer to retry the umount2 after a delay */
 
           ret = wd_start(&g_umount_tmr[index],
-                          MSEC2TICK(CONFIG_XIDATONG_USB_AUTOMOUNT_UDELAY),
+                          MSEC2TICK(CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_UDELAY),
                           unmount_retry_timeout, index);
           if (ret < 0)
             {
@@ -266,7 +266,7 @@ static void usb_msc_disconnect(FAR void *arg)
         }
     }
 }
-#endif /* CONFIG_XIDATONG_USB_AUTOMOUNT */
+#endif /* CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT */
 
 
 /****************************************************************************
@@ -284,7 +284,7 @@ int imxrt_usbhost_initialize(void)
 {
   pid_t pid;
   int ret;
-#ifdef CONFIG_XIDATONG_USB_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT
   int index;
 #endif
 
@@ -317,10 +317,10 @@ int imxrt_usbhost_initialize(void)
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB host Mass Storage Class */
 
-#ifdef CONFIG_XIDATONG_USB_AUTOMOUNT
+#ifdef CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT
   /* Initialize the notifier listener for automount */
 
-  for (index = 0; index < CONFIG_XIDATONG_USB_AUTOMOUNT_NUM_BLKDEV; index++)
+  for (index = 0; index < CONFIG_XIDATONG_ARM32_USB_AUTOMOUNT_NUM_BLKDEV; index++)
     {
       char sdchar = 'a' + index;
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_userleds.c b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_userleds.c
similarity index 97%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_userleds.c
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_userleds.c
index ad63377ad..d7eb5ef53 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_userleds.c
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/imxrt_userleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/imxrt_userleds.c
+ * boards/arm/imxrt/xidatong-arm32/src/imxrt_userleds.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -49,7 +49,7 @@
 
 #include "imxrt_gpio.h"
 #include "imxrt_iomuxc.h"
-#include "xidatong.h"
+#include "xidatong-arm32.h"
 
 #include <arch/board/board.h>
 
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/xidatong-arm32.h
similarity index 95%
rename from Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
rename to Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/xidatong-arm32.h
index 2807945b1..5c8464577 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong-arm32/src/xidatong-arm32.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/imxrt/xidatong/src/xidatong.h
+ * boards/arm/imxrt/xidatong-arm32/src/xidatong-arm32.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,7 +19,7 @@
  ****************************************************************************/
 
 /**
-* @file xidatong.h
+* @file xidatong-arm32.h
 * @brief nuttx source code
 *                https://github.com/apache/incubator-nuttx.git
 * @version 10.3.0 
@@ -27,8 +27,8 @@
 * @date 2022-03-23
 */
 
-#ifndef __BOARDS_ARM_IMXRT_XIDATONG_SRC_XIDATONG_H
-#define __BOARDS_ARM_IMXRT_XIDATONG_SRC_XIDATONG_H
+#ifndef __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_XIDATONG_ARM32_H
+#define __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_XIDATONG_ARM32_H
 
 /****************************************************************************
  * Included Files
@@ -210,10 +210,10 @@ int nsh_sdmmc_initialize(void);
 #  define nsh_sdmmc_initialize() (OK)
 #endif
 
-#if defined(CONFIG_IMXRT_USDHC) && defined(CONFIG_XIDATONG_SDIO_AUTOMOUNT)
+#if defined(CONFIG_IMXRT_USDHC) && defined(CONFIG_XIDATONG_ARM32_SDIO_AUTOMOUNT)
 int imxrt_sdhc_automount_event(void *arg);
 void imxrt_automount_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_IMXRT_XIDATONG_SRC_XIDATONG_H */
+#endif /* __BOARDS_ARM_IMXRT_XIDATONG_ARM32_SRC_XIDATONG_ARM32_H */
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/build.sh b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/build.sh
index 0ca9c4181..d85487f97 100755
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/build.sh
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/build.sh
@@ -18,6 +18,6 @@ cp -rf $current/apps $nuttx
 cp -rf $nuttx/aiit_board/aiit-arm32-board  $nuttx/nuttx/boards/arm/stm32
 cp -rf $nuttx/aiit_board/aiit-riscv64-board $nuttx/nuttx/boards/risc-v/k210
 cp -rf $nuttx/aiit_board/xidatong-riscv64 $nuttx/nuttx/boards/risc-v/k210
-cp -rf $nuttx/aiit_board/xidatong $nuttx/nuttx/boards/arm/imxrt
+cp -rf $nuttx/aiit_board/xidatong-arm32 $nuttx/nuttx/boards/arm/imxrt
 
 cd ../nuttx
diff --git a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/Kconfig b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/Kconfig
index 6cf7454a7..6c27803a6 100644
--- a/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/Kconfig
+++ b/Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/nuttx/boards/Kconfig
@@ -456,15 +456,15 @@ config ARCH_BOARD_IMXRT1050_EVK
 		This is the board configuration for the port of NuttX to the NXP i.MXRT
 		evaluation kit, MIMXRT1050-EVKB.  This board features the MIMXRT1052DVL6A MCU.
 
-config ARCH_BOARD_XIDATONG
-	bool "NXP i.MX RT 1052 XIDATONG"
+config ARCH_BOARD_XIDATONG_ARM32
+	bool "NXP i.MX RT 1052 XIDATONG_ARM32"
 	depends on ARCH_CHIP_MIMXRT1052CVL5B
 	select ARCH_HAVE_LEDS
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
 		This is the board configuration for the port of NuttX to the NXP i.MXRT
-		evaluation kit, MIMXRT1052-XIDATONG.  This board features the MIMXRT1052CVL5B MCU.
+		evaluation kit, MIMXRT1052-XIDATONG_ARM32.  This board features the MIMXRT1052CVL5B MCU.
 
 config ARCH_BOARD_IMXRT1060_EVK
 	bool "NXP i.MX RT 1060 EVK"
@@ -2472,7 +2472,7 @@ config ARCH_BOARD
 	default "hymini-stm32v"            if ARCH_BOARD_HYMINI_STM32V
 	default "imxrt1020-evk"            if ARCH_BOARD_IMXRT1020_EVK
 	default "imxrt1050-evk"            if ARCH_BOARD_IMXRT1050_EVK
-	default "xidatong"                 if ARCH_BOARD_XIDATONG
+	default "xidatong-arm32"                 if ARCH_BOARD_XIDATONG_ARM32
 	default "imxrt1060-evk"            if ARCH_BOARD_IMXRT1060_EVK
 	default "imxrt1064-evk"            if ARCH_BOARD_IMXRT1064_EVK
 	default "kwikstik-k40"             if ARCH_BOARD_KWIKSTIK_K40
@@ -2759,8 +2759,8 @@ endif
 if ARCH_BOARD_IMXRT1050_EVK
 source "boards/arm/imxrt/imxrt1050-evk/Kconfig"
 endif
-if ARCH_BOARD_XIDATONG
-source "boards/arm/imxrt/xidatong/Kconfig"
+if ARCH_BOARD_XIDATONG_ARM32
+source "boards/arm/imxrt/xidatong-arm32/Kconfig"
 endif
 if ARCH_BOARD_IMXRT1060_EVK
 source "boards/arm/imxrt/imxrt1060-evk/Kconfig"