On 30/01/2023 16:16, Simon Glass wrote:
This converts 3 usages of this option to the non-SPL form, since there is no SPL_USB_GADGET_DWC2_OTG defined in Kconfig
Signed-off-by: Simon Glass sjg@chromium.org
arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-g12a.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 8bcb0b3a212..4baf045d416 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -92,7 +92,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d9f1acdef74..46507c6a0f9 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -98,7 +98,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 41f767302ec..b850460c26c 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -110,7 +110,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map;
#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \
- CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;
int board_usb_init(int index, enum usb_init_type init)
Same as 160, this code is getting removed in This code is getting removed in the last PR I sent at https://lore.kernel.org/all/ec3802ba-6e79-5370-e41e-cd2487cd618f@linaro.org/