| Message ID | 20230130151612.212732-161-sjg@chromium.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | None | expand |
Hi, On 30/01/2023 16:16, Simon Glass wrote: > This converts 2 usages of this option to the non-SPL form, since there is > no SPL_USB_DWC3_MESON_GXL defined in Kconfig > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > arch/arm/mach-meson/board-axg.c | 2 +- > arch/arm/mach-meson/board-gx.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c > index 236ec815799..8bcb0b3a212 100644 > --- a/arch/arm/mach-meson/board-axg.c > +++ b/arch/arm/mach-meson/board-axg.c > @@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = { > > struct mm_region *mem_map = axg_mem_map; > > -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ > +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ > CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) > static struct dwc2_plat_otg_data meson_gx_dwc2_data; > > diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c > index 01fafd81c48..41f767302ec 100644 > --- a/arch/arm/mach-meson/board-gx.c > +++ b/arch/arm/mach-meson/board-gx.c > @@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = { > > struct mm_region *mem_map = gx_mem_map; > > -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ > +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ > CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) > static struct dwc2_plat_otg_data meson_gx_dwc2_data; > This code is getting removed in the last PR I sent at https://lore.kernel.org/all/ec3802ba-6e79-5370-e41e-cd2487cd618f@linaro.org/
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec815799..8bcb0b3a212 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data; diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c48..41f767302ec 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map; -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;
This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_DWC3_MESON_GXL defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)