diff --git a/configs/kwikstik-k40/README.txt b/configs/kwikstik-k40/README.txt index 9b479905d7..08a6ac018b 100644 --- a/configs/kwikstik-k40/README.txt +++ b/configs/kwikstik-k40/README.txt @@ -300,16 +300,16 @@ KwikStik-K40-specific Configuration Options Kinetis K40 specific device driver settings - CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART - m (m=4,5) for the console and ttys0 (default is the USART1). - CONFIG_U[S]ARTn_RXBUFSIZE - Characters are buffered as received. + CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=1,2,3) or UART + m (m=4,5) for the console and ttys0 (default is the UART1). + CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received. This specific the size of the receive buffer - CONFIG_U[S]ARTn_TXBUFSIZE - Characters are buffered before + CONFIG_UARTn_TXBUFSIZE - Characters are buffered before being sent. This specific the size of the transmit buffer - CONFIG_U[S]ARTn_BAUD - The configure BAUD of the UART. Must be - CONFIG_U[S]ARTn_BITS - The number of bits. Must be either 7 or 8. - CONFIG_U[S]ARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity - CONFIG_U[S]ARTn_2STOP - Two stop bits + CONFIG_UARTn_BAUD - The configure BAUD of the UART. Must be + CONFIG_UARTn_BITS - The number of bits. Must be either 7 or 8. + CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity + CONFIG_UARTn_2STOP - Two stop bits CONFIG_KINETIS_SPI_INTERRUPTS - Select to enable interrupt driven SPI support. Non-interrupt-driven, poll-waiting is recommended if the diff --git a/configs/kwikstik-k40/include/board.h b/configs/kwikstik-k40/include/board.h index 85f2afeb54..ee50834545 100755 --- a/configs/kwikstik-k40/include/board.h +++ b/configs/kwikstik-k40/include/board.h @@ -98,6 +98,23 @@ /* Button definitions ***************************************************************/ +/* Alternative pin resolution *******************************************************/ +/* If there are alternative configurations for various pins in the + * kinetis_k40pinmux.h header file, those alternative pins will be labeled with a + * suffix like _1, _2, etc. The logic in this file must select the correct pin + * configuration for the board by defining a pin configuration (with no suffix) that + * maps to the correct alternative. + */ +#warning "Revisit: This only only here to get a clean compiliation" +#define GPIO_UART0_RX GPIO_UART0_RX_1 +#define GPIO_UART0_TX GPIO_UART0_TX_1 +#define GPIO_UART1_RX GPIO_UART1_RX_1 +#define GPIO_UART1_TX GPIO_UART1_TX_1 +#define GPIO_UART3_RX GPIO_UART3_RX_1 +#define GPIO_UART3_TX GPIO_UART3_TX_1 +#define GPIO_UART4_RX GPIO_UART4_RX_1 +#define GPIO_UART4_TX GPIO_UART4_TX_1 + /************************************************************************************ * Public Data ************************************************************************************/ diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig index 6e31c1f95f..1569289fff 100755 --- a/configs/kwikstik-k40/ostest/defconfig +++ b/configs/kwikstik-k40/ostest/defconfig @@ -118,8 +118,8 @@ CONFIG_KINETIS_TIM7=n CONFIG_KINETIS_WWDG=n CONFIG_KINETIS_SPI2=n CONFIG_KINETIS_SPI4=n -CONFIG_KINETIS_USART2=y -CONFIG_KINETIS_USART3=n +CONFIG_KINETIS_UART2=y +CONFIG_KINETIS_UART3=n CONFIG_KINETIS_UART4=n CONFIG_KINETIS_UART5=n CONFIG_KINETIS_I2C1=n @@ -135,64 +135,64 @@ CONFIG_KINETIS_ADC2=n CONFIG_KINETIS_TIM1=n CONFIG_KINETIS_SPI1=n CONFIG_KINETIS_TIM8=n -CONFIG_KINETIS_USART1=y +CONFIG_KINETIS_UART1=y CONFIG_KINETIS_ADC3=n # # K40X256VLQ100 specific serial device driver settings # -# CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the -# console and ttys0 (default is the USART1). -# CONFIG_USARTn_RXBUFSIZE - Characters are buffered as received. +# CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the +# console and ttys0 (default is the UART1). +# CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received. # This specific the size of the receive buffer -# CONFIG_USARTn_TXBUFSIZE - Characters are buffered before +# CONFIG_UARTn_TXBUFSIZE - Characters are buffered before # being sent. This specific the size of the transmit buffer -# CONFIG_USARTn_BAUD - The configure BAUD of the UART. Must be -# CONFIG_USARTn_BITS - The number of bits. Must be either 7 or 8. -# CONFIG_USARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity -# CONFIG_USARTn_2STOP - Two stop bits +# CONFIG_UARTn_BAUD - The configure BAUD of the UART. Must be +# CONFIG_UARTn_BITS - The number of bits. Must be either 7 or 8. +# CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity +# CONFIG_UARTn_2STOP - Two stop bits # -CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USART2_SERIAL_CONSOLE=n -CONFIG_USART3_SERIAL_CONSOLE=n -CONFIG_USART4_SERIAL_CONSOLE=n -CONFIG_USART5_SERIAL_CONSOLE=n +CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART2_SERIAL_CONSOLE=n +CONFIG_UART3_SERIAL_CONSOLE=n +CONFIG_UART4_SERIAL_CONSOLE=n +CONFIG_UART5_SERIAL_CONSOLE=n -CONFIG_USART1_TXBUFSIZE=256 -CONFIG_USART2_TXBUFSIZE=256 -CONFIG_USART3_TXBUFSIZE=256 -CONFIG_USART4_TXBUFSIZE=256 -CONFIG_USART5_TXBUFSIZE=256 +CONFIG_UART1_TXBUFSIZE=256 +CONFIG_UART2_TXBUFSIZE=256 +CONFIG_UART3_TXBUFSIZE=256 +CONFIG_UART4_TXBUFSIZE=256 +CONFIG_UART5_TXBUFSIZE=256 -CONFIG_USART1_RXBUFSIZE=256 -CONFIG_USART2_RXBUFSIZE=256 -CONFIG_USART3_RXBUFSIZE=256 -CONFIG_USART4_RXBUFSIZE=256 -CONFIG_USART5_RXBUFSIZE=256 +CONFIG_UART1_RXBUFSIZE=256 +CONFIG_UART2_RXBUFSIZE=256 +CONFIG_UART3_RXBUFSIZE=256 +CONFIG_UART4_RXBUFSIZE=256 +CONFIG_UART5_RXBUFSIZE=256 -CONFIG_USART1_BAUD=115200 -CONFIG_USART2_BAUD=115200 -CONFIG_USART3_BAUD=115200 -CONFIG_USART4_BAUD=115200 -CONFIG_USART5_BAUD=115200 +CONFIG_UART1_BAUD=115200 +CONFIG_UART2_BAUD=115200 +CONFIG_UART3_BAUD=115200 +CONFIG_UART4_BAUD=115200 +CONFIG_UART5_BAUD=115200 -CONFIG_USART1_BITS=8 -CONFIG_USART2_BITS=8 -CONFIG_USART3_BITS=8 -CONFIG_USART4_BITS=8 -CONFIG_USART5_BITS=8 +CONFIG_UART1_BITS=8 +CONFIG_UART2_BITS=8 +CONFIG_UART3_BITS=8 +CONFIG_UART4_BITS=8 +CONFIG_UART5_BITS=8 -CONFIG_USART1_PARITY=0 -CONFIG_USART2_PARITY=0 -CONFIG_USART3_PARITY=0 -CONFIG_USART4_PARITY=0 -CONFIG_USART5_PARITY=0 +CONFIG_UART1_PARITY=0 +CONFIG_UART2_PARITY=0 +CONFIG_UART3_PARITY=0 +CONFIG_UART4_PARITY=0 +CONFIG_UART5_PARITY=0 -CONFIG_USART1_2STOP=0 -CONFIG_USART2_2STOP=0 -CONFIG_USART3_2STOP=0 -CONFIG_USART4_2STOP=0 -CONFIG_USART5_2STOP=0 +CONFIG_UART1_2STOP=0 +CONFIG_UART2_2STOP=0 +CONFIG_UART3_2STOP=0 +CONFIG_UART4_2STOP=0 +CONFIG_UART5_2STOP=0 # # K40X256VLQ100 specific SSI device driver settings diff --git a/configs/twr-k60n512/include/board.h b/configs/twr-k60n512/include/board.h index 3cad12ac40..d41dab6d02 100755 --- a/configs/twr-k60n512/include/board.h +++ b/configs/twr-k60n512/include/board.h @@ -99,6 +99,25 @@ /* Button definitions ***************************************************************/ +/* Alternative pin resolution *******************************************************/ +/* If there are alternative configurations for various pins in the + * kinetis_k60pinmux.h header file, those alternative pins will be labeled with a + * suffix like _1, _2, etc. The logic in this file must select the correct pin + * configuration for the board by defining a pin configuration (with no suffix) that + * maps to the correct alternative. + */ +#warning "Revisit: This only only here to get a clean compiliation" +#define GPIO_UART0_RX GPIO_UART0_RX_1 +#define GPIO_UART0_TX GPIO_UART0_TX_1 +#define GPIO_UART1_RX GPIO_UART1_RX_1 +#define GPIO_UART1_TX GPIO_UART1_TX_1 +#define GPIO_UART3_RX GPIO_UART3_RX_1 +#define GPIO_UART3_TX GPIO_UART3_TX_1 +#define GPIO_UART4_RX GPIO_UART4_RX_1 +#define GPIO_UART4_TX GPIO_UART4_TX_1 +#define GPIO_UART5_RX GPIO_UART5_RX_1 +#define GPIO_UART5_TX GPIO_UART5_TX_1 + /************************************************************************************ * Public Data ************************************************************************************/