From patchwork Mon Aug 13 09:24:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 956892 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oPOk8N8x"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41pr0G2FLSz9s0n for ; Mon, 13 Aug 2018 19:24:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B511EC21E6A; Mon, 13 Aug 2018 09:24:15 +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=FREEMAIL_FROM, 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 E0304C21CB1; Mon, 13 Aug 2018 09:24:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BEB44C21CB1; Mon, 13 Aug 2018 09:24:11 +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 62B24C21C93 for ; Mon, 13 Aug 2018 09:24:11 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id b15-v6so13606328wrv.10 for ; Mon, 13 Aug 2018 02:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nxoDhE6Sf2b3+h7Jlfk/2+EZ54E20RW9Hah6OLfg+QA=; b=oPOk8N8xYPghgReBoNBvnwrqS7NZ2jz/b2CO/YC+kFXhqEfD6RucIiQGvKht8D0TzH V1nKtdJjJ00Q5bROgSrquXiTeAX4/SzXrw9Pp77OMKDKrAYqlzm3Ziei2qAKo2Cdb9tw tqe/yYQvIOOag0CgYfTnApHAPpwqoSitpYdM5NAEjlpzCmns7Np4TrMTNdKD2BDkeow6 c/JZbE3kHI0E3uKfY0dovfqAYl1DtMmg5rVILPI5j6T1eR469cHzw2II2Ox0wqORQof4 +fgeCe2WTpLkFoLiN5x7Z6Gti+b6TJCJJosYXOlXeqBXA4DA8BKm5a+NiDHPst27kSPo StaA== 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; bh=nxoDhE6Sf2b3+h7Jlfk/2+EZ54E20RW9Hah6OLfg+QA=; b=ZP08b0ag4TZgo20GkgY8HUw8UL724uqez2mHA5TV60dDkVLao1MtK6+N3IewWh9yDI vIZNZ/88PuI/M0or00HPECcgah85ClISA4DHunJLvXDusItKOdrpKup2ic9GLDVmbW0y tWs6f9x1DNBMcpunzPjQhT8nELdOW7D08RheG3jzGYT38EFo+eTlmHakCbIBMifj5Idp McJVm5HiDOpQXaYibYMRZ5lA5aeBWMPninPojWbneVXTipLoL+aErDStU2YB5VQ98IbA B1A1RePwSuhe/BtRtT6GthOGKdP9c99zGEMXX1Nsg1tpyv5F3uOhGi/bTfnyvS0ArFSu NIIw== X-Gm-Message-State: AOUpUlHZYHu5CSJ8A8lIOog/yeSXKmdguKiUBxoeC6qTsSNLqD25QMwB weKIIvz7xzIMf8Sbi71TfDg= X-Google-Smtp-Source: AA+uWPxWlIHxYhGf1scawap3oKENjweShRyvMGqN5zUEGfXi4tVLPPQDCW51lSNqWycnoITmbQGPqg== X-Received: by 2002:adf:820a:: with SMTP id 10-v6mr10381440wrb.144.1534152251088; Mon, 13 Aug 2018 02:24:11 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:542c:ff11:9c97:a518]) by smtp.gmail.com with ESMTPSA id i205-v6sm12733069wmf.30.2018.08.13.02.24.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 02:24:10 -0700 (PDT) From: Simon Goldschmidt To: Tom Rini Date: Mon, 13 Aug 2018 11:24:05 +0200 Message-Id: <20180813092405.3563-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Marek Vasut , u-boot@lists.denx.de, Miquel Raynal Subject: [U-Boot] [PATCH] spl: fix debug print in spl_common_init() 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" spl_common_init() debug-prints "spl_early_init()\n" but it is called both from spl_early_init() and spl_init(). Fix this by moving the debug() statement to the calling functions which now print their name. Signed-off-by: Simon Goldschmidt Reviewed-by: Philipp Tomsich --- common/spl/spl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index eda84d0c74..19508c7168 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -317,8 +317,6 @@ static int spl_common_init(bool setup_malloc) { int ret; - debug("spl_early_init()\n"); - #if CONFIG_VAL(SYS_MALLOC_F_LEN) if (setup_malloc) { #ifdef CONFIG_MALLOC_F_ADDR @@ -366,6 +364,8 @@ int spl_early_init(void) { int ret; + debug("%s\n", __func__); + ret = spl_common_init(true); if (ret) return ret; @@ -380,6 +380,8 @@ int spl_init(void) bool setup_malloc = !(IS_ENABLED(CONFIG_SPL_STACK_R) && IS_ENABLED(CONFIG_SPL_SYS_MALLOC_SIMPLE)); + debug("%s\n", __func__); + if (!(gd->flags & GD_FLG_SPL_EARLY_INIT)) { ret = spl_common_init(setup_malloc); if (ret)