[PATCH] fastboot: Only call the bootm command if it is enabled
This fixes an error with trying to link against do_bootm() when CONFIG_CMD_BOOTM is disabled.
Signed-off-by: Samuel Holland samuel@sholland.org ---
drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 57b6182c46a..20aa80838ae 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -135,7 +135,7 @@ void fastboot_boot(void) s = env_get("fastboot_bootcmd"); if (s) { run_command(s, CMD_FLAG_ENV); - } else { + } else if (IS_ENABLED(CONFIG_CMD_BOOTM)) { static char boot_addr_start[20]; static char *const bootm_args[] = { "bootm", boot_addr_start, NULL
On lun., févr. 20, 2023 at 00:14, Samuel Holland samuel@sholland.org wrote:
This fixes an error with trying to link against do_bootm() when CONFIG_CMD_BOOTM is disabled.
Signed-off-by: Samuel Holland samuel@sholland.org
Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com
drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 57b6182c46a..20aa80838ae 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -135,7 +135,7 @@ void fastboot_boot(void) s = env_get("fastboot_bootcmd"); if (s) { run_command(s, CMD_FLAG_ENV);
- } else {
- } else if (IS_ENABLED(CONFIG_CMD_BOOTM)) { static char boot_addr_start[20]; static char *const bootm_args[] = { "bootm", boot_addr_start, NULL
-- 2.39.2
Hi,
On 2/20/23 07:14, Samuel Holland wrote:
This fixes an error with trying to link against do_bootm() when CONFIG_CMD_BOOTM is disabled.
Signed-off-by: Samuel Holland samuel@sholland.org
drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 57b6182c46a..20aa80838ae 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -135,7 +135,7 @@ void fastboot_boot(void) s = env_get("fastboot_bootcmd"); if (s) { run_command(s, CMD_FLAG_ENV);
- } else {
- } else if (IS_ENABLED(CONFIG_CMD_BOOTM)) { static char boot_addr_start[20]; static char *const bootm_args[] = { "bootm", boot_addr_start, NULL
Reviewed-by: Patrick Delaunay patrick.delaunay@foss.st.com
Thanks Patrick
On Mon, Feb 20, 2023 at 12:14:58AM -0600, Samuel Holland wrote:
This fixes an error with trying to link against do_bootm() when CONFIG_CMD_BOOTM is disabled.
Signed-off-by: Samuel Holland samuel@sholland.org Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com Reviewed-by: Patrick Delaunay patrick.delaunay@foss.st.com
Applied to u-boot/next, thanks!
participants (4)
-
Mattijs Korpershoek -
Patrick DELAUNAY -
Samuel Holland -
Tom Rini