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

Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled"

Browse Source 
Simon Glass <sjg@chromium.org> says:

This series is the culmanation of the current line of refactoring
series. It adjusts pxe to call the booting functionality directly
rather than going through the command-line interface.

With this is is possible to boot using the extlinux bootmeth without
the command line enabled.

It also updates fastboot to do a similar thing.
This commit is contained in:
Tom Rini
2024-04-10 17:06:27 -06:00
parent ab3453e7b1 cf70f75447
commit 777c284609
48 changed files with 387 additions and 338 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

17
drivers/fastboot/fb_command.c
View File

@@ -11,6 +11,7 @@
#include <fastboot-internal.h>
#include <fb_mmc.h>
#include <fb_nand.h>
#include <mapmem.h>
#include <part.h>
#include <stdlib.h>
#include <linux/printk.h>
@@ -278,6 +279,7 @@ void fastboot_data_download(const void *fastboot_data,
{
#define BYTES_PER_DOT 0x20000
u32 pre_dot_num, now_dot_num;
void *buf;
if (fastboot_data_len == 0 ||
(fastboot_bytes_received + fastboot_data_len) >
@@ -287,8 +289,10 @@ void fastboot_data_download(const void *fastboot_data,
return;
}
/* Download data to fastboot_buf_addr */
memcpy(fastboot_buf_addr + fastboot_bytes_received,
buf = map_sysmem(fastboot_buf_addr, 0);
memcpy(buf + fastboot_bytes_received,
fastboot_data, fastboot_data_len);
unmap_sysmem(buf);
pre_dot_num = fastboot_bytes_received / BYTES_PER_DOT;
fastboot_bytes_received += fastboot_data_len;
@@ -331,13 +335,16 @@ void fastboot_data_complete(char *response)
*/
static void __maybe_unused flash(char *cmd_parameter, char *response)
{
void *buf = map_sysmem(fastboot_buf_addr, 0);
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr,
image_size, response);
fastboot_mmc_flash_write(cmd_parameter, buf, image_size,
response);
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND))
fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr,
image_size, response);
fastboot_nand_flash_write(cmd_parameter, buf, image_size,
response);
unmap_sysmem(buf);
}
/**

37
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>
@@ -20,7 +21,7 @@
/**
* fastboot_buf_addr - base address of the fastboot download buffer
*/
void *fastboot_buf_addr;
ulong fastboot_buf_addr;
/**
* fastboot_buf_size - size of the fastboot download buffer
@@ -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,
"0x%p", 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
@@ -214,16 +212,9 @@ void fastboot_set_progress_callback(void (*progress)(const char *msg))
fastboot_progress_callback = progress;
}
/*
* fastboot_init() - initialise new fastboot protocol session
*
* @buf_addr: Pointer to download buffer, or NULL for default
* @buf_size: Size of download buffer, or zero for default
*/
void fastboot_init(void *buf_addr, u32 buf_size)
void fastboot_init(ulong buf_addr, u32 buf_size)
{
fastboot_buf_addr = buf_addr ? buf_addr :
(void *)CONFIG_FASTBOOT_BUF_ADDR;
fastboot_buf_addr = buf_addr ? buf_addr : CONFIG_FASTBOOT_BUF_ADDR;
fastboot_buf_size = buf_size ? buf_size : CONFIG_FASTBOOT_BUF_SIZE;
fastboot_set_progress_callback(NULL);
}