From patchwork Thu Nov 5 09:09:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394813 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=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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=Cr9LPPlv; 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 4CRd7M394Cz9sRK for ; Thu, 5 Nov 2020 20:11:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7028382541; Thu, 5 Nov 2020 10:11:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com 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=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="Cr9LPPlv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E710F8253F; Thu, 5 Nov 2020 10:10:55 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::627]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B88A082364 for ; Thu, 5 Nov 2020 10:10:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N7c2/EYhexJhcS0plOFbXIUuHq+E2L1z+rz4Swyil+ropOtwP0o4yfD95OxZiNMYmXc3E6aqtdahsKE4Bkt8oeHiVgYUq1dpiEkDMvHNNKWABvAqZiCaN6R0ZHZ8vlPBTKZXFsFaopPYCDLKaO4K7ih7hQ/gx7O1OsBeytbI1DaJfJz3+yIxX7ztkXuSlEFBXCkGn0x9YV/wlwZotlrD4lb2YNu1a1v7NU7xXak19E0Lc+53iiSZhcGvPiBdXmxhDmpByUf5UYZZ0GhlCWqVvS5Vn3vlYk4Tb6X6Z6XSgUF4vQVa1RZoBX9otYILhsHGA0043HpTmUH17n8Uo/p5bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1oYF43woGOsiyuiOYSQl2abfkgwKNtqpYpwx5LbPTcM=; b=hZlz6U488Qzuf85BOwfZXUYDsc1yeEuvfe9XW4NIMPaPYUnSfmeijUoQ5RukX27wJqOYkG8blEpaFwIuFakncYz8rWXkAsky+LPbb/osfwoa0mUzqgG4UQ50GtRQ8N9Qf1ow8A6GgbpTvY+qb8l6DtdyoLjXmgA8X4L1eFyU3pfciXXCmUOubvPYsTlR8022Th7DQVj94FaqkJAdkztSInTkOP1PxgfGMPcmszn/X3lvI8UVxLAxRoxF3kjvbTcNo79HaQ0elwD3Mv9PxvhlTk0PRm0slLs5MpNrTYxJoNEbchvKs1CCBGdRQZF3j9anR7vIs7gL1iJ9Tw0dNeN6yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1oYF43woGOsiyuiOYSQl2abfkgwKNtqpYpwx5LbPTcM=; b=Cr9LPPlvl6mWRD7yPYfIhmBK0iM34Va+sH1XdJ7s2IUEFHGQf843FZL7eqsp9R7uQKwpf4smtTobYZQwBC2eFwG4iicSzpbk1aAG+nTBhsZ9RYrPlo7EX2cLRqZ++WvIJDx20DJ3u69WVRvC1nJuM3qScCdepSP7+O0YYaCgXKY= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4333.namprd11.prod.outlook.com (2603:10b6:208:195::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Thu, 5 Nov 2020 09:10:46 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df%5]) with mapi id 15.20.3499.032; Thu, 5 Nov 2020 09:10:46 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 05/18] common: board_r: Drop initr_console_record wrapper Date: Thu, 5 Nov 2020 11:09:42 +0200 Message-Id: <20201105090955.29641-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201105090955.29641-1-ovidiu.panait@windriver.com> References: <20201105090955.29641-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Thu, 5 Nov 2020 09:10:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c2d718a-5bbb-4cf7-1205-08d8816aae32 X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:361; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: frqNNuruHAfolDnEsL8sbmGCRV3skmbIAKNVU/qQKUTIF7UGmuB/HwWA+xA9IYwoDHAH1BZ8Nwfe6RkZHHSL+Rfud0VrDLohS/uicmN4wc70KhGAzs9rFEEdk5y0iADo2s3FqViNtJfQiUCQ4kTSG3v8VteZKdLSlykhqzAqeKvgHwaZ8z0zghvEZeMM4NXQ9oPmKE2SWdlDJ8Cs6Zs/sPoE7wT7Wbh4dEFXJkViT1XISdNXCxBhSAUZsqP0yw8CWj1lRWkDYVo/s7/jQlohdwoi8gTVxJ/4JV7vVJo7yBhtxa5kCKEz0KJPj1t3mIVV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(39850400004)(346002)(396003)(376002)(83380400001)(2906002)(66556008)(36756003)(66476007)(66946007)(6916009)(478600001)(4326008)(8936002)(6666004)(16526019)(26005)(44832011)(6506007)(5660300002)(86362001)(8676002)(4744005)(6486002)(6512007)(1076003)(186003)(52116002)(956004)(2616005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Oexz9xXPMyB4JZYeVPxesojxZq9jiauafnO+Cuw/IpvQbPL86tDzrP06vC6tNRlnGRz+SMENhHc+66zTCVBjEjFA85gI7jLeJMTaWTU0Ro4veSQ2vWlYP9X5CdPBA2A76IzA6mLdejtYdFaEocencGH6Jmu3gOEbVfzEHHxrZTZMsd0t/SNIz0ifd+/Qvf0/sUA8s1QEJwo3Cd+sDVogsgQRLPWYxvgKwN55D3sxVnhsi3i91rNLer+a8AyKYT+MHoBUrSC6ZHsqG/kYn5WdUQd5sZugDQp3i+LHw2qbVZHEOBsvXEJ4Ig72vLupF3zRiKNb1LPGeFxNAhesuDSjEzWZYlA2uaXYI6+BtcEbB0lc8nfeLldNOglmJ+ls7fv0nFjmkxwBAotkOXeGVMVtvEp5AZwM7QHmmdDyeuA8Oldbu1Umd09zEHlQa3HjiX6owj9+1IsVCZs6iwvKqKeNslg1mg2AP7XM887nzuV6+RPRTrr738cY01lNLhrNHgDVyDVa5KBQBzIOb58P/KgBJEhutBcf8f7AhxJSjwgsnkiZHvDNbW4b3d8L+Wv5pgfwIfKiCTh7AEDcegVITI6ZrhGR26LgHSlRvfaxRb/d6nsckew0wflbC0HSq7ndQLGx0v0KO/zJI0pdb4Zayj0UZA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2d718a-5bbb-4cf7-1205-08d8816aae32 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 09:10:46.5156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uxoqHT6nEskzyLC74IuH3ClkCX/UZfZr3aSDpk1fZuauGX9Jvujgt9rkvOWIi5atfgPX1qg+61eLUjgImmdv6hCCXtnElfbq0g2pXIC940Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4333 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Drop initr_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- common/board_r.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 29dd7d26d9..07c0ad363e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -282,15 +282,6 @@ static int initr_malloc(void) return 0; } -static int initr_console_record(void) -{ -#if defined(CONFIG_CONSOLE_RECORD) - return console_record_init(); -#else - return 0; -#endif -} - #ifdef CONFIG_SYS_NONCACHED_MEMORY static int initr_noncached(void) { @@ -713,7 +704,9 @@ static init_fnc_t init_sequence_r[] = { initr_malloc, log_init, initr_bootstage, /* Needs malloc() but has its own timer */ - initr_console_record, +#if defined(CONFIG_CONSOLE_RECORD) + console_record_init, +#endif #ifdef CONFIG_SYS_NONCACHED_MEMORY initr_noncached, #endif