smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastboot: Remove dependencies on CMDLINE

Browse Source 
It is possible to boot a kernel without CMDLINE being enabled. Update
the implementation to handle this, and drop the condition from the
FASTBOOT config.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Simon Glass
2023-12-14 21:19:06 -07:00
committed by Tom Rini
parent 26736347bf
commit b0c27bd81a
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/fastboot/Kconfig
View File

@@ -1,5 +1,4 @@
menu "Fastboot support"
depends on CMDLINE
config FASTBOOT
bool

24
drivers/fastboot/fb_common.c
View File

@@ -11,6 +11,7 @@
*/
#include <bcb.h>
#include <bootm.h>
#include <common.h>
#include <command.h>
#include <env.h>
@@ -142,22 +143,19 @@ void (*fastboot_get_progress_callback(void))(const char *)
*/
void fastboot_boot(void)
{
char *s;
char *s = NULL;
s = env_get("fastboot_bootcmd");
if (s) {
run_command(s, CMD_FLAG_ENV);
} else if (IS_ENABLED(CONFIG_CMD_BOOTM)) {
static char boot_addr_start[20];
static char *const bootm_args[] = {
"bootm", boot_addr_start, NULL
};
if (IS_ENABLED(CONFIG_CMDLINE)) {
s = env_get("fastboot_bootcmd");
if (s)
run_command(s, CMD_FLAG_ENV);
}
snprintf(boot_addr_start, sizeof(boot_addr_start) - 1,
"%lx", fastboot_buf_addr);
printf("Booting kernel at %s...\n\n\n", boot_addr_start);
if (!s && IS_ENABLED(CONFIG_BOOTM)) {
int ret;
do_bootm(NULL, 0, 2, bootm_args);
printf("Booting kernel at %lx...\n\n\n", fastboot_buf_addr);
ret = bootm_boot_start(fastboot_buf_addr, NULL);
/*
* This only happens if image is somehow faulty so we start