Message ID | 20211217194059.858580-4-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Heinrich Schuchardt |
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: bilbo.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=E1BOEz80; dkim-atps=neutral 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>) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JFzrq1d1Nz9sXM for <incoming@patchwork.ozlabs.org>; Sat, 18 Dec 2021 06:42:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A1B083787; Fri, 17 Dec 2021 20:41: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=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="E1BOEz80"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CBEBD8377B; Fri, 17 Dec 2021 20:41:33 +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.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 14DFF8375B for <u-boot@lists.denx.de>; Fri, 17 Dec 2021 20:41:27 +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-il1-x12c.google.com with SMTP id d14so2500339ila.1 for <u-boot@lists.denx.de>; Fri, 17 Dec 2021 11:41:27 -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=RNglBiSvoBYFxOs016qVH8c6rUV0/5sIoEgWYpgjmrM=; b=E1BOEz80h4Pcsesxm0CXwp9eHuOB6E2K/83gtvuVFFInfrHmRzR/ww/goXdSqkNsfY TisRxmwWhElfIj3ujmHNPDaxsPk4dUBET6Hsl3NAJkjuLcAiAzsUu+NLX8n0Svqkcu6Y VlZ5vVOJk+fSrnZLpeibfRmSf19SagTQ0W8HY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RNglBiSvoBYFxOs016qVH8c6rUV0/5sIoEgWYpgjmrM=; b=o04on2/t7nMDoqGP+V3pVyzqv8lnSa61VDxgXdrgWtsUXszVj3jE1cveINuDnTXU90 lxi18BcKFhO85DYDB9jcw87KUbLA9gQxrG0mEZ9i95GNTO2xe7ZU93+/B+ZfJj4KYSer x3aHU7phXRmKYiiEq2aP5v7NWA/fD92riBjdBooAPoq71344pZbhpXsfZqVQw8wtBmKz IeHFKE+cGXMOV/DPnHaIM0wX/A5JQ4QygfNPKIG+bEdhzHb5hluqAn6kzaj8LUWw8Vf+ EEGJt2GTneLPYq9DVYELFCGdMQ3Q+Emgi/H5OkpT+KKmg7YvTsoQsrYAV3DunZhmpq7V bK2A== X-Gm-Message-State: AOAM533pvx+S2XQtmcjkQVw1EM9wbyGFZ3R420GCQ9f4FHgUyY5jmRmu O/JvEI84tIk96L7+xzvHz8xypd9kH3VeYQ== X-Google-Smtp-Source: ABdhPJzinvackoYkfYU3UuT/u65lRRjzOgBUhiXDzOivXxnLBnT0ajYAzIF1Z++8OzgUIwq7kMZ02g== X-Received: by 2002:a05:6e02:12ce:: with SMTP id i14mr2438001ilm.99.1639770085785; Fri, 17 Dec 2021 11:41:25 -0800 (PST) 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 w19sm6079605iov.12.2021.12.17.11.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Dec 2021 11:41:25 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Tom Rini <trini@konsulko.com>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Christian Melki <christian.melki@t2data.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v6 07/27] x86: Don't process the kernel command line unless enabled Date: Fri, 17 Dec 2021 12:40:39 -0700 Message-Id: <20211217194059.858580-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog In-Reply-To: <20211217194059.858580-1-sjg@chromium.org> References: <20211217194059.858580-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
efi: Improvements to U-Boot running on top of UEFI
|
expand
|
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 7ce02226ef9..9cc04490307 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -365,11 +365,14 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, strcpy(cmd_line, (char *)cmdline_force); else build_command_line(cmd_line, auto_boot); - ret = bootm_process_cmdline(cmd_line, max_size, BOOTM_CL_ALL); - if (ret) { - printf("Cmdline setup failed (max_size=%x, bootproto=%x, err=%d)\n", - max_size, bootproto, ret); - return ret; + if (IS_ENABLED(CONFIG_CMD_BOOTM)) { + ret = bootm_process_cmdline(cmd_line, max_size, + BOOTM_CL_ALL); + if (ret) { + printf("Cmdline setup failed (max_size=%x, bootproto=%x, err=%d)\n", + max_size, bootproto, ret); + return ret; + } } printf("Kernel command line: \""); puts(cmd_line);
If the 'bootm' command is not enabled then this code is not available and this causes a link error. Fix it. Note that for the EFI app, there is no indication of missing code. It just hangs! Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) arch/x86/lib/zimage.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)