[PATCH 1/2] ratp: Abort console_countdown when activated

[PATCH 1/2] ratp: Abort console_countdown when activated

[Jules Maselbas]

Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
 common/ratp/ratp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/ratp/ratp.c b/common/ratp/ratp.c
index e84ad2216..d06a7ca96 100644
--- a/common/ratp/ratp.c
+++ b/common/ratp/ratp.c
@@ -30,6 +30,7 @@
 #include <linux/sizes.h>
 #include <ratp_bb.h>
 #include <fs.h>
+#include <console_countdown.h>
 
 LIST_HEAD(ratp_command_list);
 EXPORT_SYMBOL(ratp_command_list);
@@ -458,6 +459,8 @@ int barebox_ratp(struct console_device *cdev)
 	if (ret)
 		goto out1;
 
+	console_countdown_abort();
+
 	console_set_active(&ctx->ratp_console, CONSOLE_STDOUT | CONSOLE_STDERR |
 			CONSOLE_STDIN);
 
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ratp: Remove duplicated includes

[Jules Maselbas]

Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
 common/ratp/ratp.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/ratp/ratp.c b/common/ratp/ratp.c
index d06a7ca96..1f9271c99 100644
--- a/common/ratp/ratp.c
+++ b/common/ratp/ratp.c
@@ -18,11 +18,9 @@
 
 #include <common.h>
 #include <command.h>
-#include <kfifo.h>
 #include <malloc.h>
 #include <init.h>
 #include <ratp.h>
-#include <command.h>
 #include <byteorder.h>
 #include <environment.h>
 #include <kfifo.h>
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] ratp: Abort console_countdown when activated

[Sascha Hauer]

On Tue, Jul 21, 2020 at 10:34:00AM +0200, Jules Maselbas wrote:
> Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
> ---
>  common/ratp/ratp.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/common/ratp/ratp.c b/common/ratp/ratp.c
> index e84ad2216..d06a7ca96 100644
> --- a/common/ratp/ratp.c
> +++ b/common/ratp/ratp.c
> @@ -30,6 +30,7 @@
>  #include <linux/sizes.h>
>  #include <ratp_bb.h>
>  #include <fs.h>
> +#include <console_countdown.h>
>  
>  LIST_HEAD(ratp_command_list);
>  EXPORT_SYMBOL(ratp_command_list);
> @@ -458,6 +459,8 @@ int barebox_ratp(struct console_device *cdev)
>  	if (ret)
>  		goto out1;
>  
> +	console_countdown_abort();
> +
>  	console_set_active(&ctx->ratp_console, CONSOLE_STDOUT | CONSOLE_STDERR |
>  			CONSOLE_STDIN);
>  
> -- 
> 2.17.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox