From 0ab3609061c90ed06f03171622894e54ff10f575 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 5 Feb 2023 15:40:17 -0700
Subject: [PATCH] Correct SPL uses of MTD
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_MTD defined in Kconfig
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +-
board/st/common/stm32mp_dfu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 89552d2ad1..934800be93 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset)
}
}
- if (CONFIG_IS_ENABLED(MTD) &&
+ if (IS_ENABLED(CONFIG_MTD) &&
data->cur_part->bin_nb > 1) {
if (stm32prog_copy_fsbl(data->cur_part)) {
stm32prog_err("%s (0x%x): copy of fsbl failed",
diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 0096f71dfc..1cf4a3d5fa 100644
--- a/board/st/common/stm32mp_dfu.c
+++ b/board/st/common/stm32mp_dfu.c
@@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
board_get_alt_info_mmc(dev, buf);
}
- if (CONFIG_IS_ENABLED(MTD)) {
+ if (IS_ENABLED(CONFIG_MTD)) {
/* probe all MTD devices */
mtd_probe_devices();
--
2.39.5