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 3804BC636CC for ; Sun, 5 Feb 2023 22:52:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9126885A9F; Sun, 5 Feb 2023 23:42: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="Z/rcBu7k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D7BF8592B; Sun, 5 Feb 2023 23:40:28 +0100 (CET) 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 481388595D for ; Sun, 5 Feb 2023 23:39:29 +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 k17so1362540ilq.12 for ; Sun, 05 Feb 2023 14:39:29 -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=o0ScABMjltx1PeXrrMcNi4LXh2TL4s4j6b42zy4ih7w=; b=Z/rcBu7kKjivEXZz5PjCtc0Ym1U6dDH4dkivzQPW3LE/OmMWIc866vRMBPhht4SfKO Yg2f5wkbwhumjj4S28EwyJAMHYb/YjwpcP6Cx6pF0YsuaxL4VA8G4h6kcj44O+MwipY0 D9vUQeFfeXAxy/iij9XM9kXX7YBjcO3zgnN7I= 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=o0ScABMjltx1PeXrrMcNi4LXh2TL4s4j6b42zy4ih7w=; b=XpUTNuEEwNkYZhtiqmY++BGvsKN4eeBNBafqmMNRB09xwJIYbby5gAQtoAEJiXq2VL tDkPBq7kLfq+SJueUJsOZlB89m7ruNzWCTgfXqx1wBLdHtig/CYeN2Xh8UzrnlplNoKC k518Nmz6WV3Cj6DxlcrEqGUXqZbTvmWoIdfkaL7bL3m86xjid1kYDVKseTTddCzPebaE +SvPWuDBOb3wWsI+rmiD0vCmQhbFSnewsXHS44RFX/De39VpKyuFBtXnWWExV31MELHs 93LD85PIEOmDL5Zn9EbbW3jtpcXDABHdeEvsjb6wej80yVRNwIC9Mv1iQwfiazcGoJbm Ll9w== X-Gm-Message-State: AO0yUKUUnSkCp5n46Aze7QAezkcKfKs3GbnwDNbyvM3rC3Rg9sXNpcWy y7hq93efOBP7DeWDb8Gs40IWHZfYf9SNBDjP X-Google-Smtp-Source: AK7set/JW0vCrGMBs8TlcCwwf325IvAYKzz68y9TcrUqWWvrWz1HoQ/ZLhO1rFo5bafJH+AQ85g7bg== X-Received: by 2002:a92:c24a:0:b0:313:c977:c2b0 with SMTP id k10-20020a92c24a000000b00313c977c2b0mr462626ilo.29.1675636768778; Sun, 05 Feb 2023 14:39:28 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:28 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 043/169] Correct SPL use of CMD_ERASEENV Date: Sun, 5 Feb 2023 15:36:29 -0700 Message-Id: <20230205223836.231657-44-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 1 usage of this option to the non-SPL form, since there is no SPL_CMD_ERASEENV defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/env_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/env_internal.h b/include/env_internal.h index aee6b3e48fa..6a694946468 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -189,7 +189,7 @@ struct env_driver { #endif #define ENV_SAVE_PTR(x) (CONFIG_IS_ENABLED(SAVEENV) ? (x) : NULL) -#define ENV_ERASE_PTR(x) (CONFIG_IS_ENABLED(CMD_ERASEENV) ? (x) : NULL) +#define ENV_ERASE_PTR(x) (IS_ENABLED(CONFIG_CMD_ERASEENV) ? (x) : NULL) extern struct hsearch_data env_htab; -- 2.39.1.519.gcb327c4b5f-goog