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 9E7EFC636CC for ; Mon, 6 Feb 2023 00:57:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F2F085BA8; Mon, 6 Feb 2023 01:57:13 +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="dtfM5+ZV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E89B8448E; Mon, 6 Feb 2023 01:57:03 +0100 (CET) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 55CAC85B66 for ; Mon, 6 Feb 2023 01:56:59 +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-io1-xd30.google.com with SMTP id y7so3945838iob.6 for ; Sun, 05 Feb 2023 16:56:59 -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=vYn8Ia1wHBAkrjlS7BhP5Ay3g5aBXpEgxmVH6hdfJtI=; b=dtfM5+ZVOuZXG94Ab2L6TUYX8mjyhSUdnIYZO0dgFJDuyyuDLyS5GR9lyUQlMMhVCd HXrJ5T4JATu6X3SA8Wcmi3c+GFl7tnfHD4+8Of7wpw/056qOmsrDESm/TYUmmgf1PsMB 2dimRvhABzRX7B05oP455manFJYO7v+FqRi4I= 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=vYn8Ia1wHBAkrjlS7BhP5Ay3g5aBXpEgxmVH6hdfJtI=; b=osOJozFsE7RcItZFs2+BY+w+WPzFEytJQYGND62DSGlP4MBrE1s7HumMJo9aSNGhWO 46cM3AgZenx94RJ+rTbKLG80KOyThZ19NRtj45elWY1k9hj2Fvyk66owwE/zanmw2aVS HCX+DcEjvp/EB+b3n2uEo5nIZcMFcTqjNPjCPsocOTy8Xbe3P5xKkzvuZvB9YkA4MO6V g4lL/qK+eot3aQK7d+ZTFIkVIwwr9U8S3J4Rr494HsqEDuGmhC9i2dWbVPmD0O/B/AKG 53FdCu9cligdYOtL+XGEd/9M6ANB+SfAULncKI7KhFThupbJFJRAYF9QzxoeWE625FHC A/RA== X-Gm-Message-State: AO0yUKXkNEWSlKgUap4+KkdF96tqqhgPCFQNeyDm8J4Ud5V8HiOs1zGz /ExAYBUHAA+3Baf+0UdZnZK5893d5rq+qvYM X-Google-Smtp-Source: AK7set+frIgPr2NEeIjQ5KLKNwRZ6mihH0XgJYN8yOuR3mtalXJdvHFxCtjUsDe7OMbfW9I5bQdC8g== X-Received: by 2002:a6b:d214:0:b0:71f:9777:4005 with SMTP id q20-20020a6bd214000000b0071f97774005mr11432882iob.5.1675645017989; Sun, 05 Feb 2023 16:56:57 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:56:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Mattijs Korpershoek Subject: [PATCH v2 086/169] Correct SPL uses of FASTBOOT_FLASH_NAND Date: Sun, 5 Feb 2023 17:54:13 -0700 Message-Id: <20230206005537.254541-87-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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_NAND defined in Kconfig Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- (no changes since v1) drivers/fastboot/fb_command.c | 4 ++-- drivers/fastboot/fb_getvar.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 5a3fb69b3f7..71cfaec6e9d 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -299,7 +299,7 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); } @@ -318,7 +318,7 @@ static void __maybe_unused erase(char *cmd_parameter, char *response) if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_erase(cmd_parameter, response); - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_erase(cmd_parameter, response); } diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index de4879dadfb..dd3475e0a8b 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -104,7 +104,7 @@ static int getvar_get_part_info(const char *part_name, char *response, response); if (r >= 0 && size) *size = disk_part.size * disk_part.blksz; - } else if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) { + } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); if (r >= 0 && size) *size = part_info->size; -- 2.39.1.519.gcb327c4b5f-goog