From patchwork Sun Nov 22 08:35:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404449 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=85.214.62.61; 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=W4hLExiX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Cf3fw1cKCz9sSf for ; Sun, 22 Nov 2020 19:41:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A09B2825BB; Sun, 22 Nov 2020 09:38:21 +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="W4hLExiX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86022825D9; Sun, 22 Nov 2020 09:37:43 +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-CO1-obe.outbound.protection.outlook.com (mail-co1nam04on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4d::623]) (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 E7281825B4 for ; Sun, 22 Nov 2020 09:37:18 +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=VosWpt3bUZ99wS5NGfmY95gdvq7WwzK+Cz7aRTKxZPkZb+EuUqOreoXCZAfKsDDCEHtjBLNoXhUCHXELpJd7Uc1iYLFD519X7hFhjcamb8tRdsRFQtub8wasnX/j4ValBG67bSMl+nEFbV5rYO11tB7priE43FSj76/eCVEc+iC6Rb4ffr/3EWiroEXgaXBxJF0cdqiczoaYZcYYMj9udKw5bRZoxCcI72HhQQ3b852heORINGmUxy2u06sODelUPaBD+USeQlrrLACxQ+GwNdplz/2ZawxaCVpIfOILDf3n+LLK2AnRGQb0oUdQyOWAd9rBV6Lm8jOp3+Q+cuoRHQ== 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=RRlUglecjIuN1jhHovKWpnJPmOS084No/PL6Cr6YjSk=; b=cqCJJivdW26oskLq5VuqEHhLgJ4ejEfQedEyUtT+K+2CLJy6ghwrU11wJANE9CQXOAWF/u9DOJhBxNYAjkVtpv2f+f59rLg3xRnf31Q94JAT7fCDiFd85lxHUxomfGp/yfynwlT2K3V1lV9+uNn/prP7ccIRjOFU+q2PFK9cqYZV+deIXSoIBGzkAKANLLn3hllrloOKLcDfLz1nsVd+H1qCiZ6P2NvHzJOCm2oC8HnipxpZlZCpj70BfKxVhyhOx4ORRfz9DW0fTma1jIC7iqJwoqRp3Q4g94un/xfdlanHT6FskyDP84H6i/2KHBSBG1AkRDbUhOmqCyGupKWgZg== 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=RRlUglecjIuN1jhHovKWpnJPmOS084No/PL6Cr6YjSk=; b=W4hLExiXVZG1jlHGhuXyi/zm5DuHJ/CxiQk+dgYFw65246P0ek84sQMI80dHecIOd+S3Igeh+tRcHJnNpr/KMpcQOMOdVrKsuf2TKi2f7L6tn+65BXFL/eg5L65ELKMem2wDFPhUjNLGK2oGKKhiunLRHJ90qNTytLE7BYCT56o= 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:00 +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:00 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 02/18] common: board_f: Drop initf_console_record wrapper Date: Sun, 22 Nov 2020 10:35:40 +0200 Message-Id: <20201122083556.6756-3-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:36:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7b45252-2f33-46aa-5c3c-08d88ec1c747 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: 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: LCxWOB5bW+GNNFDVWbaKbuMsZwQ8UKOdLJnou2gROBuMt6cN4D08bOqt2K4bLX2Nmpj4fqL+SbORlnoMIEW8bq4P0oMu3hYrmwo9yZTopQLPn6/lbZK5A9/aWEk7QijTFpNnqHYTE0Sk00G19bPO/BoAHyOrEH9zKg3E7IBWVmFL3MMnJsQVKAOdPtectR8DX53fnf2QC3tZA1LfMLPODLKRIHpjIL8tKgBQYYbRtqsC5B0xYwpAEztZnHFkJJegXvIeY0jFxakHt1qct+dG9O3g2MwGuuxXSqBlUSCBqxu76CFUcniFzpcp3T7y4JP9 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)(4744005)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: gh9psqUeAKC0i0acPhmWg3sac/PXFaoT1JlBMNJU//rXMDlxrnH/UfRat43/Dd96PM5asNTr3XK70S8iW//8507XJ8i+H8ZU/2rOIpAje3AVGnxEeng8pGTt//PytOfFgrjmxCUu1pNRwoObXOgnH6PfFXwcVztKEhnVfT2zbXiQ4XxSSeJndgrmAnOE4jJZ70w+eYlqOUCN/95onyR5IYVCjp9lPiwANOcm35fVP3WIu402mGSuRPIkZ/ZADNFFgYT0TPwv40CRFSIeztoR19iDemN/YNNI02gkA+1c7e2i1VT++N/NddgpLs8q0MsKHrz9EmGn2BJfq+PksNO4vOJx6OG2JHpa44YPkZcK6IyxpImyPMn+QamvQNRmRliMYIDvirqhhdxXTkD0FCt3YJnihHAggwO8kxyPZVPcTZuE+DR0gVT0vaYuAzkWX9SpXjczRL1sFT+jCJQ9ce2sjdMecpss6BQaYwLBSytbtkkJhwNSQZWlMLh9Skk+tg8VeMixeVPBaBIFBqosHZYyV48hg+AmjrYWhXDdrmprNHMDka9kWmEtIQQWxw5BAO0JElH0o8ohs7AJrhIrJ6lQF4E9xYbdEZXMNp/lSDpfm90EcRwvqc7Hno0/rhXC3LGBojNkt3hLuyrCBIR8gpZEFbMLFhKQR5dMwjB33ZmqW4bF1VP0y2lEfB9InXRk4Gzus9JoL2ruKCT2ZPiRBSQcawg7/54R0/AuYO59LqdKj5k0hwrSY/ZbNTzmON6yA6Iey2020f+sSEQJHn8vcGcvXnpawtlvyVmcnJWsI60BTUmLmKh1OZZ66qQbTdBWoW2mf0gNOmqWivhGoT23F0uncrj8AGdE9K1wtzC3adMLx/YZ7bws4X2Mdu3x67i+YfHAQ3j85j/CnBKUheCr5bxG7w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7b45252-2f33-46aa-5c3c-08d88ec1c747 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:36:59.8858 (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: NSOibabIZK7WZZ6LtcoCYmMILQvBotgErYgxq8J33X6KtYddrqS1B1JsSyKhybMqe6KWeP0h/jSjta8HC4ANgJfWYe84Gv2rHGGfN58E8k8= 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 initf_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait --- 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