Add initial dtb support

Updates & fixes by Jeremy Kerr <jk@ozlabs.org>.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

6 files changed, 19 insertions, 6 deletions

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index ae5d5cd..c3f3f38 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -249,6 +249,7 @@ static void create_boot_command(struct boot_command *command,
 	command->option_id = boot_option->id;
 	command->boot_image_file = data->image;
 	command->initrd_file = data->initrd;
+	command->dtb_file = data->dtb;
 	command->boot_args = data->args;
 }
 
diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 83bb9c9..ed1f504 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -9,6 +9,7 @@ struct discover_client;
 struct pb_boot_data {
 	char *image;
 	char *initrd;
+	char *dtb;
 	char *args;
 };
 
diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index fb0bee8..4579b1a 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -185,6 +185,9 @@ static struct pb_boot_data *boot_editor_prepare_data(
 	bd->initrd = *s ? talloc_strdup(bd, s) : NULL;
 
 	s = boot_editor_chomp(field_buffer(boot_editor->fields[2], 0));
+	bd->dtb = *s ? talloc_strdup(bd, s) : NULL;
+
+	s = boot_editor_chomp(field_buffer(boot_editor->fields[3], 0));
 	bd->args = *s ? talloc_strdup(bd, s) : NULL;
 
 	return bd;
@@ -315,6 +318,7 @@ struct boot_editor *boot_editor_init(void *ui_ctx,
 
 	pb_log("%s: image:  '%s'\n", __func__, bd->image);
 	pb_log("%s: initrd: '%s'\n", __func__, bd->initrd);
+	pb_log("%s: dtb:    '%s'\n", __func__, bd->dtb);
 	pb_log("%s: args:   '%s'\n", __func__, bd->args);
 
 	assert(on_exit);
@@ -337,15 +341,17 @@ struct boot_editor *boot_editor_init(void *ui_ctx,
 
 	boot_editor->on_exit = on_exit;
 
-	boot_editor->fields = talloc_array(boot_editor, FIELD *, 7);
+	boot_editor->fields = talloc_array(boot_editor, FIELD *, 9);
 
 	boot_editor->fields[0] = boot_editor_setup_field(0, 9, bd->image);
 	boot_editor->fields[1] = boot_editor_setup_field(1, 9, bd->initrd);
-	boot_editor->fields[2] = boot_editor_setup_field(2, 9, bd->args);
-	boot_editor->fields[3] = boot_editor_setup_label(0, 1, "image:");
-	boot_editor->fields[4] = boot_editor_setup_label(1, 1, "initrd:");
-	boot_editor->fields[5] = boot_editor_setup_label(2, 1, "args:");
-	boot_editor->fields[6] = NULL;
+	boot_editor->fields[2] = boot_editor_setup_field(2, 9, bd->dtb);
+	boot_editor->fields[3] = boot_editor_setup_field(3, 9, bd->args);
+	boot_editor->fields[4] = boot_editor_setup_label(0, 1, "image:");
+	boot_editor->fields[5] = boot_editor_setup_label(1, 1, "initrd:");
+	boot_editor->fields[6] = boot_editor_setup_label(2, 1, "dtb:");
+	boot_editor->fields[7] = boot_editor_setup_label(3, 1, "args:");
+	boot_editor->fields[8] = NULL;
 
 	boot_editor->ncf = new_form(boot_editor->fields);
 
diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 82e534d..1acc2f0 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -158,6 +158,7 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_e
 		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
 		pb_log(" image  '%s'\n", cod->bd->image);
 		pb_log(" initrd '%s'\n", cod->bd->initrd);
+		pb_log(" dtb    '%s'\n", cod->bd->dtb);
 		pb_log(" args   '%s'\n", cod->bd->args);
 	}
 
@@ -375,6 +376,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
 
 	cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
 	cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+	cod->bd->dtb = talloc_strdup(cod->bd, opt->dtb_file);
 	cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
 
 	pmenu_item_setup(cui->main, i, insert_pt, cod->name);
diff --git a/ui/test/discover-test.c b/ui/test/discover-test.c
index b81d367..45a4c74 100644
--- a/ui/test/discover-test.c
+++ b/ui/test/discover-test.c
@@ -22,6 +22,7 @@ static int print_device_add(struct device *device,
 		printf("\t\ticon: %s\n", opt->icon_file);
 		printf("\t\tboot: %s\n", opt->boot_image_file);
 		printf("\t\tinit: %s\n", opt->initrd_file);
+		printf("\t\tdtb:  %s\n", opt->dtb_file);
 		printf("\t\targs: %s\n", opt->boot_args);
 	}
 
diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 09d8e99..445c865 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -147,6 +147,8 @@ static int pbt_boot_option_add(struct device *dev, struct boot_option *opt,
 		opt->boot_image_file);
 	opt_data->bd->initrd = talloc_strdup(opt_data->bd,
 		opt->initrd_file);
+	opt_data->bd->dtb = talloc_strdup(opt_data->bd,
+		opt->dtb_file);
 	opt_data->bd->args = talloc_strdup(opt_data->bd,
 		opt->boot_args);
 	opt_data->opt = opt;