From 3ec7cd186a813624facf9ca72bddf19311875bd4 Mon Sep 17 00:00:00 2001 From: Michal Lenc Date: Sun, 13 Dec 2020 20:58:20 +0100 Subject: [PATCH] boards/arm/imxrt/teensy-4.x: CDC-ACM console support Signed-off-by: Michal Lenc --- boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig | 6 +++++- boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig | 6 +++++- boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig | 6 +++++- boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig | 6 +++++- boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig | 6 +++++- boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c | 6 ++++++ 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig index 10c100bb56c..664e35e1252 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig @@ -24,12 +24,14 @@ CONFIG_BUILTIN=y CONFIG_CAN=y CONFIG_CANUTILS_CANDUMP=y CONFIG_CANUTILS_CANSEND=y +CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_FLEXCAN3=y CONFIG_IMXRT_LPUART1=y +CONFIG_IMXRT_USBDEV=y CONFIG_INTELHEX_BINARY=y -CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_NET=y CONFIG_NETDEVICES=y @@ -47,6 +49,7 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_USBCONSOLE=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_HPWORK=y @@ -55,4 +58,5 @@ CONFIG_START_DAY=14 CONFIG_START_MONTH=3 CONFIG_SYSTEM_NSH=y CONFIG_TEENSY_41=y +CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig index 15099ff1881..5adbaff7687 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig @@ -19,14 +19,16 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=104926 CONFIG_BUILTIN=y +CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_ETH0_PHY_DP83825I=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_ENET=y CONFIG_IMXRT_LPUART1=y +CONFIG_IMXRT_USBDEV=y CONFIG_INTELHEX_BINARY=y CONFIG_LIB_HOSTNAME="Teensy 4.x" -CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y @@ -55,6 +57,7 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_USBCONSOLE=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_READLINE_CMD_HISTORY=y @@ -66,4 +69,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_TEENSY_41=y +CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig index 3cbfca3a7a1..2d0060e7c9b 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig @@ -18,11 +18,13 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=104926 CONFIG_BUILTIN=y +CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_LPUART6=y +CONFIG_IMXRT_USBDEV=y CONFIG_INTELHEX_BINARY=y -CONFIG_LPUART6_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NSH_ARCHINIT=y @@ -31,9 +33,11 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_USBCONSOLE=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_START_DAY=14 CONFIG_START_MONTH=3 CONFIG_SYSTEM_NSH=y +CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig index e8382126e17..0159f1543d7 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig @@ -18,11 +18,13 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=104926 CONFIG_BUILTIN=y +CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_LPUART1=y +CONFIG_IMXRT_USBDEV=y CONFIG_INTELHEX_BINARY=y -CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NSH_ARCHINIT=y @@ -31,10 +33,12 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_USBCONSOLE=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_START_DAY=14 CONFIG_START_MONTH=3 CONFIG_SYSTEM_NSH=y CONFIG_TEENSY_41=y +CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig index 955c6e30ca2..6666da973ee 100644 --- a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig +++ b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig @@ -20,17 +20,19 @@ CONFIG_ARMV7M_ICACHE=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=104926 CONFIG_BUILTIN=y +CONFIG_CDCACM=y +CONFIG_CDCACM_CONSOLE=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_IMXRT_LPUART1=y +CONFIG_IMXRT_USBDEV=y CONFIG_IMXRT_USDHC1=y CONFIG_IMXRT_USDHC1_INVERT_CD=y CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y CONFIG_INTELHEX_BINARY=y -CONFIG_LPUART1_SERIAL_CONSOLE=y CONFIG_MAX_TASKS=16 CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y @@ -42,6 +44,7 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_USBCONSOLE=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_HPWORK=y @@ -53,4 +56,5 @@ CONFIG_START_DAY=14 CONFIG_START_MONTH=3 CONFIG_SYSTEM_NSH=y CONFIG_TEENSY_41=y +CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c index 6cbaa05053d..5819e628bb8 100644 --- a/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c +++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_bringup.c @@ -134,6 +134,12 @@ int imxrt_bringup(void) } #endif +#if !defined(CONFIG_BOARDCTL_USBDEVCTRL) && !defined(CONFIG_USBDEV_COMPOSITE) +# ifdef CONFIG_CDCACM + cdcacm_initialize(0, NULL); +# endif +#endif + #if defined(CONFIG_I2C_DRIVER) imxrt_i2c_setup(); #endif