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 33EE6C54EED for ; Mon, 30 Jan 2023 15:04:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA0FB85857; Mon, 30 Jan 2023 16:02:45 +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="eulYSa0d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E97A857F7; Mon, 30 Jan 2023 15:58:24 +0100 (CET) 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 C83FF85839 for ; Mon, 30 Jan 2023 15:58:16 +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 w13so1113325ilv.3 for ; Mon, 30 Jan 2023 06:58:16 -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=u/nSdnkv5StJSDKg1yPg5+3mi39GnUHICESwzjradNw=; b=eulYSa0dgCnsLPyRGTTRYGBMuvSAPwhl2m57AXsFgI3hPiLTv9ft9lrnjJv/FReYui s6mAY5W1e3iObsjGeS5wy7suqyPEtWLlut82g2TYqgutKzDfD0SeKZA3fOye+EWFHG3F x6lsuxBUb3ma3n4su31vfO6Ani21s4NjWn1lk= 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=u/nSdnkv5StJSDKg1yPg5+3mi39GnUHICESwzjradNw=; b=VvgT4R1I4u7U/gUb7yjI4D0aBVIab9drRkuls/AKxJxm8E/8I5JClO5Ny1fDQuB6MQ 5y/k1UP1DIQm8KJCVVm2z891eBXBmM3CLW2cvHaN5YGezpocusDA+SHybQrLATsC8Woj C2EjwP/C0Upjkk3BqTpTaetLM1gB79bLiQ4xMx19+cXL6JsLvmuvhID35nZKjOZ2estd eK3nG0ShtEDLKQEzZbe8vIMQbMgjZj/sYwDSplyjeXWPr2kknCMvo4eGd5C2bO3WDTAM hYqbe7m9LEYF8LhhbaM1vRd+wOel6CEvyjNalrEoTgXfIaGQFWztaLfpW4x+zNV/5xKj GMqg== X-Gm-Message-State: AO0yUKXqVlkDBBsx5yT1mEnla6gATUp2RajmpIHAt4Mhol73eU/eRJXn REfEfHMVgHY/K7jJsgLeaHN4277RAfTEH/8o X-Google-Smtp-Source: AK7set/cXoi4XL+koqJ9mUT4C589Bnk+wWLWhOFeQisUDU3TqaKEZ7XT2pRAiUTFHhmSkbx5dtUU5A== X-Received: by 2002:a05:6e02:1d02:b0:310:e889:c53e with SMTP id i2-20020a056e021d0200b00310e889c53emr5556647ila.5.1675090695423; Mon, 30 Jan 2023 06:58:15 -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.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:15 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 074/171] Correct SPL use of EFI_DEVICE_PATH_UTIL Date: Mon, 30 Jan 2023 07:41:47 -0700 Message-Id: <20230130144324.206208-75-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 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_EFI_DEVICE_PATH_UTIL defined in Kconfig Signed-off-by: Simon Glass --- lib/efi_loader/efi_root_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index a4eb6f493dc..09699b2968f 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,7 +58,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_to_text_protocol, &efi_device_path_to_text, #endif -#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_UTIL) +#if IS_ENABLED(CONFIG_EFI_DEVICE_PATH_UTIL) /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, &efi_device_path_utilities, -- 2.39.1.456.gfc5497dd1b-goog