| Message ID | 20230130144324.206208-87-sjg@chromium.org |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Kconfig: More cleanup of CONFIG options | expand |
On Mon, Jan 30, 2023 at 07:41, Simon Glass <sjg@chromium.org> wrote: > This converts 3 usages of this option to the non-SPL form, since there is > no SPL_FASTBOOT_FLASH defined in Kconfig > > Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> > --- > > drivers/fastboot/fb_getvar.c | 4 ++-- > net/fastboot.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c > index 2fbd285db38..bcef8f866f3 100644 > --- a/drivers/fastboot/fb_getvar.c > +++ b/drivers/fastboot/fb_getvar.c > @@ -57,7 +57,7 @@ static const struct { > }, { > .variable = "current-slot", > .dispatch = getvar_current_slot > -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) > +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) > }, { > .variable = "has-slot", > .dispatch = getvar_has_slot > @@ -67,7 +67,7 @@ static const struct { > .variable = "partition-type", > .dispatch = getvar_partition_type > #endif > -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) > +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) > }, { > .variable = "partition-size", > .dispatch = getvar_partition_size > diff --git a/net/fastboot.c b/net/fastboot.c > index 96bdf5486fa..e9569d88d2a 100644 > --- a/net/fastboot.c > +++ b/net/fastboot.c > @@ -307,7 +307,7 @@ void fastboot_start_server(void) > > fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT; > > - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH)) > + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH)) > fastboot_set_progress_callback(fastboot_timed_send_info); > > net_set_udp_handler(fastboot_handler); > -- > 2.39.1.456.gfc5497dd1b-goog
diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 2fbd285db38..bcef8f866f3 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -57,7 +57,7 @@ static const struct { }, { .variable = "current-slot", .dispatch = getvar_current_slot -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "has-slot", .dispatch = getvar_has_slot @@ -67,7 +67,7 @@ static const struct { .variable = "partition-type", .dispatch = getvar_partition_type #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "partition-size", .dispatch = getvar_partition_size diff --git a/net/fastboot.c b/net/fastboot.c index 96bdf5486fa..e9569d88d2a 100644 --- a/net/fastboot.c +++ b/net/fastboot.c @@ -307,7 +307,7 @@ void fastboot_start_server(void) fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT; - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH)) fastboot_set_progress_callback(fastboot_timed_send_info); net_set_udp_handler(fastboot_handler);
This converts 3 usages of this option to the non-SPL form, since there is no SPL_FASTBOOT_FLASH defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/fastboot/fb_getvar.c | 4 ++-- net/fastboot.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)