From patchwork Sun Nov 22 08:35:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404444 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=qA36qMDk; 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 4Cf3cY6NRQz9sSf for ; Sun, 22 Nov 2020 19:39:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59013825AB; Sun, 22 Nov 2020 09:37:52 +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="qA36qMDk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5055382580; Sun, 22 Nov 2020 09:37:30 +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 NAM04-BN3-obe.outbound.protection.outlook.com (mail-bn3nam04on0603.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4e::603]) (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 16FA8825A1 for ; Sun, 22 Nov 2020 09:37:17 +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=A4Sk12oJFF34e9+Rbuqs8Gs5nih7X599AzwSkyr+Ore0xyw2yb/4AnM6h8nilTVP3+MBGf+CK6Xpln4gSq8JGHV/sJISTFOTu6pZWSx946DHjba9JanoZR1TrYcbmf8r5Gh0q5rGTuRGaJU+g3esHX+VHJMN3WgsmLIxBnBJDdDJW8i7dqtV2n/O+hK2lr9D/s0MufxF3yLzJKdLrSGhjfl7QBbkKHlsSI1VpePXNWd8i9TYAQmFIPYrzXe+ytoQI5ayZgsAnmSUBspQt2BKkV+z7QOfxQizJlM9pt7ovD7Rtn3eHqqazhCttdaYADty+zKFrf+zH2nnCgLcuDxMYw== 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=7lQyWAFYIH64x/9w2i0UTDGciJK+aEDOPW4JCR6DjAA=; b=DJvGku4HTOXnYXDJO2L7+Fzu/+qvQE1EQJ/gOtEmEOCuJSYrebokgATaP5ZuvlX6uXY2IelxDYbEMkyvGXqeyKBYuJnqxR5fEPiPf62DN3SI2x5yWFhxPNhMG9A/l9t4D5N6FYMUBXXHM+1BCqH9HT8mCFTgESqJ8EiW0NWbp2ydiTYgq2oVY56h4NWowaubVrLrt/G5lw5qCT+RYLdGmeBZbNmSAddW2GHHfDt9bCo9HIKQXys32WM/aNFm9I8XaoftS5u3ANNLmrr5EHziom5eWQ9Q3S3udRvproeGwHDfLRGlYpKvIAOnYR83zyukbsyAKApIj4bmCkmPWC55Rw== 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=7lQyWAFYIH64x/9w2i0UTDGciJK+aEDOPW4JCR6DjAA=; b=qA36qMDkVXCBdmK4zBWADvbLdaloL0TWzMtiPQ7oqCptwBWkqo6gnJXm9MeVeZaphRoOXG/kVMyF4fhUNpf4IogMKvPNoY5ICphmZww0rhjnVhSV5KBWt6a8sFXvh4FdmCrV/ppyTaf0LTxELnWNu+Q2U4IGf3CIH+xD/Y8N3DM= 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 MN2PR11MB4223.namprd11.prod.outlook.com (2603:10b6:208:18a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Sun, 22 Nov 2020 08:37:04 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Sun, 22 Nov 2020 08:37:04 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 06/18] common: board_r: Drop initr_console_record wrapper Date: Sun, 22 Nov 2020 10:35:44 +0200 Message-Id: <20201122083556.6756-7-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201122083556.6756-1-ovidiu.panait@windriver.com> References: <20201122083556.6756-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) 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 VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Sun, 22 Nov 2020 08:37:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e12873f0-34b3-413d-435d-08d88ec1c9f0 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: 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: SNIZrGjJJnwjzPIaxH5bpWU5F+2FRRRzY285blWOVwdlulqzVggk7G4jrLXihhLwnBDxkKOP9CrYgAv/r55g+ruIeqJVioHe7g/PFFs+5OTRtI0hR3/d/SYc3o1KkHD8ryiSm3n7olhkO7f3We4ZfdUU2jH0ousnyRGGhj8e8kBzanTlzp20Q9mpnmaS/hj0v6Cr3ilVbR/8KwDGCXMa6hF/y+ocsAlykE2W1mUkI9reX5avcUL+VBvDUPwZk+iDYv5AvKU8siUCfxeZmmZZOYRxnC6VbBUdAg/5Klj2afJpJFMMQzEjuCpTWneSYvb1 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)(396003)(39840400004)(136003)(366004)(376002)(346002)(36756003)(186003)(16526019)(316002)(26005)(4326008)(2616005)(6916009)(83380400001)(6512007)(478600001)(8676002)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: aBGyFjfhQSoRv4hTEXhiXBpq9jEqYJxGwvrVC6IUPhLLTIEiRLN4uYnleeLvvR2kgXc9lhew4S/ETNa3YtXi/x/G7Ltfs+z7x4arjmWiNpsazFBmiRw/oPbkkS37frXzGIvYMUKhqMfsLrrbbtJTpqHSfao4EmNCIgBFTuDvenJzkBimC3Rw1PHNGntZBJ9lCf/FVAJ+T592jKmycQxde5Ld4e/iR5+HeZjj1xi+HSUmzo8vRvTSomJkZLtDi3HIgJrZLMq+W/gPdNc4TFgU8cVSLm25DoKEftyCtFtXLyK58YRKiGndhLylE3ABGxi/qU0cMXx8sVJRs5uYT0jIOXnw1Nw3ZV1bGXrVIbf8GGkbVvmnNwE2FxYlaehTUhDJ+rkDcysr+T+ID192w5YkKjiqbjTzi3YYp3UPc6ZfPhI96i5+DlrI4ySJ3IjPxJjc0ouZYL4DuzdxNqvcBLpunGEYkb9B7Wbfjxash6bw3WvEs0SZNG3zZW6IxCr/EAMaTRsMo7LFZXXMIj2dvyY1vE8rK1vx22kUpK2BZn/L+ZH6X9yWhrS9mCbc/okMgslh5R943khodWogRXGKCceHcKphMKYb4gnSS1gqNr905gRXNgkgb18nPmqNd5EKoyVSHBrCHFK5N/THdn4nyI4uEqxA8rrjyyreKpHMMz38SJRxyzwquNAFPRXoJc7Vn42ozTnAS/9McgJgEMVEAbxKhm3m5OFQ0cZqw6g+5uiLFRDqpnOHdXCGcE6Jrc6JKRIOPPtEsE7sYri6Pgvo30VaCEqZROk/hPwRLtLfAjEebor7kgOT205R4eiiF/On2qJOEn/S4mVvNW7uSmHVmdpIYi7wXTGQN0pjktzXcP+WjkkseYcQG4yqRseaAknMZ3Nek28glijSm5N8uhyE4j8wiQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e12873f0-34b3-413d-435d-08d88ec1c9f0 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2020 08:37:04.3931 (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: OguYRNjrC7Csewkmn0buo8/5/HoSF0ZITnL+oZhEYcTupACnypPlDGpzsL9FV8c7pUg+jVJM9Ex+/0SVwyn48gB/521nhJguF87daU9uNog= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4223 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 --- v2 updates: - add reviewed-by tag 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