From 3e00c48ef05bfe1a16f57dd0610ed2fa78774d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 20 Jan 2018 13:07:09 +0100 Subject: [PATCH 1/2] tools/mrvl_uart.sh: Fix minicom baudrate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit minicom doesn't inherit the baudrate from stty but uses its own defaults, such as for example 57600, whereas we expect 115200 here. Explicitly tell minicom which baudrate to use. Fixes: eee4835d22 ("tools: Add Marvell recovery image download script") Cc: Konstantin Porotchkin Cc: Stefan Roese Cc: Igal Liberman Signed-off-by: Andreas Färber Reviewed-by: Konstantin Porotchkin Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- tools/mrvl_uart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mrvl_uart.sh b/tools/mrvl_uart.sh index 6b04d7ae2c..500fa117eb 100755 --- a/tools/mrvl_uart.sh +++ b/tools/mrvl_uart.sh @@ -115,5 +115,5 @@ sx -vv $file > $port < $port stty -F $port raw ignbrk time 5 $default_baudrate # Optional - fire up Minicom -minicom -D $port +minicom -D $port -b $default_baudrate From ceb328180353f103bb7a3bc75770ed03e9a8fef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 20 Jan 2018 13:18:39 +0100 Subject: [PATCH 2/2] tools/mrvl_uart.sh: Tidy script output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a typo in help output (awailable -> available). Tidy the grammar - not the board connects to a port, we do. While at it, be consistent in upper-casing the comments. Fixes: eee4835d22 ("tools: Add Marvell recovery image download script") Cc: Konstantin Porotchkin Cc: Stefan Roese Cc: Igal Liberman Signed-off-by: Andreas Färber Reviewed-by: Konstantin Porotchkin Reviewed-by: Stefan Roese Signed-off-by: Stefan Roese --- tools/mrvl_uart.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/mrvl_uart.sh b/tools/mrvl_uart.sh index 500fa117eb..6824208902 100755 --- a/tools/mrvl_uart.sh +++ b/tools/mrvl_uart.sh @@ -46,13 +46,13 @@ then echo -e "\nMarvell recovery image downloader for Armada SoC family." echo -e "Command syntax:" echo -e "\t$(basename $0) [2|4|8]" - echo -e "\tport - serial port the target board connected to" + echo -e "\tport - serial port the target board is connected to" echo -e "\tfile - recovery boot image for target download" echo -e "\t2|4|8 - times to increase the default serial port speed by" echo -e "For example - load the image over ttyUSB0 @ 460800 baud:" echo -e "$(basename $0) /dev/ttyUSB0 /tmp/flash-image.bin 4\n" echo -e "=====WARNING=====" - echo -e "- The speed-up option is not awailable in SoC families prior to A8K+" + echo -e "- The speed-up option is not available in SoC families prior to A8K+" echo -e "- This utility is not compatible with Armada 37xx SoC family\n" fi @@ -111,7 +111,7 @@ stty -F $port raw ignbrk time 5 $fast_baudrate sx -vv $file > $port < $port #sx-at91 $port $file -# return the port to the default speed +# Return the port to the default speed stty -F $port raw ignbrk time 5 $default_baudrate # Optional - fire up Minicom