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 | |
| 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')
| -rw-r--r-- | drivers/dfu/dfu.c | 2 | ||||
| -rw-r--r-- | drivers/fastboot/fb_common.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/mmc.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 516dda61796..b2ee5f1ede6 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -135,6 +135,7 @@ int dfu_config_interfaces(char *env) a = s; do { part = strsep(&a, ";"); + part = skip_spaces(part); ret = dfu_alt_add(dfu, i, d, part); if (ret) return ret; @@ -629,6 +630,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr) for (i = 0; i < dfu_alt_num; i++) { s = strsep(&env, ";"); + s = skip_spaces(s); ret = dfu_alt_add(dfu, interface, devstr, s); if (ret) { /* We will free "dfu" in dfu_free_entities() */ 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 diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 1af6af82e6b..72c1076c56d 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2262,7 +2262,7 @@ static int mmc_startup_v4(struct mmc *mmc) return 0; if (!mmc->ext_csd) - memset(ext_csd_bkup, 0, sizeof(ext_csd_bkup)); + memset(ext_csd_bkup, 0, MMC_MAX_BLOCK_LEN); err = mmc_send_ext_csd(mmc, ext_csd); if (err) |