Hi Tom, On Thu, 9 Feb 2023 at 10:50, Tom Rini <[email protected]> wrote: > > On Sun, Feb 05, 2023 at 03:39:33PM -0700, Simon Glass wrote: > > This converts 3 usages of this option to the non-SPL form, since there is > > no SPL_DFU_VIRT defined in Kconfig > > > > Signed-off-by: Simon Glass <[email protected]> > > --- > > > > (no changes since v1) > > > > board/st/common/stm32mp_dfu.c | 2 +- > > drivers/dfu/Makefile | 2 +- > > include/dfu.h | 2 +- > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c > > index 0096f71dfc1..19e9c3b2402 100644 > > --- a/board/st/common/stm32mp_dfu.c > > +++ b/board/st/common/stm32mp_dfu.c > > @@ -159,7 +159,7 @@ void set_dfu_alt_info(char *interface, char *devstr) > > puts("DFU alt info setting: done\n"); > > } > > > > -#if CONFIG_IS_ENABLED(DFU_VIRT) > > +#if IS_ENABLED(CONFIG_DFU_VIRT) > > #include <dfu.h> > > #include <power/stpmic1.h> > > > > diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile > > index dfbf64da667..df88f4be59a 100644 > > --- a/drivers/dfu/Makefile > > +++ b/drivers/dfu/Makefile > > @@ -10,4 +10,4 @@ obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o > > obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o > > obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o > > obj-$(CONFIG_$(SPL_)DFU_WRITE_ALT) += dfu_alt.o > > -obj-$(CONFIG_$(SPL_)DFU_VIRT) += dfu_virt.o > > +obj-$(CONFIG_DFU_VIRT) += dfu_virt.o > > diff --git a/include/dfu.h b/include/dfu.h > > index 07922224ef1..06efbf4b208 100644 > > --- a/include/dfu.h > > +++ b/include/dfu.h > > @@ -495,7 +495,7 @@ static inline int dfu_fill_entity_mtd(struct dfu_entity > > *dfu, char *devstr, > > } > > #endif > > > > -#if CONFIG_IS_ENABLED(DFU_VIRT) > > +#if IS_ENABLED(CONFIG_DFU_VIRT) > > int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, > > char **argv, int argc); > > int dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset, > > This is I believe an intentional usage.
I'll add this to config_nospl Regards, Simon
