From patchwork Mon Feb 6 00:55:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737979 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=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=T9CX05Da; 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 4P97Gv6ftJz23fc for ; Mon, 6 Feb 2023 12:00:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B78786082; Mon, 6 Feb 2023 01:59:26 +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="T9CX05Da"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 73FDD85D7B; Mon, 6 Feb 2023 01:58:22 +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-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 2CE6F85CB4 for ; Mon, 6 Feb 2023 01:58:17 +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-io1-xd34.google.com with SMTP id z21so3976129iol.0 for ; Sun, 05 Feb 2023 16:58:17 -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=xqonnySBv/NGpeScSZ+TNV4gBByIkL2EImlMC0LcXkY=; b=T9CX05DanJ4JGxgxnPid9DFv1MS9VzjjVzXx/mi9daq50X0nmb1+zwX2bxfGculfYO nByzSVjhZPhHbJuLXy3qYJP2QR9aPReS17A68aOE+4aTwi8Wa/ugavttsnAqzw3edO+J EdI7lLMjp2Fs3MEdAOlLJsg8DV7zTRbveQanM= 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=xqonnySBv/NGpeScSZ+TNV4gBByIkL2EImlMC0LcXkY=; b=O+xQLvu1fFqFFh1Ov3C5EKPESUXGP4ijmkFvkSS67dZRit/p+E6NH5JqVR5cVrUkbS uxvIYpjrP75Ik/nZix+cGWfuMq+UnVk0ssKkJ/IVjoiYIs3M38dnbjPtn47HAJpzsiLc Nr9hyrHIT+FOR0XX+o5CSPMF6XMVqzNh5KFSsW7cTJ4jBcEdwvPavjd8X1QXMluuoKTY s3Otdk00OGhuO5c/HZguf/PSCd9sIjwUx6MtexQc5Q+dhPimDVX3BAJbazLxtoSx6YZJ qJDUmyfV0qq4bFkJjitwLGYBoKrN2xZ/U8Ost5CHgcavhJiC2lqj/yau4PZzGyt7iDDO qrjw== X-Gm-Message-State: AO0yUKW8jMifo113FnKlYNGcKFHYLHX2HsKy6+O2W92O7+He2z7BcOl7 VZyDjPips5xxHFVGaP1Uk8EZpSk/usmqoRcq X-Google-Smtp-Source: AK7set/9qKgAyTAz04wYWTk4+zCQ9TFLIWDlTscP8o/Y+Y2g2ctSN3MlG5smQAJ0+6PLJkc7qE8Qcg== X-Received: by 2002:a6b:da1a:0:b0:6e4:80fc:4885 with SMTP id x26-20020a6bda1a000000b006e480fc4885mr14628452iob.4.1675645096691; Sun, 05 Feb 2023 16:58:16 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:16 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 143/169] Correct SPL use of SPLASH_SOURCE Date: Sun, 5 Feb 2023 17:55:10 -0700 Message-Id: <20230206005537.254541-144-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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_SPLASH_SOURCE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) common/splash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/splash.c b/common/splash.c index 2e466a8a0f5..245ff680ebd 100644 --- a/common/splash.c +++ b/common/splash.c @@ -89,7 +89,7 @@ static inline int splash_video_logo_load(void) { return -ENOSYS; } __weak int splash_screen_prepare(void) { - if (CONFIG_IS_ENABLED(SPLASH_SOURCE)) + if (IS_ENABLED(CONFIG_SPLASH_SOURCE)) return splash_source_load(default_splash_locations, ARRAY_SIZE(default_splash_locations));