From patchwork Mon Jan 30 14:41:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734129 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=bjVS317A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4P5BL451lrz1yhq for ; Tue, 31 Jan 2023 02:04:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3825857AD; Mon, 30 Jan 2023 16:02:41 +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="bjVS317A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4204285811; Mon, 30 Jan 2023 15:58:20 +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-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 13C3B85835 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-x12d.google.com with SMTP id m8so5190298ili.7 for ; Mon, 30 Jan 2023 06:58:15 -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=/7fYJ4+9KDV/hPyZDS8B1RJJA6LA2cO6IJIKYV0G6Zo=; b=bjVS317AUgaMkzOT3uK7c4OC9eb2cN0OCnsxVWQKf03REAWooe1WD0DH0sZ9+CnKoP ELyorrxrutY0kmgCsG6MtK9cRf2sFM2c5cFIQ+kxp8dR2pVPBGX0xSBEoiu/qMroJaAe iuzHq9RLGUErzskgOopUTRedth/c2bb5GuvtI= 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=/7fYJ4+9KDV/hPyZDS8B1RJJA6LA2cO6IJIKYV0G6Zo=; b=P60QZmV0Q6iimcd9yA93YVNRXK+GvfRkzBWGYKM1Kb9AyhXDVBVsp7tcDovERq/JoB rVuSzgJDOGzKvkMZOZcR/CadUPXzBju7Z1okOsX8jiv//vO366Qt6FQ4+EwypqzqBZCV OZwvKExZSD5LIx0MyAR4uOfKIqrRlmBdH78dWQiRG003X6YVbxRl406nmjtMoGkUtvU/ oFTlHlS8wuE/bRGY4CUkRbOmbHeO3luyFCzA7SrP+/+Ta975wq1fmYIqKOuDv+jLS743 rpHIGIzoGCQPl2PReGnGmcBZV6D6LhEwhBkfAqcO3Gg5UgTezFQxL2bZHAYYpLT50sSO FvVQ== X-Gm-Message-State: AO0yUKWcyeGBUz30DZ3852diLADvPJf/HtRaaF4f2+bGYXaxo9XNBEgi Y5qVG184fZVmefIy5VhZFK/vHuZhMB/ejRBG X-Google-Smtp-Source: AK7set/wZbu91+0/37SrfBYBeQT5BP1Dbe+RQyZXH6oLd3+ZZ2Y30ZtHFqfqRm642D0qWx/pQEgcWQ== X-Received: by 2002:a05:6e02:1b81:b0:310:be09:7aa6 with SMTP id h1-20020a056e021b8100b00310be097aa6mr12730746ili.13.1675090694677; Mon, 30 Jan 2023 06:58:14 -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:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ramon Fried , Viacheslav Mitrofanov Subject: [PATCH 073/171] Correct SPL use of EFI_APP Date: Mon, 30 Jan 2023 07:41:46 -0700 Message-Id: <20230130144324.206208-74-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 1 usage of this option to the non-SPL form, since there is no SPL_EFI_APP defined in Kconfig Signed-off-by: Simon Glass --- lib/vsprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8de3882fb6c..2d13e68b579 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -629,7 +629,7 @@ repeat: case 's': /* U-Boot uses UTF-16 strings in the EFI context only. */ -#if (CONFIG_IS_ENABLED(EFI_LOADER) || CONFIG_IS_ENABLED(EFI_APP)) && \ +#if (CONFIG_IS_ENABLED(EFI_LOADER) || IS_ENABLED(CONFIG_EFI_APP)) && \ !defined(API_BUILD) if (qualifier == 'l') { str = string16(str, end, va_arg(args, u16 *),