From c2b37a0d558b169a8b2379e64329f19a4a5ee37f Mon Sep 17 00:00:00 2001 From: Francois Retief Date: Fri, 30 Oct 2015 13:23:41 +0200 Subject: [PATCH] sparc: leon3: Updated serial driver to use CONFIG_CONS_INDEX Updated the LEON3 serial driver to make use of the CONFIG_CONS_INDEX option to select which serial port the console will use. Signed-off-by: Francois Retief --- arch/sparc/cpu/leon3/serial.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/sparc/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c index 5348a78303..bc6e7a172e 100644 --- a/arch/sparc/cpu/leon3/serial.c +++ b/arch/sparc/cpu/leon3/serial.c @@ -17,8 +17,13 @@ DECLARE_GLOBAL_DATA_PTR; /* Select which UART that will become u-boot console */ #ifndef CONFIG_SYS_GRLIB_APBUART_INDEX +/* Try to use CONFIG_CONS_INDEX, if available, it is numbered from 1 */ +#ifdef CONFIG_CONS_INDEX +#define CONFIG_SYS_GRLIB_APBUART_INDEX (CONFIG_CONS_INDEX - 1) +#else #define CONFIG_SYS_GRLIB_APBUART_INDEX 0 #endif +#endif static unsigned apbuart_calc_scaler(unsigned apbuart_freq, unsigned baud) { -- 2.39.5