change xidatong to xidatong-arm32 on nuttx 10.3.0

This commit is contained in:
wgzAIIT 2022-06-22 16:35:39 +08:00
parent cac43f78bf
commit 1d1d394125
65 changed files with 146 additions and 146 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

@ -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 */

View File

@ -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

View File

@ -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

View File

@ -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
```

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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 */

View File

@ -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

View File

@ -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 */

View File

@ -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>

View File

@ -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

View File

@ -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 */

View File

@ -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 =
{

View File

@ -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 */

View File

@ -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)

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.
*

View File

@ -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.
*
****************************************************************************/

View File

@ -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;

View File

@ -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>

View File

@ -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 */

View File

@ -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

View File

@ -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"