From patchwork Mon Oct 21 07:24:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1180367 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="ZgHLpvUQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46xSnY4yyVz9sP3 for ; Mon, 21 Oct 2019 18:24:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4216BC21C93; Mon, 21 Oct 2019 07:24:30 +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=RCVD_IN_MSPIKE_H2, 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 E0A3EC21C6A; Mon, 21 Oct 2019 07:24:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8844DC21C6A; Mon, 21 Oct 2019 07:24:27 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 2F61EC21BE5 for ; Mon, 21 Oct 2019 07:24:27 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id r1so2759059wrs.9 for ; Mon, 21 Oct 2019 00:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=r2I+aEpJTUXrLLCgCS0hLWIf/bRjSk462SkRT8xu0zs=; b=ZgHLpvUQV83Xgr1c6H1pIS+v/TrX5A+Z+wnAsfQJCfRjgXaqEsw773GPm1JSDhizvW kPMZRlqx/yYQzx6oXs1pkfPy9rz1rfjR3sD6RBeyLTNiUCZtCdchFXDCkJRDU2GbGXRW L4GbQCJs8fH8sGHIesmErUrpc7AKcqUJW1Cr5UvrHj5BpT7wu+05KoE9gOUFPJD+N3Z+ sA8RWVagX5aWL2Gb6LNdbJxYSdmb94oPlUkyDWEqix3H9WwmiDkRWpa1rCFpgPBUpRRU jZIyyqgzb/niCJuO9uPEBQnrNKnJxJCBIKD2vuhtwTQJhF0xsWxNBIlxtBqZs0nBwtZv XHjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=r2I+aEpJTUXrLLCgCS0hLWIf/bRjSk462SkRT8xu0zs=; b=Vq1vPnpEC0oZhItn62V5kJ1ybBO6RpWXtkCzaczYZbsLwOQ2IY+bpDBNWH8XFPWntT Z2fWYHfynguGZe4YwoZysA6/dda/E2QusA0PuI882HVEl3T9EGcWK5SwHjjMvTZch4eQ 6LaiAi2+jbuw3kHQO9LJJFzS7PM5kQJedTfRvJYXgr6cG5KjSf6t19atQuoVmM505MDq Rjf9z01Af21yC5xSBrQCxlDJm9Nec0/0GEPmFcIG36AmJVn/Af6AyAizeXcTF3vJKBFe xwXE5/tMPQi4v/eO3hXQYK0Ux2mhOtD6UQjjEoQvHbMo9hGEmlrS1SUEY9fNk/XOATvg Ew6Q== X-Gm-Message-State: APjAAAV8Eel7OCvhzL2Yb6ePXeueNAV9cEg4KYzFRYw+bLwkpslPT2Om Zmont9FhfRrGp7UZuExxO45ryeovoMKUrA== X-Google-Smtp-Source: APXvYqytqnM8OTDmBdP5TaSn2ywC9rql8NSsXtnCebgvvfbQI+/+nJo2O/KkB8d+BvORaGrn3P7O0Q== X-Received: by 2002:adf:f010:: with SMTP id j16mr18866429wro.317.1571642666404; Mon, 21 Oct 2019 00:24:26 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id o6sm5263120wrx.89.2019.10.21.00.24.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 00:24:25 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Date: Mon, 21 Oct 2019 09:24:24 +0200 Message-Id: <2635f02b9f861179836e1b837c66df544332eed5.1571642660.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.17.1 Cc: Joe Hershberger Subject: [U-Boot] [PATCH] microblaze: Unify Linux bootm process X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Record two bootstages and add "Starting kernel" message to have standard handoff message between U-Boot and OS. Also use debug() instead of #ifdef DEBUG to clean the code. Signed-off-by: Michal Simek --- arch/microblaze/lib/bootm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 5650109d6313..01c5d57bc5b0 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -66,12 +66,15 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) thekernel = (void (*)(char *, ulong, ulong))images->ep; -#ifdef DEBUG - printf("## Transferring control to Linux (at address 0x%08lx) ", - (ulong)thekernel); - printf("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n", - cmdline, rd_start, dt); -#endif + debug("## Transferring control to Linux (at address 0x%08lx) ", + (ulong)thekernel); + debug("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n", + cmdline, rd_start, dt); + bootstage_mark(BOOTSTAGE_ID_RUN_OS); + + printf("\nStarting kernel ...%s\n\n", fake ? + "(fake run for tracing)" : ""); + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); #ifdef XILINX_USE_DCACHE flush_cache(0, XILINX_DCACHE_BYTE_SIZE);