From 4551d98a0bbcbd28e934e09f57470286094cd2b3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 9 Sep 2015 12:13:22 -0600 Subject: [PATCH] SAMA5D2-XULT: Does not have USART0-4; Fix some compile issues --- configs/sama5d2-xult/include/board.h | 1 + configs/sama5d2-xult/nsh/defconfig | 74 ++++++++++++++-------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/configs/sama5d2-xult/include/board.h b/configs/sama5d2-xult/include/board.h index 882d06bddc..d270e1bc12 100644 --- a/configs/sama5d2-xult/include/board.h +++ b/configs/sama5d2-xult/include/board.h @@ -41,6 +41,7 @@ ************************************************************************************/ #include +#include #include /************************************************************************************ diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig index 5c89a45816..bfcc304628 100644 --- a/configs/sama5d2-xult/nsh/defconfig +++ b/configs/sama5d2-xult/nsh/defconfig @@ -145,7 +145,14 @@ CONFIG_SAMA5_HAVE_AESB=y CONFIG_SAMA5_HAVE_ICM=y CONFIG_SAMA5_HAVE_UART0=y CONFIG_SAMA5_HAVE_UART1=y -CONFIG_SAMA5_HAVE_USART4=y +CONFIG_SAMA5_HAVE_UART2=y +CONFIG_SAMA5_HAVE_UART3=y +CONFIG_SAMA5_HAVE_UART4=y +# CONFIG_SAMA5_HAVE_USART0 is not set +# CONFIG_SAMA5_HAVE_USART1 is not set +# CONFIG_SAMA5_HAVE_USART2 is not set +# CONFIG_SAMA5_HAVE_USART3 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set CONFIG_SAMA5_HAVE_CAN0=y CONFIG_SAMA5_HAVE_CAN1=y # CONFIG_SAMA5_HAVE_DMA is not set @@ -202,13 +209,11 @@ CONFIG_SAMA5_RTC=y # CONFIG_SAMA5_HSMC is not set # CONFIG_SAMA5_SMD is not set # CONFIG_SAMA5_SAIC is not set -# CONFIG_SAMA5_UART0 is not set -# CONFIG_SAMA5_UART1 is not set -# CONFIG_SAMA5_USART0 is not set -# CONFIG_SAMA5_USART1 is not set -# CONFIG_SAMA5_USART2 is not set -CONFIG_SAMA5_USART3=y -CONFIG_SAMA5_USART4=y +CONFIG_SAMA5_UART0=y +CONFIG_SAMA5_UART1=y +# CONFIG_SAMA5_UART2 is not set +# CONFIG_SAMA5_UART3 is not set +# CONFIG_SAMA5_UART4 is not set # CONFIG_SAMA5_TWI0 is not set # CONFIG_SAMA5_TWI1 is not set # CONFIG_SAMA5_TWI2 is not set @@ -520,8 +525,8 @@ CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set # CONFIG_ARCH_HAVE_UART is not set -# CONFIG_ARCH_HAVE_UART0 is not set -# CONFIG_ARCH_HAVE_UART1 is not set +CONFIG_ARCH_HAVE_UART0=y +CONFIG_ARCH_HAVE_UART1=y # CONFIG_ARCH_HAVE_UART2 is not set # CONFIG_ARCH_HAVE_UART3 is not set # CONFIG_ARCH_HAVE_UART4 is not set @@ -534,8 +539,8 @@ CONFIG_SERIAL=y # CONFIG_ARCH_HAVE_USART0 is not set # CONFIG_ARCH_HAVE_USART1 is not set # CONFIG_ARCH_HAVE_USART2 is not set -CONFIG_ARCH_HAVE_USART3=y -CONFIG_ARCH_HAVE_USART4=y +# CONFIG_ARCH_HAVE_USART3 is not set +# CONFIG_ARCH_HAVE_USART4 is not set # CONFIG_ARCH_HAVE_USART5 is not set # CONFIG_ARCH_HAVE_USART6 is not set # CONFIG_ARCH_HAVE_USART7 is not set @@ -545,42 +550,40 @@ CONFIG_ARCH_HAVE_USART4=y # # USART Configuration # -CONFIG_USART3_ISUART=y -CONFIG_USART4_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_SERIAL_NPOLLWAITERS=2 # CONFIG_SERIAL_IFLOWCONTROL is not set # CONFIG_SERIAL_OFLOWCONTROL is not set CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y -CONFIG_USART3_SERIAL_CONSOLE=y -# CONFIG_USART4_SERIAL_CONSOLE is not set +CONFIG_UART0_SERIAL_CONSOLE=y +# CONFIG_UART1_SERIAL_CONSOLE is not set # CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set # -# USART3 Configuration +# UART0 Configuration # -CONFIG_USART3_RXBUFSIZE=256 -CONFIG_USART3_TXBUFSIZE=256 -CONFIG_USART3_BAUD=115200 -CONFIG_USART3_BITS=8 -CONFIG_USART3_PARITY=0 -CONFIG_USART3_2STOP=0 -# CONFIG_USART3_IFLOWCONTROL is not set -# CONFIG_USART3_OFLOWCONTROL is not set +CONFIG_UART0_RXBUFSIZE=256 +CONFIG_UART0_TXBUFSIZE=256 +CONFIG_UART0_BAUD=115200 +CONFIG_UART0_BITS=8 +CONFIG_UART0_PARITY=0 +CONFIG_UART0_2STOP=0 +# CONFIG_UART0_IFLOWCONTROL is not set +# CONFIG_UART0_OFLOWCONTROL is not set # -# USART4 Configuration +# UART1 Configuration # -CONFIG_USART4_RXBUFSIZE=256 -CONFIG_USART4_TXBUFSIZE=256 -CONFIG_USART4_BAUD=115200 -CONFIG_USART4_BITS=8 -CONFIG_USART4_PARITY=0 -CONFIG_USART4_2STOP=0 -# CONFIG_USART4_IFLOWCONTROL is not set -# CONFIG_USART4_OFLOWCONTROL is not set +CONFIG_UART1_RXBUFSIZE=256 +CONFIG_UART1_TXBUFSIZE=256 +CONFIG_UART1_BAUD=115200 +CONFIG_UART1_BITS=8 +CONFIG_UART1_PARITY=0 +CONFIG_UART1_2STOP=0 +# CONFIG_UART1_IFLOWCONTROL is not set +# CONFIG_UART1_OFLOWCONTROL is not set # CONFIG_USBDEV is not set CONFIG_USBHOST=y CONFIG_USBHOST_NPREALLOC=4 @@ -676,9 +679,6 @@ CONFIG_SYSLOG=y # Graphics Support # # CONFIG_NX is not set -# CONFIG_NX_XYINPUT_NONE is not set -# CONFIG_NX_XYINPUT_MOUSE is not set -# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set # # Memory Management