From patchwork Sun Feb 5 22:36:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737823 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=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=FfLBtWMb; 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 4P94PB6jrsz23j7 for ; Mon, 6 Feb 2023 09:50:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D27A685A7E; Sun, 5 Feb 2023 23:42:10 +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="FfLBtWMb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42D5D85982; Sun, 5 Feb 2023 23:40:14 +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-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 EA25C85969 for ; Sun, 5 Feb 2023 23:39:36 +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-x134.google.com with SMTP id k12so4106702ilv.10 for ; Sun, 05 Feb 2023 14:39:36 -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=BGJDtq027WBxIioNSAmjlZT9Cmg5lgk6HOnF2UQ83RI=; b=FfLBtWMbZlfp4+mq1uQWHirYs0H9czgbLigY/teBiDdS0H7fV5AeAnow7MluRd6Cf7 FP2OGS+m7ytRJjdL7qceFnk2w8PkzWVpBLlA1t7gHfZsCylVgIYv5L4YY0UNjaA1Hj2i NrxwZUa7aN0lbpRDaFUbD+pbFdK6j6qi+SVyo= 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=BGJDtq027WBxIioNSAmjlZT9Cmg5lgk6HOnF2UQ83RI=; b=U8j96mq3CZ5uInNWFi9jDP2ORUFQKQCJs0QW2smDgRyW/vBBsaghMqblii4bje7XlZ yXg5heNxRU6xHKa9sMQjrn8m+dxh36LFBdUtl/S5TSXYuKdt54PPmDYapv6gcDEy0Y6Y t52+72D+dceLottiHFabQUuNf/vGmRPMNMGSW2Jc233zkN+XSXeMATioTskD58i1K5EY C/GBDqPPF2PombElhNKwrh66SKr5F+DlfhFFctt+5jy3tIgC75HXWfhbG9V4m0dkrPlb H7uaWWBbuNuVSwMgOLkTxKpvL2TEJDvWxiAYdZ88rdx5Oy/wfvnypexe9coZ05qp5N2e z19Q== X-Gm-Message-State: AO0yUKVU0KMIKFeKDCDMvIDJ0NQ/klJXYHhv5gCgEgoF+0Ya+hE8uBLq UA2lDijsI3ysGjMEaHpaWDXmH8lXnLSTBcuT X-Google-Smtp-Source: AK7set9meXNCsJI1dR9aii+HRUiOdTWHWGzV5h0QRnvon6xyleHPa/9peJRVxTQqFa4boKgMB3Lnvw== X-Received: by 2002:a05:6e02:1446:b0:310:c643:bda2 with SMTP id p6-20020a056e02144600b00310c643bda2mr16895180ilo.28.1675636776270; Sun, 05 Feb 2023 14:39:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 052/169] Correct SPL use of CMD_PSTORE Date: Sun, 5 Feb 2023 15:36:38 -0700 Message-Id: <20230205223836.231657-53-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 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_PSTORE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) boot/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/image-fdt.c b/boot/image-fdt.c index 408abce096f..714d05d1a53 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -638,7 +638,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, /* Update ethernet nodes */ fdt_fixup_ethernet(blob); -#if CONFIG_IS_ENABLED(CMD_PSTORE) +#if IS_ENABLED(CONFIG_CMD_PSTORE) /* Append PStore configuration */ fdt_fixup_pstore(blob); #endif