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 1860DC74A44 for ; Tue, 14 Mar 2023 04:52:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CBB5D86159; Tue, 14 Mar 2023 05:51:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com 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=ti.com header.i=@ti.com header.b="AOguwSdm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE3BA860F7; Tue, 14 Mar 2023 05:51:12 +0100 (CET) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9CB398615A for ; Tue, 14 Mar 2023 05:51:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=n-jain1@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32E4p5rJ091019; Mon, 13 Mar 2023 23:51:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1678769465; bh=t2tPFwh+cT66WpafwVPSl1jkPcapDHQQibdKrbQak8I=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=AOguwSdmXZZFanazrX7OzCCRJznujGuyd9J8KGR3w0uwiI8AxNc75Ay1MYBt0dw1R ACuv8+otfSODFcXl/ifDohLNRReBLOUJQIPKeOnYhws2ntBrhDvOoUh/Rx6mJxQNa8 0UN56RRynsFyjUChCy2eZyLph+px6BNhESCOLOBg= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32E4p415014391 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 13 Mar 2023 23:51:05 -0500 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 13 Mar 2023 23:51:05 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 13 Mar 2023 23:51:04 -0500 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32E4p3Nm085762; Mon, 13 Mar 2023 23:51:04 -0500 From: Nikhil M Jain To: , CC: , , , , , Subject: [PATCH 7/9] common: splash: Enable splash_display at SPL stage Date: Tue, 14 Mar 2023 10:20:17 +0530 Message-ID: <20230314045019.5671-8-n-jain1@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230314045019.5671-1-n-jain1@ti.com> References: <20230314045019.5671-1-n-jain1@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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.8 at phobos.denx.de X-Virus-Status: Clean CONFIG_SPLASH_SCREEN and CONFIG_CMD_BMP enables splash screen at u-boot proper. To enable splash screen at SPL, separate macros i.e. SPL_SPLASH_SCREEN and SPL_CMD_BMP are used instead. Use CONFIG_IS_ENABLED(#) to check for splash screen and bmp related macros, so that it checks for either u-boot proper or SPl related macros as enabled at u-boot proper or SPL stage respectively. Signed-off-by: Nikhil M Jain --- common/splash.c | 2 +- include/splash.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/splash.c b/common/splash.c index 245ff680eb..885fa1ec86 100644 --- a/common/splash.c +++ b/common/splash.c @@ -157,7 +157,7 @@ void splash_display_banner(void) * Common function to show a splash image if env("splashimage") is set. * For additional details please refer to doc/README.splashprepare. */ -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(CMD_BMP) int splash_display(void) { ulong addr; diff --git a/include/splash.h b/include/splash.h index 33e45e6941..1e4176b9ba 100644 --- a/include/splash.h +++ b/include/splash.h @@ -67,7 +67,7 @@ void splash_get_pos(int *x, int *y); static inline void splash_get_pos(int *x, int *y) { } #endif -#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP) +#if CONFIG_IS_ENABLED(SPLASH_SCREEN) && CONFIG_IS_ENABLED(CMD_BMP) int splash_display(void); #else static inline int splash_display(void) -- 2.34.1