From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58876C636CD for ; Sun, 5 Feb 2023 23:10:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3EE085B14; Mon, 6 Feb 2023 00:03:02 +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="CcmnG25+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AAED985A93; Sun, 5 Feb 2023 23:42:36 +0100 (CET) Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 3D39285952 for ; Sun, 5 Feb 2023 23:42:17 +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-x12b.google.com with SMTP id w2so413836ilg.8 for ; Sun, 05 Feb 2023 14:42:17 -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=MlX838HYE2+zeGsY5QOCKx0Vbv7cFl6+M8P4chPpn+I=; b=CcmnG25+IMSZ90vlUEQ4gg0mKDnjPprmepfuBI4/QzdlTAo6OLuRjO7kxfVL8lQqDM RBFAt5QnwMItO6pPHHk6FKr/U7hS8sW8t8PtGu70dGtoxKUDxTP8cayzLPALp/UAmCVK v6k/tZqqn2EygUOjEfSIC3aWbwpJIGeHuZf/E= 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=MlX838HYE2+zeGsY5QOCKx0Vbv7cFl6+M8P4chPpn+I=; b=qiIfEVM6PrLmSolriP8r59MqHwR7ssbAi63BCqcxJhYq8Swr4pX7E0NSLdjxLzFbGI m2iq+HYIasUkakWTS8NTqr2lvYW2mxxqFvdQYMvQTuwojbbjGOuoochR0Lg2G5rhBO9e tB3Ta8MVrnCauTPywecEOwDBtLeO3GMUr3yWO+SjbVfHB44zVdHhL1tEd2XtgWcWkfxS uhUhDfGXG1l1pK1249ipeXYAcNCu57dpqafObqIEOKdJ7aXjKUzGIWNnGiBYx1liNdMT FG49B5HmIsITIDWgy4urSMFCbNDlDuB6GpD0tYfSV3VlM/Jzhg5Jed1zAADmoL7rxW6S DOSA== X-Gm-Message-State: AO0yUKV+3/Ns1txrzi2gGSY2eDo00lKG4aEa10y7g49ozRMb/B6U8iHE IMj+wPoMGyFzyh4x2PyFg4AKKvUwDdnxLufe X-Google-Smtp-Source: AK7set9YbtDsDBT7akV6oiWe1Krhtij7hPrh7LLae7hmC9P+ULRV5Y+Z0Bwmh/TcLbNcSY3e9OpXBg== X-Received: by 2002:a92:c543:0:b0:313:8e80:a4e0 with SMTP id a3-20020a92c543000000b003138e80a4e0mr10070765ilj.23.1675636937284; Sun, 05 Feb 2023 14:42:17 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 084/169] Correct SPL uses of FASTBOOT_FLASH Date: Sun, 5 Feb 2023 15:39:53 -0700 Message-Id: <20230205224118.233425-85-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 Reviewed-by: Mattijs Korpershoek --- (no changes since v1) 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.519.gcb327c4b5f-goog