Message ID | 4F41FA1E.3000701@alexhornung.com |
---|---|
State | Rejected |
Headers | show |
On 02/20/2012 03:45 PM, Alex Hornung wrote: > On 20/02/12 07:33, Alex Hornung wrote: >> * Before, the normal altera UART driver was compiled in unconditionally >> and the JTAG UART was missed out. >> >> * Work around this by conditionalizing the driver to use based on the >> UART choice in the user's custom FPGA header file. If both were to be >> present, the JTAG UART would have preference. Dear Alex, The preference of jtag uart is not always true. Some people prefer normal uart as it doesn't require the nios2-termial program. As it could be switched easily with a #define CONFIG_ALTERA_JTAG_UART per board config file, this patch is not accepted. Thank you anyway. Best regards, Thomas
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 9ba35e8..6f4d166 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -36,10 +36,11 @@ /* * SERIAL */ -#define CONFIG_ALTERA_UART -#if defined(CONFIG_ALTERA_JTAG_UART) +#if defined(CONFIG_SYS_JTAG_UART_BASE) +# define CONFIG_ALTERA_JTAG_UART # define CONFIG_SYS_NIOS_CONSOLE CONFIG_SYS_JTAG_UART_BASE #else +# define CONFIG_ALTERA_UART # define CONFIG_SYS_NIOS_CONSOLE CONFIG_SYS_UART_BASE #endif