diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-10 09:17:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-10 09:17:25 -0500 |
| commit | 8b301102e246350a0ccedc370f7c9923b02f86f2 (patch) | |
| tree | 15ddc9d376d630efb4c614c4bda559d3c0c99d64 /arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | |
| parent | 81e8a51cee2b265e26272f0c67518c4844baa36c (diff) | |
| parent | 42a13b21dcb6663847ae71c0a42dcf2f4149b69a (diff) | |
Merge branch '2023-02-08-Kconfig-cleanup-CONFIG_IS_ENABLED-to-IS_ENABLED'
- This series brings in a large number of patches in the form of changing
CONFIG_IS_ENABLED(FOO) to IS_ENABLED(CONFIG_FOO) when there it is the
case that CONFIG_xPL_FOO is never a valid symbol. The majority of
the times where we do this, it is unintentional and does not make the
code more useful, or rarely, introduces bugs.
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 89552d2ad10..6f3641ccf57 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1583,7 +1583,7 @@ int stm32prog_pmic_read(struct stm32prog_data *data, u32 offset, u8 *buffer, int result = 0, ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -1633,7 +1633,7 @@ int stm32prog_pmic_start(struct stm32prog_data *data) int ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -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", |