Message ID | 20190426035922.20596-36-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Bin Meng |
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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HhpV5VIo"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44r16W5DnTz9s3l for <incoming@patchwork.ozlabs.org>; Fri, 26 Apr 2019 14:19:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 54993C21E1E; Fri, 26 Apr 2019 04:09:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 80D00C21E36; Fri, 26 Apr 2019 04:02:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 05A8EC21EC2; Fri, 26 Apr 2019 04:00:29 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 6EC37C21E42 for <u-boot@lists.denx.de>; Fri, 26 Apr 2019 04:00:25 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id y6so1870156ior.5 for <u-boot@lists.denx.de>; Thu, 25 Apr 2019 21:00:25 -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=dONQat9/ccx+PXUIWn5BMPD36i41oN5y1noJS/QTv0U=; b=HhpV5VIouFbr5NlsFfZM82GWhnkFF0xqbVQ7uEvqfK2H7/GaV1SXsFWb8lzXQzn20N 8t4qMUn7IkqlRZkxT4EZyF1gI5xgCwZW2LVK6wZtgjxocBe9elmzxBh1c/ZNvykwicl9 hY6W3T8XPyvwANtJccy2F08yk8QJDX/XwwGmY= 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=dONQat9/ccx+PXUIWn5BMPD36i41oN5y1noJS/QTv0U=; b=kAwWMV5XZRauSkUc5EbtgZYOW2doK0IjD49iiVice8dLa2jSufgO9KqJeV/LctfIPO Iwi93skU4TSm82YxiSQKlliotXgEfe5t8VzTbLLhPohPwQRWPbuAdp4j+iozTKjuSTEV L+5bTm7TpwUMUDi7g+dJ/kDqMCfpzd1LjBf8Q8mvp7k2WHG1zhoJjXHigJr1myohH02A LQ15a1alfiX3HIWQgREVem8Drt2q5+ZeQLkHw4LEHdUtc/f64hAyF8ul2Kko2yVgiD9B itnk6KtOkby0opBOnyTQH8ZnB0E0as3APMqt6wFS3bEVEhTDEgTBWXcG41KBNbNXTv1n QFeg== X-Gm-Message-State: APjAAAUBXfGFVDo7vEwJgWjBiSdHsUSnw4LHZn5uw8RHrkZ7+S4hq75T XVhmrzsmQnXiWnnpX22ITiolSoSJ3yo= X-Google-Smtp-Source: APXvYqyWh4tBrAeqrQKuUAo4i+EW6AOavturV9TnsUxFsJQl3FkMigWtAFUEm49rEyN2AT1lTK8bRQ== X-Received: by 2002:a6b:3c0e:: with SMTP id k14mr577651iob.162.1556251224322; Thu, 25 Apr 2019 21:00:24 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id m142sm5006180itb.31.2019.04.25.21.00.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 21:00:23 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Thu, 25 Apr 2019 21:59:07 -0600 Message-Id: <20190426035922.20596-36-sjg@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190426035922.20596-1-sjg@chromium.org> References: <20190426035922.20596-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 35/50] x86: Don't generate a bootstage report in SPL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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: <http://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> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
x86: Add support for booting from TPL
|
expand
|
On Fri, Apr 26, 2019 at 12:00 PM Simon Glass <sjg@chromium.org> wrote: > > This report is normally generated by U-Boot proper. Correct the condition > here so that it respects the Kconfig options for bootstage. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > --- > > Changes in v2: None > > arch/x86/lib/bootm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > applied to u-boot-x86, thanks!
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 832b1f901c6..5443a862ab5 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -35,7 +35,7 @@ void bootm_announce_and_cleanup(void) timestamp_add_now(TS_U_BOOT_START_KERNEL); #endif bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); -#ifdef CONFIG_BOOTSTAGE_REPORT +#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT) bootstage_report(); #endif