From patchwork Mon Jan 30 15:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734224 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=ky77jxeF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5C0p1qwhz23hg for ; Tue, 31 Jan 2023 02:34:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A46FA85A69; Mon, 30 Jan 2023 16:26:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ky77jxeF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0EC4F85613; Mon, 30 Jan 2023 16:19:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E3827859BF for ; Mon, 30 Jan 2023 16:19:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id h18so2450935ilj.6 for ; Mon, 30 Jan 2023 07:19:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d/wJoPKQzlR1FSKk0IDwixnvIvPOKi16kSfsSsRTEl8=; b=ky77jxeFoBdSFp+L5Q+oz2Ao2ENDpyxlpnNohEGbeP3olDlQwUFemb8Gro5IQ7Nse4 pYc801/CDCAVzg26HbLYBszB4IYPQXtGcjq6uO3Lxgv72/2iGCLD+M7zCc7DdiMUjqki KK0SK4NrzwTY0NAqaoguQFWDrqSpwpFc2u6eo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d/wJoPKQzlR1FSKk0IDwixnvIvPOKi16kSfsSsRTEl8=; b=c5Yc/h2QdfprxypkVUdAt9k4ELvLj7Su+vF0QEmAO/PWKmjdlPfMwE2n8otwX6ZYeS tidZowWIvxfW7HCB9yNvk8lKG5lNFtLGKwQnsd+kGSEFbIzw62YEMIHt3+ENHpDOQmi5 pN25V6WaG/wX3lOyVEWWylRPwz6YvDWKPSmfaaKq+o247NkuIhWPAzergb5vNI7g4J09 piz5TLcFw7xByycnIQAeMJ5UKEkiYSjOh3oT+sNyl3p9s4JoRAsmKGDdVPhFwUh+8zNL YdylfKb5zblHR+qgiDym/WEoKHDUwPez2CzqEuwfH69H9UQ3ux7WPKZZexTJ6fewjS1b Fbqw== X-Gm-Message-State: AO0yUKVrvV+jPypQ7c38PF2k5Bg3XcTpzBznq5Ton7L7rqteW1qGXt9k g8WBzRZHWXGq0MipbC3o7/777hO+f84+PpXm X-Google-Smtp-Source: AK7set9VtNWL+ooUv0Hl8lDSKq3pK8yX/w/x6koPJFvTW3ga+lW3T0hoUr8bR64KJrAvec1qoA14pw== X-Received: by 2002:a92:c24f:0:b0:310:9eab:3d83 with SMTP id k15-20020a92c24f000000b003109eab3d83mr18157775ilo.11.1675091889007; Mon, 30 Jan 2023 07:18:09 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH 160/171] Correct SPL uses of USB_DWC3_MESON_GXL Date: Mon, 30 Jan 2023 08:16:01 -0700 Message-Id: <20230130151612.212732-161-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean 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 --- 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;