diff mbox

[U-Boot,2/2] ARM: versatile: pass console setting to the kernel

Message ID 1385544829-22601-1-git-send-email-linus.walleij@linaro.org
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Linus Walleij Nov. 27, 2013, 9:33 a.m. UTC
The Versatiles come up with the primary UART set to ttyAMA0 at
38400 baud, and unless we pass this to the kernel it will assume
it is set to 9600 baud which will be quite awkward for the
terminal, let's try to be helpful and inform the kernel what
setting is used.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 include/configs/versatile.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Marek Vasut Nov. 27, 2013, 10:03 a.m. UTC | #1
Dear Linus Walleij,

> The Versatiles come up with the primary UART set to ttyAMA0 at
> 38400 baud, and unless we pass this to the kernel it will assume
> it is set to 9600 baud which will be quite awkward for the
> terminal, let's try to be helpful and inform the kernel what
> setting is used.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  include/configs/versatile.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/versatile.h b/include/configs/versatile.h
> index 10738ac24be0..29c32fee5178 100644
> --- a/include/configs/versatile.h
> +++ b/include/configs/versatile.h
> @@ -101,7 +101,8 @@
> 
>  #define CONFIG_BOOTDELAY	2
>  #define CONFIG_BOOTARGS		"root=/dev/nfs mem=128M ip=dhcp "\
> -				"netdev=25,0,0xf1010000,0xf1010010,eth0"
> +				"netdev=25,0,0xf1010000,0xf1010010,eth0 "\
> +				"console=ttyAMA0,38400n1"

We're currently trying to migrate away from having the environment built into 
the bootloader altogether. On the other hand, I understand this is a bona-fide 
fix. I would let this one slide.

Best regards,
Marek Vasut
Linus Walleij Nov. 27, 2013, 12:43 p.m. UTC | #2
On Wed, Nov 27, 2013 at 11:03 AM, Marek Vasut <marex@denx.de> wrote:

> [Me]
>>  #define CONFIG_BOOTDELAY     2
>>  #define CONFIG_BOOTARGS              "root=/dev/nfs mem=128M ip=dhcp "\
>> -                             "netdev=25,0,0xf1010000,0xf1010010,eth0"
>> +                             "netdev=25,0,0xf1010000,0xf1010010,eth0 "\
>> +                             "console=ttyAMA0,38400n1"
>
> We're currently trying to migrate away from having the environment built into
> the bootloader altogether. On the other hand, I understand this is a bona-fide
> fix. I would let this one slide.

I think the only reason why this has not been fixed before is that
people have only tested the Versatile with QEMU, and that "emulation"
will likely (my best guess) just display characters on the virtual
terminal even if the baudrate it completely bananas, so noone really
noticed the situation before.

This has the upside of making the default versatile out-of-the-box U-Boot
work also on real hardware ...

Yours,
Linus Walleij
Albert ARIBAUD Jan. 13, 2014, 8:45 a.m. UTC | #3
Hi Linus,

On Wed, 27 Nov 2013 10:33:49 +0100, Linus Walleij
<linus.walleij@linaro.org> wrote:

> The Versatiles come up with the primary UART set to ttyAMA0 at
> 38400 baud, and unless we pass this to the kernel it will assume
> it is set to 9600 baud which will be quite awkward for the
> terminal, let's try to be helpful and inform the kernel what
> setting is used.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  include/configs/versatile.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/versatile.h b/include/configs/versatile.h
> index 10738ac24be0..29c32fee5178 100644
> --- a/include/configs/versatile.h
> +++ b/include/configs/versatile.h
> @@ -101,7 +101,8 @@
>  
>  #define CONFIG_BOOTDELAY	2
>  #define CONFIG_BOOTARGS		"root=/dev/nfs mem=128M ip=dhcp "\
> -				"netdev=25,0,0xf1010000,0xf1010010,eth0"
> +				"netdev=25,0,0xf1010000,0xf1010010,eth0 "\
> +				"console=ttyAMA0,38400n1"
>  
>  /*
>   * Static configuration when assigning fixed address

Applied to u-boot-arm/next, thanks!

Amicalement,
diff mbox

Patch

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 10738ac24be0..29c32fee5178 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -101,7 +101,8 @@ 
 
 #define CONFIG_BOOTDELAY	2
 #define CONFIG_BOOTARGS		"root=/dev/nfs mem=128M ip=dhcp "\
-				"netdev=25,0,0xf1010000,0xf1010010,eth0"
+				"netdev=25,0,0xf1010000,0xf1010010,eth0 "\
+				"console=ttyAMA0,38400n1"
 
 /*
  * Static configuration when assigning fixed address