Message ID | 20210123103623.v2.8.I09042143f90134809dba84ba6d676284eaabb87e@changeid |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=<UNKNOWN>) Authentication-Results: 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=Ru8uh3i1; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DNNdG4tLQz9sVt for <incoming@patchwork.ozlabs.org>; Sun, 24 Jan 2021 04:38:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 09F1382ACA; Sat, 23 Jan 2021 18:37:07 +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="Ru8uh3i1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4AA1282A64; Sat, 23 Jan 2021 18:36:53 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) (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 74B3382A4F for <u-boot@lists.denx.de>; Sat, 23 Jan 2021 18:36:49 +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-pg1-x52d.google.com with SMTP id c132so6068167pga.3 for <u-boot@lists.denx.de>; Sat, 23 Jan 2021 09:36:49 -0800 (PST) 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=GBWds7QBAnrqrdn3zGGoHak3H8BcnsahVulqqFFjR/o=; b=Ru8uh3i1MxR9s+uU8Q9ljYoLd76DyH15X/L+2EyA3dsWkz/EyeWxkDSJd4NCh2aIOC sxZ69fnpkQ8RO/f8GE1LtxFdQINjlODfAUPXx7Lrn5agiJ7fCgPWouKgObHTHIeo9VSz 6IlRzu1lVd+2Hrs4THy4EOv/a0ORxSBrpXaUo= 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=GBWds7QBAnrqrdn3zGGoHak3H8BcnsahVulqqFFjR/o=; b=C6t29f37J+fiB6UKb4VWOcmlCW9BjdX5lyiPnbSHcnOI+Qsx1gsa2gKmY9e27e5R9e cnWg7P8FQk+Zxia+6zaE7KpfwVeJS8NE3SDCwbBzEvH9AqnfPdgJ9kHRxdSdcPyW65ns ege0zBv8XfLyNM5w8pQa+KAduAmYdF5uMcWxa51jfA8oDEtFVn2G6cKqBAA0KN4a6ixL DTNI+J+GCughOJqC3x1nSVqjPAEwov57g43zs+ae04AIqrMXmdMjL2N1uGgkOoMtQhiD Eb2YjZZ3si6r0I+dIHVZ1YlS9H4AqZCIZc+1c0o7RbtH9SAL6VPo3lwXZV7AVE7D/quZ DukQ== X-Gm-Message-State: AOAM533AxLBtbpQZnNKEq/HJuGt11bKgJE6CrRVf/6QlxZB1ZzjIIAEa qsB63Du1pKmoiLNy2PQEeoX/suq27njvxCAl X-Google-Smtp-Source: ABdhPJw781MFUasxELOEx1m0NPyb40AAxaxdVfDGds8f/nkSQTqf41ITi12uZG7gnB8U8w1lbSU2aA== X-Received: by 2002:a63:fc56:: with SMTP id r22mr7424494pgk.3.1611423407821; Sat, 23 Jan 2021 09:36:47 -0800 (PST) Received: from sjg1.home ([2600:6c4c:507f:f8e5:0:ec6e:a61e:6ad]) by smtp.gmail.com with ESMTPSA id t8sm12408250pjm.45.2021.01.23.09.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 09:36:47 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <sjg@chromium.org> Subject: [PATCH v2 8/8] bootm: Fix duplicate debugging in bootm_process_cmdline() Date: Sat, 23 Jan 2021 10:36:27 -0700 Message-Id: <20210123103623.v2.8.I09042143f90134809dba84ba6d676284eaabb87e@changeid> X-Mailer: git-send-email 2.30.0.280.ga3ce27912f-goog In-Reply-To: <20210123173627.2916025-1-sjg@chromium.org> References: <20210123173627.2916025-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
Various minor fixes
|
expand
|
diff --git a/common/bootm.c b/common/bootm.c index 8298693900d..48a5b04cd7a 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -585,7 +585,7 @@ int bootm_process_cmdline(char *buf, int maxlen, int flags) if (IS_ENABLED(CONFIG_BOOTARGS_SUBST) && (flags & BOOTM_CL_SUBST)) { ret = process_subst(buf, maxlen); if (ret) - return log_msg_ret("silent", ret); + return log_msg_ret("subst", ret); } return 0;
These two returns use the same string so are not distinguishable with LOG_ERROR_RETURN. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) common/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)