From patchwork Mon Nov 23 13:16:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404778 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=JYmhcDGA; 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 4Cfnq46CbLzB3tF for ; Tue, 24 Nov 2020 00:21:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8BC17825E8; Mon, 23 Nov 2020 14:19: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="JYmhcDGA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67BC3825A8; Mon, 23 Nov 2020 14:18:21 +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.6 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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (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 BB0A3825A6 for ; Mon, 23 Nov 2020 14:17:57 +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=QCZeklhvDg0wWmauHt1HNnHG37TCl8p7QJ/OF5sTUTOQ8xOs94YwCCcZwTxRPS8bMJlf6LLXY8eP5egiOQs3HqbTlU8At58hCaFWzUnZzGgMEyJAIjYu73Yj2W7CMTbt7BKb8zcr4NNTxY87VJv+EtIyAhMM8E0Wx3UZge3ndvOn5yKsfjaXJxPGfDFbZ1f3bMjpRNgWJW2i+/lMuOk/6B8HDjVKMIQjK1tND/Dsu4NwuQSJq1uRKNuWHum1GSS5GwdEh2J6jriqgB/yo1xQwJB9Tc9CtAtEGk6QlF2YjHLQnrMUcPDAxZCxahoRynd1Cn3qZTC+jDhp7YhHX/oUbQ== 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=326tS7NKUlwqlqsZj69w55eJl+vbNtYvR0A43dZQKrQ=; b=mHLnyFvXxIC/Q/qhfKM0yMwgF7lAu04n+zUBWrA4JcldLzq0tUR4NxdMSLlIZsKQDqKQQlpSz1sG1lVQXLEX+ngUCW67dto0RyFuK7OetmhYaL92F5uYkIpzu6ucNogPnBOda70Q8p6z+7Q76Q875dUqnReDAl1KvsNmYI9CBM1ToWJGdlqZF/sCfPdJJ4/0Gtd48s0VrHKI8Kikpj8zHCuy0jaqB3qKiPZqT8t0ELthNb1JxXo9JBTO4kv3Cyeh0PiDDcG/lzo9QUjp2kUQlc2gew43s2tqKypzavQW6Th0wAm6NNmnPMhZkvzgEPGWktlNgwJU74Itx1UITlwVIA== 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=326tS7NKUlwqlqsZj69w55eJl+vbNtYvR0A43dZQKrQ=; b=JYmhcDGAjiKL2zeWI54IvKO8sz+bdbFtO98Wu3qKNwgXHdq1laZI/fGHRdoi3pFw68cCC4x/T7mVXK/LBBGWNnzes8ckJAwI577+Gy5uFxYF6gh+R6S6syNAor3z6YIZ5T1RY4q9qjkp3VMPDJZLljyw+PBe3ml17o+ZKnAy7sY= 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 MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:47 +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; Mon, 23 Nov 2020 13:17:47 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 02/18] common: board_f: Drop initf_console_record wrapper Date: Mon, 23 Nov 2020 15:16:35 +0200 Message-Id: <20201123131651.33032-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) 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 VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9afa79fd-0bd3-43a6-b8d9-08d88fb22bbb X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:203; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XmFx9Xzw6NmzP7DLiXnU4DgQTvhAXnIs5VwxA3t79TmFyXYTXC7GNcK85GXGEMVgPjMZ4euSgm13KtR20Mp5bnasTvwMhlvANErux7sTvk8yYRJpfohX9v7XzousvrZz808qvnEp2xisWopZzf27wkapCt3Nb06mHh5CfT3cMF/jpqEd64fTbmFPq2e7R4+hIUoqmpK5TelFzBvH+XMmV4TgSoiwxx2SXueKkJ/d9StzPp0qh6llOlJYbGuWr/X0uIGZ+RZfLBMSx+66JUI9ncMYeKLXZUkcgtPBtRbv7+Ji9/lAPWTVShY++rAmC7// 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)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(4744005)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: VZo/tzRX79LQXMwLq2NGoElsFVVRXOnTb3KBnOiB0tJ6b9ee7dgeNr6E6jKK/hUsnvNjF8UT8wZvEZZxc2WnxuMR/goQgs8KsfjoDJ1z5BYTtZKX1CA36AWhGrv3sc/xz7kJjdoBzj+gEDHbOns2f2Pf8+Uf7UWQNwhFdNJMSOelH9vC8aRPWMtKsFkEZPnSX7J0ewjWaRQbdgh5wjWf/Tr7yCjw//5eLTdnguP/rrRadtB+ZdGGe3lOWnCEEKIbuG+h2K3ZdcWFUbqHT0/r0ynnXdse/5xutIvuwNAYDL8rp8fZJYDf4IRMTYQbMIxf9brgR+bhqfpKYKuYeqTK09pNMk9z9YqC6nqcSaJARaSqcRaGEQeMMGNo2ZO1CIWYI3uqF5gZCEw+jEwktLoGRzH2ugiXb0/uT/jk+8FpSTdEimKUoPiQseiYZqM525mFcejnj3HrjTT7aO7k+mI4PngktvtVC97A+Pjzx1iZ8zpT3doQUwCpTMtEPuaI4+05zRTztL7CBR2ruIWDBlHq/ujH2h478WTrLjvFdIcrH0NEVNptPFbsZBPqeXc0a5ksXYxPn2RrhDpKzFLCkWgzhKezIJ2GoG9GPuDAM74Zxq4ZxzmbFTiNgrjQEZvJJZADLtnnrfdqyZznaioAZp6qTkmI5NFmq4iJrZRevR6SEe4ab//kgj2SMVU5IfWB5Z+0C87kKZg6lihJZqJsKZa6htpyunoeNt1S20K3tYOFpi3SsFln0sMGZrv+hjqkEHzq8jyJbzoxPwKI33N1VJcoXmYAPRjHA8XdAVgBnsfHUuIa2w7HH4l4n/PTqiV09vQe15u9r6YeL7aYdn76Ba3ckn9K2wwPWbleTlxGG5NhRry8Ng3bxtOX9P4DyUbGcO4elpXi7yOMJnZOitZFzSyrVA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9afa79fd-0bd3-43a6-b8d9-08d88fb22bbb X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:47.6137 (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: 5FYzuNaA7SF1uACqFA11Pbm/xhtVdj5230iBp9sdnLnGhNCe64vDE1ormE1K8AgHbsyufzz9YvN2Yzp9Zh3wetbS9rvWVToyPScGNQTJBBA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 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 initf_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none v2 updates: - check defined(CONFIG_CONSOLE_RECORD_INIT_F) in ifdef condition common/board_f.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index e5e69ff0fa..552552e328 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -765,14 +765,6 @@ static int initf_bootstage(void) return 0; } -static int initf_console_record(void) -{ - if (IS_ENABLED(CONFIG_CONSOLE_RECORD_INIT_F)) - return console_record_init(); - - return 0; -} - static int initf_dm(void) { #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN) @@ -829,7 +821,9 @@ static const init_fnc_t init_sequence_f[] = { bloblist_init, #endif setup_spl_handoff, - initf_console_record, +#if defined(CONFIG_CONSOLE_RECORD_INIT_F) + console_record_init, +#endif #if defined(CONFIG_HAVE_FSP) arch_fsp_init, #endif