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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AC32C4338F for ; Sun, 1 Aug 2021 21:13:14 +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 E482060EBD for ; Sun, 1 Aug 2021 21:13:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E482060EBD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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 58D2D832F6; Sun, 1 Aug 2021 23:12:59 +0200 (CEST) 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="HemMTJfV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 556AF832D4; Sun, 1 Aug 2021 23:12:56 +0200 (CEST) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 AD863832D0 for ; Sun, 1 Aug 2021 23:12:52 +0200 (CEST) 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-oi1-x233.google.com with SMTP id 21so21753539oin.8 for ; Sun, 01 Aug 2021 14:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AXNKCWOVad78knpCLrjyOjijP7dNz61MGLdiZ1Ik2d4=; b=HemMTJfVv6tMd6RpM4pg07y0I+Gv1+qoWwrbzyLlJ4LXa1Vzy5bCc7VJDCTYnkmmDH C+36+vgtcnA2VuNy0pJ50beH3kvQW0QyX0uUiMLm9+TY+wzzwE3ReA+4T7Cf6bCBOnpe 6W0gtP56tgm+FFNc2yKaPOu4zE7teASF2qZlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AXNKCWOVad78knpCLrjyOjijP7dNz61MGLdiZ1Ik2d4=; b=KqQoONQ9hGiGrWRf1xIUUkjlb7OrYtPwxzqgFkVYHUvENEQ36iAFr5mBEH8/xo0qF/ uuqNMi+wfBD1UsrbN97++AAhzox6fL/kaTOnI0Eck/k5o7dvbr5WXsme6E8otEWpcvuA laSImwi1JG5/7Ld/49iNlCsyEfeIbtgKV9XS6i3keORQnF5E1+SxbBURfdd17a7AhFD0 kWZjuN0ClGRZoDiw6szr87nWsnGxJNKyYweVI5t0WYIz8mnA5Xalv2BxMVM1wN+VALUT ifWkyvS+5k+prZA4sFNAvIS3o9eyUmXuJDge50uaa8jwRklEQgrrJyhUCxXzQfCv0JFH tfpg== X-Gm-Message-State: AOAM53018xH7PgydRd7Sul+uTBtNIBSvzRPQEn7s2kPPanskt8RCw4Fj hCUvfWVDuw/GbeBALy0xCOhjDCvNcKuLlBWI X-Google-Smtp-Source: ABdhPJx2DjCnm+CB3bYriE84omvQy7uVO5XeQdTfGXSmxUPdtvuQEQFU1+tUObtd29clCPxJ35jbzQ== X-Received: by 2002:a05:6808:f07:: with SMTP id m7mr8420332oiw.150.1627852371205; Sun, 01 Aug 2021 14:12:51 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id i188sm1446105oih.7.2021.08.01.14.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 14:12:50 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Jagan Teki , Simon Glass , Mike Frysinger Subject: [PATCH v3 2/4] sf: Tidy up code to avoid #ifdef Date: Sun, 1 Aug 2021 15:12:43 -0600 Message-Id: <20210801211245.2208037-3-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog In-Reply-To: <20210801211245.2208037-1-sjg@chromium.org> References: <20210801211245.2208037-1-sjg@chromium.org> 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 Update this code to use IS_ENABLED() instead. Signed-off-by: Simon Glass --- (no changes since v1) cmd/sf.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/cmd/sf.c b/cmd/sf.c index 46346fb9d43..d4f5ecee38c 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -384,7 +384,6 @@ static int do_spi_protect(int argc, char *const argv[]) return ret == 0 ? 0 : 1; } -#ifdef CONFIG_CMD_SF_TEST enum { STAGE_ERASE, STAGE_CHECK, @@ -394,7 +393,7 @@ enum { STAGE_COUNT, }; -static char *stage_name[STAGE_COUNT] = { +static const char *stage_name[STAGE_COUNT] = { "erase", "check", "write", @@ -548,7 +547,6 @@ static int do_spi_flash_test(int argc, char *const argv[]) return 0; } -#endif /* CONFIG_CMD_SF_TEST */ static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -582,10 +580,8 @@ static int do_spi_flash(struct cmd_tbl *cmdtp, int flag, int argc, ret = do_spi_flash_erase(argc, argv); else if (strcmp(cmd, "protect") == 0) ret = do_spi_protect(argc, argv); -#ifdef CONFIG_CMD_SF_TEST - else if (!strcmp(cmd, "test")) + else if (IS_ENABLED(CONFIG_CMD_SF_TEST) && !strcmp(cmd, "test")) ret = do_spi_flash_test(argc, argv); -#endif else ret = -1; @@ -597,16 +593,8 @@ usage: return CMD_RET_USAGE; } -#ifdef CONFIG_CMD_SF_TEST -#define SF_TEST_HELP "\nsf test offset len " \ - "- run a very basic destructive test" -#else -#define SF_TEST_HELP -#endif - -U_BOOT_CMD( - sf, 5, 1, do_spi_flash, - "SPI flash sub-system", +#ifdef CONFIG_SYS_LONGHELP +static const char long_help[] = "probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n" " and chip select\n" "sf read addr offset|partition len - read `len' bytes starting at\n" @@ -622,6 +610,14 @@ U_BOOT_CMD( " at `addr' to flash at `offset'\n" " or to start of mtd `partition'\n" "sf protect lock/unlock sector len - protect/unprotect 'len' bytes starting\n" - " at address 'sector'\n" - SF_TEST_HELP + " at address 'sector'" +#ifdef CONFIG_CMD_SF_TEST + "\nsf test offset len - run a very basic destructive test" +#endif +#endif /* CONFIG_SYS_LONGHELP */ + ; + +U_BOOT_CMD( + sf, 5, 1, do_spi_flash, + "SPI flash sub-system", long_help ); -- 2.32.0.554.ge1b32706d8-goog