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 389BEC636CD for ; Mon, 6 Feb 2023 01:00:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 471F786079; Mon, 6 Feb 2023 01:59:23 +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="dS2sbXPk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6A4B85D7B; Mon, 6 Feb 2023 01:58:18 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 B2AAF85C55 for ; Mon, 6 Feb 2023 01:58:15 +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-xd29.google.com with SMTP id l7so3956036ioa.7 for ; Sun, 05 Feb 2023 16:58:15 -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=1q/g7xzeVtec/STYl9TiWubrJ+CmwdLAVbX/Z9e7MEY=; b=dS2sbXPkGA3BdrGojVZ1ln6grvXyLDuAgpHmomiX+BYzQRyGWVeFLc6AXNSoN0P3RY laICm3k7WpuVCGOfoCHfzHB+Xoi317I8eo+eB+dD2g3ygU+nBq9nRF80RYs2x226y0Le ue1IIVzjH0A+9Cda1sFBLeUAfEbIQrHWKZEfw= 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=1q/g7xzeVtec/STYl9TiWubrJ+CmwdLAVbX/Z9e7MEY=; b=GYbkSQ5KrYKwCY4MPLzXEHpg3vAL39Y94u/31bMJnfThi+E+mnwZwIMUt0A+mO4E+V CBzIxOOy6R0vUdkVViDjhe7cBXLKsUlHTHIHJr0gtvvsDVu3AfhepVKgmXUgLLptIm6q SULvB8D64ZQ0btY3cvGMXbiN0aAQNnn1jkoWt78UEupLBPk8JfxUbjj6stMTn2QOLr/m foc/tQ1dWAVMg0sejwcvwjMTKU5kRdXuSkU32q3Vn/rvGw9WTM4x1rtXS0y6XHNvh7dt WojW4KQyIUcRr6cmh56LsDjuLRtW/MxKiIwzZKSP2ZWNpbzNgL9pDTuearYCpJK4fQHP mIdQ== X-Gm-Message-State: AO0yUKVLv7lGGUF5SVMq73WedV7wAkUjKyctxaR7n01jdndR7VYhlgl+ G8HJWs7iVon0Meiu7bjrunXFQzmuIfu9sgnS X-Google-Smtp-Source: AK7set/+AUznWyzJ6ZGNQZsqS581h5rKC1wxQ3A8TMcNmH4xUZqqz6JsSwerZmBI8EX4sjVRqh+k5g== X-Received: by 2002:a05:6602:2438:b0:72c:ab6a:5c08 with SMTP id g24-20020a056602243800b0072cab6a5c08mr5105604iob.9.1675645095215; Sun, 05 Feb 2023 16:58:15 -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.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 141/169] Correct SPL use of SPI_FLASH_BAR Date: Sun, 5 Feb 2023 17:55:08 -0700 Message-Id: <20230206005537.254541-142-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 1 usage of this option to the non-SPL form, since there is no SPL_SPI_FLASH_BAR defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) drivers/mtd/spi/spi-nor-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 2c3116ee530..d410ae58953 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3894,7 +3894,7 @@ void spi_nor_set_fixups(struct spi_nor *nor) } } - if (CONFIG_IS_ENABLED(SPI_FLASH_BAR) && + if (IS_ENABLED(CONFIG_SPI_FLASH_BAR) && !strcmp(nor->info->name, "s25fl256l")) nor->fixups = &s25fl256l_fixups; #endif -- 2.39.1.519.gcb327c4b5f-goog