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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5426EC433F5 for ; Wed, 3 Nov 2021 14:20:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2EA2561050 for ; Wed, 3 Nov 2021 14:20:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2EA2561050 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D35683645; Wed, 3 Nov 2021 15:20:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1635949251; bh=oCUuUO+F67bbaBnA7w/sR6w1ash+EvdP7UgPIKnu6mE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pDtRTNn2mN+s/Ae3e7wXrmZgytWCiwoPa6zR8yE+3wi4EM6QtBXqz9jH2hNJHbnk8 HixbXvr08eeBhygvZUg1i/J//SY7QqvFfMAN8jySX3lnE+5TJVp2H6ftAMfESViUNv gO4+2ybJw0ncvBA5wsfDutl4g9Lr7Rn8HHhM87fmlB6CWj24SCPpf0ntGt5Ofxt0Ap pEfQJXEQwV7f5OX18w87wnPTMvnWiHRrtlHZdGLMDVMlLh+6CCP3VPbkbmLWHSR8Hu CSnp2ZpjgMsRP/17Q5qM30SnxdZnXYpS5e/v2vYeT/eRBQdy8KuuNvZapkRf68ZbW4 F4ZG/iJFCdFcQ== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 5445C8363F; Wed, 3 Nov 2021 15:20:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1635949244; bh=oCUuUO+F67bbaBnA7w/sR6w1ash+EvdP7UgPIKnu6mE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+fUoBOZazb9mZ2Wcr0CL0SKHBo7UX5vmzD02Z7Vl7WuTaacAX4KnPaKNcqv7YDEL GFpP+/nQpyY4Hpt4n+cgV6C6TlWMwVGIKcL8kX+TP0CGY3sBOYrapzOQ1smev7054Q kD1QnSqLUq6wIX7ICQ1RF9RY3rzJhbfvUWzBuq6IN3FOf02mlNvPq21evpsc+mr1B+ F2xUTDY08GGy7fhXiKHPYyhwvUtCPo1gqdluECAS7JqYUUswxyYXfMX9Sxj8v5qXJc m7/pIwykPj+Q+TM78h+LSTbKh1HmsMZLYBrrNAQ5xlSsngEXP5LazQ3XJ4jdjOA6Mu JHQfrTrD5Om5w== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Simon Glass Subject: [PATCH 2/3] bootstage: Fix up remaining bootstage config misuse Date: Wed, 3 Nov 2021 15:20:29 +0100 Message-Id: <20211103142030.14752-2-marex@denx.de> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211103142030.14752-1-marex@denx.de> References: <20211103142030.14752-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean All these macros really guard show_boot_progress() function, which is used only if BOOT_PROGRESS is enabled in Kconfig. Fix up the macro guards. Signed-off-by: Marek Vasut Cc: Simon Glass --- board/Seagate/dockstar/dockstar.c | 2 +- board/Seagate/goflexhome/goflexhome.c | 2 +- board/bosch/shc/board.c | 2 +- board/buffalo/lsxl/lsxl.c | 2 +- board/k+p/kp_imx53/kp_imx53.c | 2 +- board/st/stv0991/stv0991.c | 2 +- include/bootstage.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index fb691931580..819fc685565 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -140,7 +140,7 @@ void reset_phy(void) } #endif /* CONFIG_RESET_PHY_R */ -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define GREEN_LED (1 << 14) #define ORANGE_LED (1 << 15) #define BOTH_LEDS (GREEN_LED | ORANGE_LED) diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index 52be64fb8c2..e99335d5339 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -175,7 +175,7 @@ void reset_phy(void) } #endif /* CONFIG_RESET_PHY_R */ -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define GREEN_LED (1 << 14) #define ORANGE_LED (1 << 15) #define BOTH_LEDS (GREEN_LED | ORANGE_LED) diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index a7a9775fdf4..33edf412871 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -480,7 +480,7 @@ int board_eth_init(struct bd_info *bis) } #endif -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) static void bosch_check_reset_pin(void) { if (readl(GPIO1_BASE + OMAP_GPIO_IRQSTATUS_SET_0) & RESET_MASK) { diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index 738b6bc25ce..3544a779968 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -271,7 +271,7 @@ int misc_init_r(void) } #endif -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) void show_boot_progress(int progress) { if (progress > 0) diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c index 7c3a695cb25..81f1191633e 100644 --- a/board/k+p/kp_imx53/kp_imx53.c +++ b/board/k+p/kp_imx53/kp_imx53.c @@ -155,7 +155,7 @@ int board_late_init(void) return ret; } -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define GPIO_DR 0x0 #define GPIO_GDIR 0x4 #define GPIO_ALT1 0x1 diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 57ca9f659c1..7f1b31b654e 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -37,7 +37,7 @@ U_BOOT_DRVINFO(stv09911_serials) = { }; #endif -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) void show_boot_progress(int progress) { printf("%i\n", progress); diff --git a/include/bootstage.h b/include/bootstage.h index 8d1989ac0e5..63d338c932e 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -233,7 +233,7 @@ void show_boot_progress(int val); #endif #if !defined(USE_HOSTCC) -#if CONFIG_IS_ENABLED(BOOTSTAGE) +#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS) #define ENABLE_BOOTSTAGE #endif #endif -- 2.33.0