[U-Boot] [PATCH 1/2] nios2-generic: Fix logic around choosing UART

[U-Boot] [PATCH 1/2] nios2-generic: Fix logic around choosing UART

[Alex Hornung]

 * 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.

Signed-off-by: Alex Hornung <alex@alexhornung.com>
---
 include/configs/nios2-generic.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 9ba35e8..765b169 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)
+# 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
 
-- 
1.7.3.4

[U-Boot] [PATCH 1/2] nios2-generic: Fix logic around choosing UART

[Alex Hornung]

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.
> 
> Signed-off-by: Alex Hornung <alex@alexhornung.com>
> ---
>  include/configs/nios2-generic.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
> index 9ba35e8..765b169 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)
> +# 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
>  


I'm sorry, I just messed this one up submitting a previous version that
wasn't ready.

Below is a new one:

[U-Boot] [PATCH 1/2] nios2-generic: Fix logic around choosing UART

[Thomas Chou]

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