Currently, we can't boot user-created boot options, as they have no
option ID associated. This change removes the check for option ID.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
const struct boot_option *boot_option,
const struct pb_boot_data *data)
{
const struct boot_option *boot_option,
const struct pb_boot_data *data)
{
-
- command->option_id = boot_option->id;
+ command->option_id = boot_option ? boot_option->id : NULL;
command->boot_image_file = data->image;
command->initrd_file = data->initrd;
command->dtb_file = data->dtb;
command->boot_image_file = data->image;
command->initrd_file = data->initrd;
command->dtb_file = data->dtb;
assert(cui->current == &cui->main->scr);
pb_log("%s: %s\n", __func__, cod->name);
assert(cui->current == &cui->main->scr);
pb_log("%s: %s\n", __func__, cod->name);
- if (!cod->opt) {
- pb_log("%s: missing opt?\n", __func__);
- return -1;
- }
nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
nc_scr_status_printf(cui->current, "Booting %s...", cod->name);