Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstd: Introduce programmatic boot

Browse source 
At present bootstd requires CONFIG_CMDLINE to operate. Add a new
'programmatic' boot which can be used when no command line is available.
For now it does almost nothing, since most bootmeths require the
command line.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-11-18 14:05:19 -07:00 committed by Tom Rini
parent 984e6fedb5
commit 1047b5340c
5 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boot/Kconfig
View file

@ -459,6 +459,18 @@ config BOOTSTD_BOOTCOMMAND
standard boot does not support all of the features of distro boot
yet.
config BOOTSTD_PROG
bool "Use programmatic boot"
depends on !CMDLINE
default y
help
Enable this to provide a board_run_command() function which can boot
a systen without using commands. If the boot fails, then U-Boot will
panic.
Note: This currently has many limitations and is not a useful booting
solution. Future work will eventually make this a viable option.
config BOOTMETH_GLOBAL
bool
help

2
boot/Makefile
View file

@ -25,6 +25,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow.o
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootmeth-uclass.o
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD_PROG) += prog_boot.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX) += bootmeth_extlinux.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX_PXE) += bootmeth_pxe.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o

51
boot/prog_boot.c Normal file
View file

@ -0,0 +1,51 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2021 Google LLC
* Written by Simon Glass <sjg@chromium.org>
*/
#define LOG_CATEGORY UCLASS_BOOTSTD
#include <bootflow.h>
#include <bootstd.h>
#include <command.h>
#include <dm.h>
/*
* show_bootmeths() - List available bootmeths
*
* We could refactor this to use do_bootmeth_list() if more detail (or ordering)
* are needed
*/
static void show_bootmeths(void)
{
struct udevice *dev;
struct uclass *uc;
printf("Bootmeths: ");
uclass_id_foreach_dev(UCLASS_BOOTMETH, dev, uc)
printf(" %s", dev->name);
printf("\n");
}
int bootstd_prog_boot(void)
{
struct bootflow_iter iter;
struct bootflow bflow;
int ret, flags, i;
printf("Programmatic boot starting\n");
show_bootmeths();
flags = BOOTFLOWIF_HUNT | BOOTFLOWIF_SHOW | BOOTFLOWIF_SKIP_GLOBAL;
bootstd_clear_glob();
for (i = 0, ret = bootflow_scan_first(NULL, NULL, &iter, flags, &bflow);
i < 1000 && ret != -ENODEV;
i++, ret = bootflow_scan_next(&iter, &bflow)) {
if (!bflow.err)
bootflow_run_boot(&iter, &bflow);
bootflow_free(&bflow);
}
return -EFAULT;
}

11
common/main.c
View file

@ -9,6 +9,7 @@
#include <common.h>
#include <autoboot.h>
#include <bootstage.h>
#include <bootstd.h>
#include <cli.h>
#include <command.h>
#include <console.h>
@ -67,6 +68,16 @@ void main_loop(void)
autoboot_command(s);
/* if standard boot if enabled, assume that it will be able to boot */
if (IS_ENABLED(CONFIG_BOOTSTD_PROG)) {
int ret;
ret = bootstd_prog_boot();
printf("Standard boot failed (err=%dE)\n", ret);
panic("Failed to boot");
}
cli_loop();
panic("No CLI available");
}

9
include/bootstd.h
View file

@ -94,4 +94,13 @@ int bootstd_get_priv(struct bootstd_priv **stdp);
*/
void bootstd_clear_glob(void);
/**
* bootstd_prog_boot() - Run standard boot in a fully programmatic mode
*
* Attempts to boot without making any use of U-Boot commands
*
* Returns: -ve error value (does not return except on failure to boot)
*/
int bootstd_prog_boot(void);
#endif