mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] commands: oftree: kill oftree -f
@ 2018-06-11  6:41 Sascha Hauer
  2018-06-11 18:35 ` Alexander Kurz
  0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2018-06-11  6:41 UTC (permalink / raw)
  To: Barebox List

Being able to free the live device tree seemed like a good idea in the
early days of device tree support when the first boards were brought up.
It turned out to be illusory that noone stores pointers to the live tree
which become invalid when oftree -f is executed. Enough people stumbled
upon crashed boards with this option, so remove it finally.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/oftree.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/commands/oftree.c b/commands/oftree.c
index 8a47c0be58..26a47bb581 100644
--- a/commands/oftree.c
+++ b/commands/oftree.c
@@ -48,7 +48,6 @@ static int do_oftree(int argc, char *argv[])
 	int probe = 0;
 	char *load = NULL;
 	char *save = NULL;
-	int free_of = 0;
 	int ret;
 	struct device_node *root;
 
@@ -65,25 +64,12 @@ static int do_oftree(int argc, char *argv[])
 				return COMMAND_ERROR_USAGE;
 			}
 			break;
-		case 'f':
-			free_of = 1;
-			break;
 		case 's':
 			save = optarg;
 			break;
 		}
 	}
 
-	if (free_of) {
-		struct device_node *root = of_get_root_node();
-
-		if (root)
-			of_delete_node(root);
-
-		if (!load)
-			return 0;
-	}
-
 	if (!probe && !load && !save)
 		return COMMAND_ERROR_USAGE;
 
@@ -140,13 +126,12 @@ BAREBOX_CMD_HELP_TEXT("Options:")
 BAREBOX_CMD_HELP_OPT ("-l <DTB>",  "Load <DTB> to internal devicetree\n")
 BAREBOX_CMD_HELP_OPT ("-s <DTB>",  "save internal devicetree to <DTB>\n")
 BAREBOX_CMD_HELP_OPT ("-p",  "probe devices from stored device tree")
-BAREBOX_CMD_HELP_OPT ("-f",  "free stored device tree")
 BAREBOX_CMD_HELP_END
 
 BAREBOX_CMD_START(oftree)
 	.cmd		= do_oftree,
 	BAREBOX_CMD_DESC("handle device trees")
-	BAREBOX_CMD_OPTS("[-lspf]")
+	BAREBOX_CMD_OPTS("[-lsp]")
 	BAREBOX_CMD_GROUP(CMD_GRP_MISC)
 	BAREBOX_CMD_HELP(cmd_oftree_help)
 BAREBOX_CMD_END
-- 
2.17.1


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

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

end of thread, other threads:[~2018-06-11 20:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-11  6:41 [PATCH] commands: oftree: kill oftree -f Sascha Hauer
2018-06-11 18:35 ` Alexander Kurz
2018-06-11 20:44   ` Sascha Hauer

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