[PATCH 4/4] bootm: print Kernel commandline in verbose mode

Sascha Hauer s.hauer at pengutronix.de
Thu May 30 06:44:54 EDT 2013


Without devicetree support we print the Kernel commandline in
verbose mode. Do the same with devicetree boot aswell.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/lib/bootm.c |  2 ++
 common/oftree.c      | 15 +++++++++++++++
 include/of.h         |  1 +
 3 files changed, 18 insertions(+)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 133e04d..ee27e34 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -91,6 +91,8 @@ static int __do_bootm_linux(struct image_data *data, int swap)
 			of_add_reserve_entry(initrd_start, initrd_end);
 		data->oftree = of_get_fixed_tree(data->of_root_node);
 		fdt_add_reserve_map(data->oftree);
+		if (bootm_verbose(data))
+			of_print_cmdline(data->of_root_node);
 		if (bootm_verbose(data) > 1)
 			of_print_nodes(data->of_root_node, 0);
 	}
diff --git a/common/oftree.c b/common/oftree.c
index 19fed6b..475d418 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -98,6 +98,21 @@ void of_print_property(const void *data, int len)
 	}
 }
 
+void of_print_cmdline(struct device_node *root)
+{
+	struct device_node *node = of_find_node_by_path(root, "/chosen");
+	const char *cmdline;
+
+	if (!node) {
+		printf("commandline: no /chosen node\n");
+		return;
+	}
+
+	cmdline = of_get_property(node, "bootargs", NULL);
+
+	printf("commandline: %s\n", cmdline);
+}
+
 static int of_fixup_bootargs(struct device_node *root)
 {
 	struct device_node *node;
diff --git a/include/of.h b/include/of.h
index 4dcf37e..7bc3cf4 100644
--- a/include/of.h
+++ b/include/of.h
@@ -138,6 +138,7 @@ int of_get_named_gpio(struct device_node *np,
 
 struct device_node *of_find_node_by_phandle(phandle phandle);
 void of_print_property(const void *data, int len);
+void of_print_cmdline(struct device_node *root);
 
 int of_device_is_compatible(const struct device_node *device,
 		const char *compat);
-- 
1.8.2.rc2




More information about the barebox mailing list