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 04572C636CD for ; Sun, 5 Feb 2023 22:50:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6EC0B85A50; Sun, 5 Feb 2023 23:41:57 +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="OvV3s07v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 738CE85970; Sun, 5 Feb 2023 23:40:19 +0100 (CET) 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 5E772859D6 for ; Sun, 5 Feb 2023 23:39: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=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id j12so629377ila.1 for ; Sun, 05 Feb 2023 14:39:39 -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=CI71sXIOmFfM6x7Bwvoqb401KAiJXRR8kSZoEtayMmY=; b=OvV3s07v1IyM2HtMsfvIAZ0buhe4sywuEvO6SwcfHXDc9XuDGEMutTVt9Rg4h+3v/s OUg0sfr1FCinBVGy4KEHFflfbX2YPKP8z0ifteJRYSP60jdzbKiCMj03CbuWJcdUz2xx P/ZzkA1VYK3lKRYdtOJ7okQnCeeduk52Ay1yE= 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=CI71sXIOmFfM6x7Bwvoqb401KAiJXRR8kSZoEtayMmY=; b=E+g5GRZPsbxsQPGWvrFp1r70aGwuplohfeIkm1jSkDH4kCGNcEUdxcp/IcUh5F4F3f Emrp6wSzdQ2P+MH+MgVCWwbOGArB4+gOo5bVodk1h0LfyTtq72Cvbb85W6eipllxRby5 SZ2Cjd8KwV/K7IzZmX9TodvmIU7ZLe5dlBZenFMVHs+MWxqAt75MrL3UBLJShagUcGy+ neXVezl6D0U6cnLW0LLUpt8KyK/qtnBo7+Mc3JNYvSOF4bBQ7C3XFU/WnowRy8nnl40W aARvT7Qp5U+FrprEhszOG/Z1Ybc6Ic++Mr0YAFmleZYiUurWawNAz6c0QptvmY70FDcJ hmEg== X-Gm-Message-State: AO0yUKV+YpvZMXDcfxgIVVkfcGgOBtnfH5yLES3/SaLEXv+qX7Q9hiSJ KG+p/lzYvJZqk4K9mEGvj/VIwxI9kgLsdwvi X-Google-Smtp-Source: AK7set98lhCBxfln2hisku4cfFmNljtDcevDKuI1iRwj9C2M6AfcM/77CVB5qemBGYOgS6Zu5p6p6g== X-Received: by 2002:a92:cd87:0:b0:313:b8b6:a05d with SMTP id r7-20020a92cd87000000b00313b8b6a05dmr3755599ilb.2.1675636778885; Sun, 05 Feb 2023 14:39:38 -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 m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 055/169] Correct SPL uses of CMD_SF Date: Sun, 5 Feb 2023 15:36:41 -0700 Message-Id: <20230205223836.231657-56-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 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 --- (no changes since v1) 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 " \ -- 2.39.1.519.gcb327c4b5f-goog