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 7702AC54EED for ; Mon, 30 Jan 2023 15:17:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 957848575F; Mon, 30 Jan 2023 16:15:29 +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="MLhfhLu3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DABDB8575F; Mon, 30 Jan 2023 15:58:38 +0100 (CET) Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 B4BC785797 for ; Mon, 30 Jan 2023 15:58:25 +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-x131.google.com with SMTP id m15so567385ilh.9 for ; Mon, 30 Jan 2023 06:58:25 -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=jKoEkVCDFzBjN56FKBVG3X0IP2NqEyzwvTkqssk2dK8=; b=MLhfhLu3qMB/OMl+4aIVTqTAw4Xm41gBlr/Uv+mDGGGwtODF0g9+g2XEAPquJsMXAv rQfpajkZVL9FrYuiaWppakMtL57ZXiC6IUMZdb26m16VziI6W+AHqHLAVPgUhs3Y3UXR 7CDn3kWZ8nVXTxkobIdNEd2peUw0q4jTM+vV0= 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=jKoEkVCDFzBjN56FKBVG3X0IP2NqEyzwvTkqssk2dK8=; b=Ka4P4EN5+MMqVbWHQYa/aafP7wH5QtlEbew2oY5bzWIvRAM935GCQcCvS7XXtadKL6 iz5ujErVDM6baGrjfp7lfM27uaDB1mOLkQybGm2mP7I21qXxhDO+IDY59f+Zo5xOXUNO e2W8ZToRbweJD8UAzelvDl3jTGL5qBflVfnmy0sb4Pgt0jYn0c6ScdoletzHczw/BztW W303nizL1YVlfR6UfaUPciQSZ7tf/Y+qHtfdnY1S8nbl9wfARnowAYM2IjdnbyyGCE43 x4JcOKWWj3T2gqRpDhAbWJM8cB/SE42SYiYC7Vr6K5OTTAfInJmROuatQHB/iQ1mSJUc z4uA== X-Gm-Message-State: AFqh2kosNXHnzxKvdar4FXICZ/lB7/98PtS/tdZH4B/7PdezvMpk4+Yh 3u97nTYeqHIOw44j4OhrH7H5p7fVaLAVd4uR X-Google-Smtp-Source: AMrXdXskqmd+0xw6/uFL9QUU3jgyaN0tBFyN7NnC/mYvmx109j6lU6KnqKNx8Nf2EskoxTGkEaCcAA== X-Received: by 2002:a05:6e02:102c:b0:30b:be3c:d003 with SMTP id o12-20020a056e02102c00b0030bbe3cd003mr32620193ilj.32.1675090705070; Mon, 30 Jan 2023 06:58:25 -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 g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger , Mattijs Korpershoek , Patrick Delaunay , Ramon Fried , Sean Anderson Subject: [PATCH 086/171] Correct SPL uses of FASTBOOT_FLASH Date: Mon, 30 Jan 2023 07:41:59 -0700 Message-Id: <20230130144324.206208-87-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-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 --- 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