Message ID | 20230130151612.212732-144-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=IssRRX1t; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BwZ1mrcz23hg for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:31:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D19AC85A4B; Mon, 30 Jan 2023 16:25:05 +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="IssRRX1t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7AE0859BA; Mon, 30 Jan 2023 16:19:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 543B6859BD for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:06 +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 m8so5218256ili.7 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:06 -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=zteP5lgCFFXOxzxTGWcrG/+kgMSgvSUJ3seSbjRaR+U=; b=IssRRX1tkkqg0r0qAjQlxGtp7v+1L+ngukJa22bI+c6khDWD0l9y+pqA/fSLGFGFUs kiC9NM2yXYQkihh63lfsDRzapVCB1vPK122yTFPQN2NQ1TVBI7sDFyYruDAZKlXqH7XA Etxk7LwoRxejQUR898wVWQNgB2j7LfGVuFETE= 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=zteP5lgCFFXOxzxTGWcrG/+kgMSgvSUJ3seSbjRaR+U=; b=mR9ErRRb/wlKSRno8tMeyM+Jt71f82ymEaXSuRRyswjBAAMG6vXYw9POgUH3h1PbD/ 5zS1V8iE+55z1LJSIC06y6dTb38EcDW/jIm1fnJZnieal707FxNWTmQ+wXEgN1FrP/iQ ua/uVXmSdX3dB/xVrb7IvXCmU0GWLpdSxCXvmJUaGji8vfLOh9d87yb5EvmG9GE+21/B UkehDQLycVJUOTyx7/VcO8tEkcdsORSe4jU5jJKbJZabRyoRuY9dbHCsdPOjAe+qROMN lXZGnjAqQuTnJ3m4UrtSiu4qPqjPbvpkTOlAxHul44jbaF4tIPBYIHoFLZp2m6ghIQtr 7QRg== X-Gm-Message-State: AO0yUKXbUXpOWRD13ryosggs5tnVkEZFeImKJj6lDb2fO2euHSmUCebQ OnDIHTUUfJRoos3L6ZZk1nIUUieDaA5CW6oz X-Google-Smtp-Source: AK7set87mlYreAE4jxuUHLfDdQg/Ne6viomtMGbN6OXA4Blhwm4sdPQwJvMDtEq4N6oVAApyvZvPEg== X-Received: by 2002:a05:6e02:1a4e:b0:310:f316:fc42 with SMTP id u14-20020a056e021a4e00b00310f316fc42mr3468945ilv.24.1675091875300; Mon, 30 Jan 2023 07:17:55 -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 o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:55 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Jagan Teki <jagan@amarulasolutions.com>, Vignesh R <vigneshr@ti.com> Subject: [PATCH 143/171] Correct SPL use of SPI_FLASH_BAR Date: Mon, 30 Jan 2023 08:15:44 -0700 Message-Id: <20230130151612.212732-144-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
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
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 <sjg@chromium.org> --- drivers/mtd/spi/spi-nor-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)