diff options
| author | Tom Rini <[email protected]> | 2023-06-01 11:23:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-01 11:23:23 -0400 |
| commit | f415495e2a261cab52cb03c46a92b7b457728380 (patch) | |
| tree | eecf08dd3376548353ec92e67c4ad56215c95fe4 /drivers/fastboot | |
| parent | e863c7b2854bf9a882939f828023508fb1a1bc16 (diff) | |
| parent | 229d689e3c32164875667da282e496b858dbc608 (diff) | |
Merge branch '2023-05-31-assorted-fixes-and-improvements' into next
- Makefile logic fixes, address some issues that clang uncovers on ARM,
assorted code cleanups
Diffstat (limited to 'drivers/fastboot')
| -rw-r--r-- | drivers/fastboot/fb_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 621146bc6b0..4e9d9b719c6 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 |