From 7273c1fb86610f8af34e08e77aefabffaf1fd02a Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 14 Aug 2011 15:53:19 +0000 Subject: [PATCH] Add basic Kinetis serial support git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3878 42af7a65-404d-4744-a932-0658087f49c3 --- configs/kwikstik-k40/README.txt | 9 ++++----- configs/kwikstik-k40/include/board.h | 2 +- configs/kwikstik-k40/ostest/defconfig | 13 +++---------- configs/twr-k60n512/include/board.h | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/configs/kwikstik-k40/README.txt b/configs/kwikstik-k40/README.txt index 08a6ac018b..e8f3865f7b 100644 --- a/configs/kwikstik-k40/README.txt +++ b/configs/kwikstik-k40/README.txt @@ -300,16 +300,15 @@ KwikStik-K40-specific Configuration Options Kinetis K40 specific device driver settings - 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_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the + console and ttys0 (default is the UART0). CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received. This specific the size of the receive buffer CONFIG_UARTn_TXBUFSIZE - Characters are buffered before being sent. This specific the size of the transmit buffer - 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_BAUD - The configure BAUD of the UART. + CONFIG_UARTn_BITS - The number of bits. Must be either 8 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 ee50834545..97fd786ac6 100755 --- a/configs/kwikstik-k40/include/board.h +++ b/configs/kwikstik-k40/include/board.h @@ -70,7 +70,7 @@ #define BOARD_PLLIN_FREQ (BOARD_EXTAL_FREQ / BOARD_PRDIV) #define BOARD_PLLOUT_FREQ (BOARD_EXTAL_FREQ * BOARD_VDIV) -#define BOARD_MCG_FREQ BOARD_PLL_FREQ +#define BOARD_MCG_FREQ BOARD_PLLOUT_FREQ /* SIM CLKDIV1 dividers */ diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig index 1569289fff..651404aa89 100755 --- a/configs/kwikstik-k40/ostest/defconfig +++ b/configs/kwikstik-k40/ostest/defconfig @@ -142,15 +142,14 @@ CONFIG_KINETIS_ADC3=n # K40X256VLQ100 specific serial device driver settings # # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the -# console and ttys0 (default is the UART1). +# console and ttys0 (default is the UART0). # CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received. # This specific the size of the receive buffer # CONFIG_UARTn_TXBUFSIZE - Characters are buffered before # being sent. This specific the size of the transmit buffer -# 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_BAUD - The configure BAUD of the UART. +# CONFIG_UARTn_BITS - The number of bits. Must be either 8 or 9. # CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity -# CONFIG_UARTn_2STOP - Two stop bits # CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART2_SERIAL_CONSOLE=n @@ -188,12 +187,6 @@ CONFIG_UART3_PARITY=0 CONFIG_UART4_PARITY=0 CONFIG_UART5_PARITY=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 d41dab6d02..efe16bb949 100755 --- a/configs/twr-k60n512/include/board.h +++ b/configs/twr-k60n512/include/board.h @@ -71,7 +71,7 @@ #define BOARD_PLLIN_FREQ (BOARD_EXTAL_FREQ / BOARD_PRDIV) #define BOARD_PLLOUT_FREQ (BOARD_EXTAL_FREQ * BOARD_VDIV) -#define BOARD_MCG_FREQ BOARD_PLL_FREQ +#define BOARD_MCG_FREQ BOARD_PLLOUT_FREQ /* SIM CLKDIV1 dividers */