If --dtb is called together with --command-line, we need to modify the
binary dtb buffer. Luckily, we have libfdt functions available, so this
is straight forward.
Signed-off-by: Daniel Mack <zonque at gmail.com>
---
kexec/arch/arm/kexec-zImage-arm.c | 48 +++++++++++++++++++++++++++++++++++----
1 file changed, 43 insertions(+), 5 deletions(-)
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
index 46cedbf..0950897 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -359,6 +359,49 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
*/
if (dtb_file) {
dtb_buf = slurp_file(dtb_file, &dtb_length);
+
+ if (fdt_check_header(dtb_buf) != 0) {
+ fprintf(stderr, "Invalid FDT buffer.\n");
+ return -1;
+ }
+
+ if (command_line) {
+ const char *node_name = "/chosen";
+ const char *prop_name = "bootargs";
+ int off;
+
+ /* check if a /choosen subnode already exists */
+ off = fdt_path_offset(dtb_buf, node_name);
+
+ if (off == -FDT_ERR_NOTFOUND) {
+ dtb_length = fdt_totalsize(dtb_buf)
+ + strlen(node_name) + 1
+ + sizeof(struct fdt_node_header)
+ + FDT_TAGSIZE;
+ dtb_buf = xrealloc(dtb_buf, dtb_length);
+ fdt_set_totalsize(dtb_buf, dtb_length);
+ off = fdt_add_subnode(dtb_buf, off, node_name);
+ }
+
+ if (off < 0) {
+ fprintf(stderr, "FDT: Error adding %s node.\n", node_name);
+ return -1;
+ }
+
+ dtb_length = fdt_totalsize(dtb_buf)
+ + strlen(prop_name)
+ + strlen(command_line) + 1
+ + sizeof(struct fdt_property);
+ dtb_buf = xrealloc(dtb_buf, dtb_length);
+ fdt_set_totalsize(dtb_buf, dtb_length);
+
+ if (fdt_setprop(dtb_buf, off, prop_name,
+ command_line, strlen(command_line) + 1) != 0) {
+ fprintf(stderr, "FDT: Error setting %s/%s property.\n",
+ node_name, prop_name);
+ return -1;
+ }
+ }
} else {
/*
* Extract the DTB from /proc/device-tree.
@@ -366,11 +409,6 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
create_flatten_tree(&dtb_buf, &dtb_length, command_line);
}
- if (fdt_check_header(dtb_buf) != 0) {
- fprintf(stderr, "Invalid FDT buffer.\n");
- return -1;
- }
-
if (base + atag_offset + dtb_length > base + offset) {
fprintf(stderr, "DTB too large!\n");
return -1;
--
1.7.11.7