Merge branch 'master' of https://github.com/tnaegeli/Firmware into task_spawn

This commit is contained in:
Lorenz Meier
2012-10-01 17:29:36 +02:00
4 changed files with 33 additions and 23 deletions
+2 -2
View File
@@ -236,8 +236,8 @@ CONFIG_AT24XX_MTD_BLOCKSIZE=256
CONFIG_SERIAL_TERMIOS=y
CONFIG_SERIAL_CONSOLE_REINIT=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
CONFIG_USART1_SERIAL_CONSOLE=n
CONFIG_USART2_SERIAL_CONSOLE=y
CONFIG_USART3_SERIAL_CONSOLE=n
CONFIG_UART4_SERIAL_CONSOLE=n
CONFIG_UART5_SERIAL_CONSOLE=n