mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] oftree command: Allow free stored dtb before load
@ 2013-12-19  8:39 Jan Weitzel
  2014-01-06  9:25 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Weitzel @ 2013-12-19  8:39 UTC (permalink / raw)
  To: barebox

Don't return after freeing stored devicetree if also loading ist wanted.
Allow  "oftree -f -l my.dtb"

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
 commands/oftree.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/commands/oftree.c b/commands/oftree.c
index 475f019..3fa516c 100644
--- a/commands/oftree.c
+++ b/commands/oftree.c
@@ -88,7 +88,8 @@ static int do_oftree(int argc, char *argv[])
 		if (root)
 			of_delete_node(root);
 
-		return 0;
+		if (!load)
+			return 0;
 	}
 
 	if (optind < argc)
-- 
1.7.0.4


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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] oftree command: Allow free stored dtb before load
  2013-12-19  8:39 [PATCH] oftree command: Allow free stored dtb before load Jan Weitzel
@ 2014-01-06  9:25 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2014-01-06  9:25 UTC (permalink / raw)
  To: Jan Weitzel; +Cc: barebox

On Thu, Dec 19, 2013 at 09:39:28AM +0100, Jan Weitzel wrote:
> Don't return after freeing stored devicetree if also loading ist wanted.
> Allow  "oftree -f -l my.dtb"
> 
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>

Applied, thanks

Sascha


> ---
>  commands/oftree.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/commands/oftree.c b/commands/oftree.c
> index 475f019..3fa516c 100644
> --- a/commands/oftree.c
> +++ b/commands/oftree.c
> @@ -88,7 +88,8 @@ static int do_oftree(int argc, char *argv[])
>  		if (root)
>  			of_delete_node(root);
>  
> -		return 0;
> +		if (!load)
> +			return 0;
>  	}
>  
>  	if (optind < argc)
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-06  9:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-19  8:39 [PATCH] oftree command: Allow free stored dtb before load Jan Weitzel
2014-01-06  9:25 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox