From patchwork Mon Jan 30 14:41:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734172 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=85.214.62.61; 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=S4bpKnMz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5BlD2vLlz23hg for ; Tue, 31 Jan 2023 02:23:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 30D01859E1; Mon, 30 Jan 2023 16:19:39 +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="S4bpKnMz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3BA8D858B3; Mon, 30 Jan 2023 16:04:25 +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-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 E3526857C8 for ; Mon, 30 Jan 2023 15:55: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=sjg@chromium.org Received: by mail-il1-x133.google.com with SMTP id w13so1109455ilv.3 for ; Mon, 30 Jan 2023 06:55:28 -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=+CRkJYOs8icHOb0GMkdLolR/3foj2w6CZ3eAc4ZEfkk=; b=S4bpKnMz5kc/mppdfkTo7AMbGd80lfPPGeUbLW5/ubxiG+aD+VKsbd1KQsphBRRBCk ggfD7YaYYQHkrzueqmxgf4e5nncaWbSH99ZjUQ8JzFDtthnCH4ikRirDzxT9E6BX9qPW fXalRaVfKW4R5t3duReYgUpEHt6T+INiWdqps= 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=+CRkJYOs8icHOb0GMkdLolR/3foj2w6CZ3eAc4ZEfkk=; b=15iBBJ2tdspEWL3zPa8kijbYqmbWL5TsrUi7eax2IjpdIJvrTy95H73hP4l5y+wJmG WccleIGjCXUN2Hq0c5D7BxuC4YjVPd+NF5gDRRd4LT7CunVwiUDiluW13BDVnuK2TBe9 j9fh07pWnflSqEI7VMCBmS5sXQM5yWnTwWkVvSEtpp4bcQ6NCgZasOqbkvnhDsDYcM7z X0B7lpSXtiMEEbHmuVUX2adOdhyHhjfTEgcwJbzl5UkI1TKSZBOm+tO55fkSee1+drLD HfqhoLW4iZnmv49VkdpBCWzPQG+aqba+T4nHQzkqtkOA+pVSXigZpM3T7gpLNr4HOqJ9 DZOA== X-Gm-Message-State: AO0yUKVpyFKjUh3FEzO+xR9jf2qPDmvl/OtuOFkHS99S53fPrCfgeXIG KBfmh73lTh8Mef0RPY6SRPZo96zOoBTygf+L X-Google-Smtp-Source: AK7set9IjmQCyqauq3NFe248yhUleZBq3Ij6fl91hTrXb0Fp1XcmG8qdMgwdmxJ84QoOITNEqsRQiw== X-Received: by 2002:a92:ac05:0:b0:310:f327:769e with SMTP id r5-20020a92ac05000000b00310f327769emr2113098ilh.27.1675090520657; Mon, 30 Jan 2023 06:55:20 -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.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:20 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Kever Yang , Philipp Tomsich , Vagrant Cascadian Subject: [PATCH 057/171] Correct SPL uses of CMD_SF Date: Mon, 30 Jan 2023 07:41:30 -0700 Message-Id: <20230130144324.206208-58-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 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_CMD_SF defined in Kconfig Signed-off-by: Simon Glass --- include/configs/rockchip-common.h | 2 +- include/environment/distro/sf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0f47c111745..96deb4b3b6c 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -50,7 +50,7 @@ #define BOOT_TARGET_DHCP(func) #endif -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOT_TARGET_SF(func) func(SF, sf, 0) #else #define BOOT_TARGET_SF(func) diff --git a/include/environment/distro/sf.h b/include/environment/distro/sf.h index 62624d553c0..ee48a8a4e8f 100644 --- a/include/environment/distro/sf.h +++ b/include/environment/distro/sf.h @@ -8,7 +8,7 @@ #ifndef __DISTRO_SF_CONFIG_H #define __DISTRO_SF_CONFIG_H -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOTENV_SHARED_SF(devtypel) \ #devtypel "_boot=" \ "if " #devtypel " probe ${busnum}; then " \