From patchwork Mon Jan 30 15:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734239 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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=LmPyhRFq; 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 4P5C6Q3LKFz23hS for ; Tue, 31 Jan 2023 02:39:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD33285AA7; Mon, 30 Jan 2023 16:27:33 +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="LmPyhRFq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6DD98599F; Mon, 30 Jan 2023 16:25:35 +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-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 8F0DA859B3 for ; Mon, 30 Jan 2023 16:19: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=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id h18so2450651ilj.6 for ; Mon, 30 Jan 2023 07:19:05 -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=LkvtjAvt6y0q/nLOsozJriQAUa75KhKRTpzm5UefKxU=; b=LmPyhRFqb3vMGZdtuxkKAk7dhC3f0nowRnMRVu7ViI36zPqnV7Plipmf+G2Hfnbk27 gIeOPCUIpEJhV1B1+yYIOw4P2CZTJzD02BNYxtGKC/huoDCOB6ezUs4Xt7TTBUyM0Pqo GjObNLsYkE17ZqhOfqigNDM6CKiEc7m8KemEc= 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=LkvtjAvt6y0q/nLOsozJriQAUa75KhKRTpzm5UefKxU=; b=CLQ9GZaDdpHYHsyvpiWcn11HLFL3/Ip7sMJrnppMdZEQF0FtfjZHGI5CgNGCjaaJPz a7sYeTcDRRDKB2C9TiAiNFCwZOa9rMNnLLKm4ldbIr148kmo5nxuzDOzreT/Bzcd/AuS nkbAiqo+7UT/Ua6B1e7V06POVSM5oICRRBqL5C5Q7n5/DhqZyOh6nd7hX+RkEf6ECLRO M24/vC4y1YbTlFi9lMMA/O6hbnepGDrjAzmdRLlopXWpt+u8kCoYPIiD34aUsL2sEYDP 0FCzLVvjLBOZIcQLOdZrjwWB2tHhGtG7XTfrE8EnH6/bUQY4nyhcjciBA87KklajqdLD 1m5A== X-Gm-Message-State: AO0yUKUP9oDwfOA/mEbqzU0WSQKBu3EnsRHrKoUlkPCT1sf40cDTyEr5 pQkqs8WPeqeUGMxjtVNVE4XNAljGGDsM//EY X-Google-Smtp-Source: AK7set9tVV6IQr+HbB6T1uGJAqX6xfeof3t1PqIQlamuDbpgkuJoLCHaoLTVZqlkt/wJibJZnHWu3w== X-Received: by 2002:a05:6e02:1a0f:b0:310:c22e:d44f with SMTP id s15-20020a056e021a0f00b00310c22ed44fmr11433967ild.10.1675091876097; Mon, 30 Jan 2023 07:17:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jagan Teki , Vignesh R Subject: [PATCH 144/171] Correct SPL uses of SPI_FLASH_MACRONIX Date: Mon, 30 Jan 2023 08:15:45 -0700 Message-Id: <20230130151612.212732-145-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 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 2 usages of this option to the non-SPL form, since there is no SPL_SPI_FLASH_MACRONIX defined in Kconfig Signed-off-by: Simon Glass --- drivers/mtd/spi/spi-nor-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index d410ae58953..3f97acdb18c 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3645,7 +3645,7 @@ static struct spi_nor_fixups mt35xu512aba_fixups = { }; #endif /* CONFIG_SPI_FLASH_MT35XU */ -#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) +#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) /** * spi_nor_macronix_octal_dtr_enable() - Enable octal DTR on Macronix flashes. * @nor: pointer to a 'struct spi_nor' @@ -3904,7 +3904,7 @@ void spi_nor_set_fixups(struct spi_nor *nor) nor->fixups = &mt35xu512aba_fixups; #endif -#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) +#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) nor->fixups = ¯onix_octal_fixups; #endif /* SPI_FLASH_MACRONIX */ }