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 41554C54EAA for ; Mon, 30 Jan 2023 15:15:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5971858EB; Mon, 30 Jan 2023 16:14:37 +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="nHZ2nx8F"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 582C085839; Mon, 30 Jan 2023 15:59:30 +0100 (CET) Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 DF2568584F for ; Mon, 30 Jan 2023 15:58: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-il1-x12f.google.com with SMTP id z2so4621415ilq.2 for ; Mon, 30 Jan 2023 06:58: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=VlskBk/aG3KFDdUUK6cmzpbRNa4d1N3AKH47MtQg95E=; b=nHZ2nx8FsHz2IeGiuskUjgXyrEyXpss+9XQIX7TmltSkn81VArNHOAJVhDx2PoIsAw ZCPG388xVKbYp9LkWjnH9XKBd8tx2bwBKO5QhjAe1nbvvzYlg83YGJja3LOZqOK4ordx N0twHuYr03HmQRK+/AAX0NPi25hOIpJtUZW1s= 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=VlskBk/aG3KFDdUUK6cmzpbRNa4d1N3AKH47MtQg95E=; b=nqOw3DfZCuyh/wicYbM6JmzxjpXrPiQkyL7D23VHb40tI4fFQZy/0ynbkJ9XRwpGrD IixCnoqwCYPlvzeNo7h+soFi7X0FoxuzlNWkEv8thvP3Eg27SB+J6Chtx03PoNzSbiFT xf5eJBB35XM5JNDRaWmw9cY7gbyNgv8UDExn8IWChx0sLOlnT0SQAlzqFp3iN6ozN6// 48XrVTixbmFeT9O6Spm5pH9ZlSxz9BN5k9fLzsaPqvh3sy+WR4i+kXnv8dQzd5NSvAc3 Ak/HtXeANi9GlN04KuK5rSSE3oywTLwdp4RMebkzd4Mk6lphjKm2OvFbUywQKHz6kKZy waaA== X-Gm-Message-State: AO0yUKUGTm0tlRARY+ACMDGiabILiWEarbeFzCKkP83QuafUid5kKr0W WCj8tPoRcmm0b2vewZ2jS3jf4d46zzQsguXI X-Google-Smtp-Source: AK7set/aCOrs+JoeNtWXD5CV7F0McRXt90LwD24Yt/pzvPCa5YMuvg+4GZja4vcwLMXtmT/npxRV8Q== X-Received: by 2002:a05:6e02:12c6:b0:311:34c:e5fe with SMTP id i6-20020a056e0212c600b00311034ce5femr1007891ilm.12.1675090706699; Mon, 30 Jan 2023 06:58:26 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heiko Schocher , Mattijs Korpershoek , Patrick Delaunay , Sean Anderson Subject: [PATCH 088/171] Correct SPL uses of FASTBOOT_FLASH_NAND Date: Mon, 30 Jan 2023 07:42:01 -0700 Message-Id: <20230130144324.206208-89-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_NAND defined in Kconfig Signed-off-by: Simon Glass --- 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.456.gfc5497dd1b-goog