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 45048C636CD for ; Sun, 5 Feb 2023 23:04:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23BD585D16; Sun, 5 Feb 2023 23:56: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=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="A9rAWVAu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 88FFA85B42; Sun, 5 Feb 2023 23:53:37 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 7B1BB85B4E for ; Sun, 5 Feb 2023 23:44:36 +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-xd2f.google.com with SMTP id o1so3884135ioo.10 for ; Sun, 05 Feb 2023 14:44:36 -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=WEYwfimSTJeRijiKwiBciQJDGLZAR9TKAVXXb51uIdE=; b=A9rAWVAuewIDzOFthlBoFwLSQKZDCUm2xDnNQCbW88y6hrPycCpy6FJs9+thBN2yxK 8pDtBjtPQdG7SadZHj8gY5AkBwozohBkK4Fo08xPgpYuauDRD6SQ0od+GlQ3uEu0lLl6 sVaFCGF5ybiP+NrYD7VEIgt1WJNt1Pb7bn9vQ= 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=WEYwfimSTJeRijiKwiBciQJDGLZAR9TKAVXXb51uIdE=; b=Ix59IlTGkEAAV51w+Zl91xlr/LyRgtRGR8o4yHlbSVHCRmv8DdKnAMg3mWUj1rIXIw TKWEJ2E9i9uSAKwIXNrQmI9Tl/d71PpIm3PtexTs+onzc+weIUSZ6/S5z5xiDBiVd+g/ R5mx3DOc/SDOI1XNNbYa9G6/chHS39AnfJTM/M62+XIFYnahPSAGfyYgCXngsZlsOasr Y8vfyaFThQYEsYeHubdFX3iQ8I9xWuptldq5Q/EwcfISD4g64UK02nXvuLhPRwS/rwhB Hw52ttukrSWEoiG1N4QXN0YsGHuA0+KEwaKF4Ppw/KzqUR64xma+rgimUS0VXerd6MGN su5w== X-Gm-Message-State: AO0yUKXr8wYgqrVks0+XdI+XMu1qyUfTIH+vT3dcG0MM0+sM5QENeS9l HrUmUshaHiuhgaxCMpuPAERUqzpPlqJaIGg6 X-Google-Smtp-Source: AK7set9ZDXVEMMFIc1HpyJqN9jqN3Mm1rlUXGtKAWXkpq3v2KkBYLqPMkioqpLZG1kTFUz9v082N+Q== X-Received: by 2002:a5d:8e0c:0:b0:729:63de:4546 with SMTP id e12-20020a5d8e0c000000b0072963de4546mr6733058iod.3.1675637025764; Sun, 05 Feb 2023 14:43:45 -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 z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 147/169] Correct SPL uses of SYS_LONGHELP Date: Sun, 5 Feb 2023 15:40:56 -0700 Message-Id: <20230205224118.233425-148-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 5 usages of this option to the non-SPL form, since there is no SPL_SYS_LONGHELP defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) cmd/bootcount.c | 4 ++-- cmd/cpu.c | 2 +- cmd/dm.c | 2 +- cmd/ti/pd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 654bbb805c1..3898d2543d2 100644 --- a/cmd/bootcount.c +++ b/cmd/bootcount.c @@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char bootcount_help_text[] = "print - print current bootcounter\n" "reset - reset the bootcounter" @@ -55,7 +55,7 @@ static char bootcount_help_text[] = U_BOOT_CMD(bootcount, 2, 1, do_bootcount, "bootcount", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) bootcount_help_text #endif ); diff --git a/cmd/cpu.c b/cmd/cpu.c index a09736e1bb9..314852440f1 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char cpu_help_text[] = "list - list available CPUs\n" "cpu detail - show CPU detail" diff --git a/cmd/dm.c b/cmd/dm.c index 979cd36061e..3263547cbec 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc, #define DM_MEM #endif -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char dm_help_text[] = "compat Dump list of drivers with compatibility strings\n" "dm devres Dump list of device resources for each device\n" diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c index 008668fd903..a9a182fc386 100644 --- a/cmd/ti/pd.c +++ b/cmd/ti/pd.c @@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv U_BOOT_CMD(pd, 4, 1, ti_do_pd, "TI power domain control", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) "dump - show power domain status\n" "enable [psc] [lpsc] - enable power domain\n" "disable [psc] [lpsc] - disable power domain\n" -- 2.39.1.519.gcb327c4b5f-goog