diff --git a/configs/sama5d2-xult/README.txt b/configs/sama5d2-xult/README.txt index a34d570a8d0..c16599ac2e2 100644 --- a/configs/sama5d2-xult/README.txt +++ b/configs/sama5d2-xult/README.txt @@ -581,11 +581,11 @@ Buttons and LEDs ------- A single button, PB_USER1 (PB6), is available on the SAMA5D2-XULT - ------------------------------ ------------------- ------------------------- - SAMA5D2 PIO SIGNAL USAGE - ------------------------------ ------------------- ------------------------- - PB6 USER_PB_PB6 PB_USER push button - ------------------------------ ------------------- ------------------------- + ------------------------------ ------------------- ------------------------- + SAMA5D2 PIO SIGNAL USAGE + ------------------------------ ------------------- ------------------------- + PB6 USER_PB_PB6 PB_USER push button + ------------------------------ ------------------- ------------------------- Closing PB_USER will bring PB6 to ground so 1) PB6 should have a weak pull-up, and 2) when PB_USER is pressed, a low value will be senses. @@ -617,13 +617,13 @@ Buttons and LEDs the SDHC_CD pin (PA13) and so will not be used. The LEDs are provided VDD_LED and so bringing the LED low will will illuminated the LED. - ------------------------------ ------------------- ------------------------- - SAMA5D2 PIO SIGNAL USAGE - ------------------------------ ------------------- ------------------------- - PA13 SDHC_CD_PA13 Red LED - PB5 LED_GREEN_PB5 Green LED - PB0 LED_BLUE_PB0 Blue LED - ------------------------------ ------------------- ------------------------- + ------------------------------ ------------------- ------------------------- + SAMA5D2 PIO SIGNAL USAGE + ------------------------------ ------------------- ------------------------- + PA13 SDHC_CD_PA13 Red LED + PB5 LED_GREEN_PB5 Green LED + PB0 LED_BLUE_PB0 Blue LED + ------------------------------ ------------------- ------------------------- When CONFIG_ARCH_LEDS is defined in the NuttX configuration, NuttX will control the Green LED (only)as follows: diff --git a/configs/sama5d2-xult/include/board.h b/configs/sama5d2-xult/include/board.h index a54a28782c7..463df9e046e 100644 --- a/configs/sama5d2-xult/include/board.h +++ b/configs/sama5d2-xult/include/board.h @@ -108,13 +108,13 @@ * the SDHC_CD pin (PA13) and so will not be used. The LEDs are provided VDD_LED * and so bringing the LED low will will illuminated the LED. * - * ------------------------------ ------------------- ------------------------- - * SAMA5D2 PIO SIGNAL USAGE - * ------------------------------ ------------------- ------------------------- - * PA13 SDHC_CD_PA13 Red LED - * PB5 LED_GREEN_PB5 Green LED - * PB0 LED_BLUE_PB0 Blue LED - * ------------------------------ ------------------- ------------------------- + * ------------------------------ ------------------- ------------------------- + * SAMA5D2 PIO SIGNAL USAGE + * ------------------------------ ------------------- ------------------------- + * PA13 SDHC_CD_PA13 Red LED + * PB5 LED_GREEN_PB5 Green LED + * PB0 LED_BLUE_PB0 Blue LED + * ------------------------------ ------------------- ------------------------- */ #ifndef CONFIG_ARCH_LEDS diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig index bfcc3046284..8f51ec55872 100644 --- a/configs/sama5d2-xult/nsh/defconfig +++ b/configs/sama5d2-xult/nsh/defconfig @@ -143,6 +143,7 @@ CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y # CONFIG_SAMA5_HAVE_AESB=y CONFIG_SAMA5_HAVE_ICM=y +CONFIG_SAMA5_HAVE_RXLP=y CONFIG_SAMA5_HAVE_UART0=y CONFIG_SAMA5_HAVE_UART1=y CONFIG_SAMA5_HAVE_UART2=y @@ -153,6 +154,11 @@ CONFIG_SAMA5_HAVE_UART4=y # CONFIG_SAMA5_HAVE_USART2 is not set # CONFIG_SAMA5_HAVE_USART3 is not set # CONFIG_SAMA5_HAVE_USART4 is not set +CONFIG_SAMA5_HAVE_FLEXCOM0=y +CONFIG_SAMA5_HAVE_FLEXCOM1=y +CONFIG_SAMA5_HAVE_FLEXCOM2=y +CONFIG_SAMA5_HAVE_FLEXCOM3=y +# CONFIG_SAMA5_HAVE_FLEXCOM4 is not set CONFIG_SAMA5_HAVE_CAN0=y CONFIG_SAMA5_HAVE_CAN1=y # CONFIG_SAMA5_HAVE_DMA is not set @@ -175,6 +181,10 @@ CONFIG_SAMA5_HAVE_TC1=y CONFIG_SAMA5_HAVE_TRUSTZONE=y # CONFIG_SAMA5_HAVE_TWI3 is not set # CONFIG_SAMA5_HAVE_VDEC is not set +# CONFIG_SAMA5_FLEXCOM is not set +# CONFIG_SAMA5_FLEXCOM_USART is not set +# CONFIG_SAMA5_FLEXCOM_SPI is not set +# CONFIG_SAMA5_FLEXCOM_TWI is not set CONFIG_ARCH_CHIP_SAMA5D2=y # CONFIG_ARCH_CHIP_SAMA5D3 is not set # CONFIG_ARCH_CHIP_SAMA5D4 is not set @@ -209,11 +219,16 @@ CONFIG_SAMA5_RTC=y # CONFIG_SAMA5_HSMC is not set # CONFIG_SAMA5_SMD is not set # CONFIG_SAMA5_SAIC is not set +CONFIG_SAMA5_RXLP=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_FLEXCOM0 is not set +# CONFIG_SAMA5_FLEXCOM1 is not set +# CONFIG_SAMA5_FLEXCOM2 is not set +# CONFIG_SAMA5_FLEXCOM3 is not set # CONFIG_SAMA5_TWI0 is not set # CONFIG_SAMA5_TWI1 is not set # CONFIG_SAMA5_TWI2 is not set @@ -655,7 +670,7 @@ CONFIG_FAT_MAXFNAME=32 # CONFIG_FS_FATTIME is not set # CONFIG_FAT_DMAMEMORY is not set # CONFIG_FS_NXFFS is not set -CONFIG_FS_ROMFS=y +# CONFIG_FS_ROMFS is not set # CONFIG_FS_SMARTFS is not set # CONFIG_FS_BINFS is not set CONFIG_FS_PROCFS=y @@ -824,7 +839,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_MODBUS is not set # CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_NRF24L01TERM is not set -# CONFIG_EXAMPLES_NSH is not set +CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y # CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NXTERM is not set @@ -840,7 +856,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_QENCODER is not set # CONFIG_EXAMPLES_RANDOM is not set # CONFIG_EXAMPLES_RGMP is not set -# CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SERIALBLASTER is not set # CONFIG_EXAMPLES_SERIALRX is not set @@ -850,11 +865,9 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_SMART is not set # CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TELNETD is not set -# CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set # CONFIG_EXAMPLES_TOUCHSCREEN is not set # CONFIG_EXAMPLES_WEBSERVER is not set -# CONFIG_EXAMPLES_UNIONFS is not set # CONFIG_EXAMPLES_USBSERIAL is not set # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set @@ -968,19 +981,6 @@ CONFIG_NSH_FILEIOSIZE=512 # CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLE_ITEF is not set # CONFIG_NSH_DISABLE_LOOPS is not set -CONFIG_NSH_ROMFSETC=y -# CONFIG_NSH_ROMFSRC is not set -CONFIG_NSH_ROMFSMOUNTPT="/etc" -CONFIG_NSH_INITSCRIPT="init.d/rcS" -CONFIG_NSH_ROMFSDEVNO=0 -CONFIG_NSH_ROMFSSECTSIZE=64 -# CONFIG_NSH_DEFAULTROMFS is not set -CONFIG_NSH_ARCHROMFS=y -# CONFIG_NSH_CUSTOMROMFS is not set -CONFIG_NSH_FATDEVNO=1 -CONFIG_NSH_FATSECTSIZE=512 -CONFIG_NSH_FATNSECTORS=1024 -CONFIG_NSH_FATMOUNTPT="/tmp" # # Console Configuration diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c index 7bd16b8a6db..011508f68df 100644 --- a/configs/sama5d2-xult/src/sam_autoleds.c +++ b/configs/sama5d2-xult/src/sam_autoleds.c @@ -37,13 +37,13 @@ * provided VDD_LED and so bringing the LED low will will illuminated the * LED. * - * ------------------------------ ------------------- ----------------------- - * SAMA5D2 PIO SIGNAL USAGE - * ------------------------------ ------------------- ----------------------- - * PA13 SDHC_CD_PA13 Red LED - * PB5 LED_GREEN_PB5 Green LED - * PB0 LED_BLUE_PB0 Blue LED - * ------------------------------ ------------------- ----------------------- + * ------------------------------ ------------------- --------------------- + * SAMA5D2 PIO SIGNAL USAGE + * ------------------------------ ------------------- --------------------- + * PA13 SDHC_CD_PA13 Red LED + * PB5 LED_GREEN_PB5 Green LED + * PB0 LED_BLUE_PB0 Blue LED + * ------------------------------ ------------------- --------------------- * * These LEDs are not used by the board port unless CONFIG_ARCH_LEDS is * defined. In that case, the usage by the board port is defined in diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c index 0c907d43d2e..55866063f24 100644 --- a/configs/sama5d2-xult/src/sam_userleds.c +++ b/configs/sama5d2-xult/src/sam_userleds.c @@ -37,14 +37,13 @@ * provided VDD_LED and so bringing the LED low will will illuminated the * LED. * - * ------------------------------ ------------------- ----------------------- - * SAMA5D2 PIO SIGNAL USAGE - * ------------------------------ ------------------- ----------------------- - * PA13 SDHC_CD_PA13 Red LED - * PB5 LED_GREEN_PB5 Green LED - * PB0 LED_BLUE_PB0 Blue LED - * ------------------------------ ------------------- ----------------------- - * + * ------------------------------ ------------------- --------------------- + * SAMA5D2 PIO SIGNAL USAGE + * ------------------------------ ------------------- --------------------- + * PA13 SDHC_CD_PA13 Red LED + * PB5 LED_GREEN_PB5 Green LED + * PB0 LED_BLUE_PB0 Blue LED + * ------------------------------ ------------------- --------------------- */ /**************************************************************************** diff --git a/configs/sama5d2-xult/src/sama5d2-xult.h b/configs/sama5d2-xult/src/sama5d2-xult.h index 0f2fb20e405..1260d183b4d 100644 --- a/configs/sama5d2-xult/src/sama5d2-xult.h +++ b/configs/sama5d2-xult/src/sama5d2-xult.h @@ -54,32 +54,26 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ -/* Configuration ************************************************************/ +/* Configuration ********************************************************************/ /* LEDs *****************************************************************************/ -/* There are 3 LEDs on the SAMA5D4-EK: +/* There is an RGB LED on board the SAMA5D2-XULT. The RED component is driven by + * the SDHC_CD pin (PA13) and so will not be used. The LEDs are provided VDD_LED + * and so bringing the LED low will illuminated the LED. * - * ------------------------------ ------------------- ------------------------- - * SAMA5D4 PIO SIGNAL USAGE - * ------------------------------ ------------------- ------------------------- - * PE28/NWAIT/RTS4/A19 1Wire_PE28 1-WIRE ROM, LCD, D8 (green) - * PE8/A8/TCLK3/PWML3 LED_USER_PE8 LED_USER (D10) - * PE9/A9/TIOA2 LED_POWER_PE9 LED_POWER (D9, Red) - * ------------------------------ ------------------- ------------------------- - * - * - D8: D8 is shared with other functions and cannot be used if the 1-Wire ROM - * is used. I am not sure of the LCD function, but the LED may not be available - * if the LCD is used either. We will avoid using D8 just for simplicity. - * - D10: Nothing special here. A low output illuminates. - * - D9: The Power ON LED. Connects to the via an IRLML2502 MOSFET. This LED will - * be on when power is applied but otherwise; a low output value will turn it - * off. + * ------------------------------ ------------------- ------------------------- + * SAMA5D2 PIO SIGNAL USAGE + * ------------------------------ ------------------- ------------------------- + * PA13 SDHC_CD_PA13 Red LED + * PB5 LED_GREEN_PB5 Green LED + * PB0 LED_BLUE_PB0 Blue LED + * ------------------------------ ------------------- ------------------------- */ -#define PIO_LED_GREEN (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_SET | \ - PIO_PORT_PIOE | PIO_PIN8) -#define PIO_LED_BLUE (PIO_OUTPUT | PIO_CFG_PULLUP | PIO_OUTPUT_CLEAR | \ - PIO_PORT_PIOE | PIO_PIN9) +#define PIO_LED_GREEN (PIO_OUTPUT | PIO_CFG_DEFAULT | PIO_OUTPUT_SET | \ + PIO_PORT_PIOB | PIO_PIN5) +#define PIO_LED_BLUE (PIO_OUTPUT | PIO_CFG_DEFAULT | PIO_OUTPUT_SET | \ + PIO_PORT_PIOB | PIO_PIN0) /* Buttons **************************************************************************/ /* A single button, PB_USER (PB6), is available on the SAMA5D2-XULT