From patchwork Mon Nov 23 13:16:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404776 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=Dya1dY1l; 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 4Cfnp441XszB3tJ for ; Tue, 24 Nov 2020 00:20:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA560825D9; Mon, 23 Nov 2020 14:18:50 +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="Dya1dY1l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A5F4825DE; Mon, 23 Nov 2020 14:18:20 +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 5FCDB825A8 for ; Mon, 23 Nov 2020 14:18:11 +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=obKBiQ1138islGsi/DMZEQ7N6IVtsCrh55iebkDDDASO8C64MztXqhexioJCv6oBCFuedfrdd6ux8cRmMHk9MbE/rA50aOiv2X2iqQL1U20qKN25Yw6GiNvenXegR3ElbjRl3dihg4Xc8zaLTrw5kqUa8fhDzMH2uc8N5vAyRhA3GMU+GC4T6LzdR5e/+UFzAmqr1BBJ50EIM0w2qG8VJvalADHobLKRuxHRMV2QssJFsMnVZ8orh04g+zsGGwtMpV6S6eRpz7LKJj4+h1NsUXpXQQUhYT3qPVuxgUtOa+dLE3ZGeXHpidG1gHuyZJjLVrso/lXqnxgAPzvBFQ8i/w== 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=0OJlhmOzIJVJQDwytNDaktz+eiW2QFFJdfSUdmjI1rI=; b=AtQBo2eHE7w7a181YNlh6RqcFAm2e6vqo4sbLQHp1PKgj5MlD3dmnrDtH1r6rUYnmReKOpuWMCBhjfp5h96EhznattJMKslhtLrkWWPfclxVijeFQC5QJD/y49I77k9JJsz8QIkOTn2Q1Kxc+0MohWv3dEIe8GRrKDF7R9tm+Rk8urq71awxTGssARzdOBMs/sSvj9IMCO6BU3dVqstlAHC6JSDmb/5Tkgb9z+xmFx6Gt8P7BbzsYXKQrQKDxbuvH3n53dyiDnhZYOWOPVw5N1GHFV9wThlS2GB3G2J87462h5LpSBAGOUbml+t9IVtEr4QeDGdpdkSg5fZYxaNoLQ== 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=0OJlhmOzIJVJQDwytNDaktz+eiW2QFFJdfSUdmjI1rI=; b=Dya1dY1l6bPla1mxc27+SnafHmwkpaO/bVraoGdzc+PTmIDoVbYbr7GTJW90R56KA2R0EmJl/qNIcXKeax4KEBRWF3lxXW7bEcx6S6V5mTgre95pablDTZeo1QbA22djAS7eHho6Ua5wNUyq6v/w9I1Q7xUYimnCp9MkfiQGz0k= 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:48 +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:48 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 03/18] common: board_f: Use IS_ENABLED(CONFIG_TIMER_EARLY) in initf_dm Date: Mon, 23 Nov 2020 15:16:36 +0200 Message-Id: <20201123131651.33032-4-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:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb4fa220-d78d-41c3-f211-08d88fb22c61 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yjl/kxetjItUBrrNiPVMa/tEcjlBt9a9xL9NdtLF2CT6XHNfRaoX5hMohyIq+qsbFLYowwuL2FuGceY6TwpPupZlBOVsCeDO9B1uZ833Cj6jMTNSTHj05pZqTpBTjghl+HFndxuJBT2nx7BhPvxh+eP04L/qZDeJ5u8GyDqNZssEt9RTDF7mqEu1gt5mi9NM9WTwSLuhCJsrb+aBznHR5K7GYnw1q63xT5shvJq6kK2gt9oWTKRSDcj4Q7Hx10Voez5V/vBvuE2LiF2SHS74zxjlRmGjKXNpM7roVlGptuPyQn7ssGOjJWjJ41cj5eli 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: vh9/slhsPrJou6yO6SnT/LB582DEAeVCFrpIfYPHHt6xEpBTaSjq/klGwmOPCjeXFVR7vHHVt8MwA3uTpJAPwVa5r8AfNnqRBKY5E1+EADs0IzvxEbSJEzixWtZujhZvt6RyQE7FMIDKhgnvKbitKTjR5gleDx7adig0TolL1XNJWaOWvtm5ZIWrBxTBPbh4QMtxT6vfpZ4GRbZ8piEyuvCSuZyaKdwdxBucrwmwPjb3YjsVQGbXjH7JWxkxNR3rp8c/nL1+Qya+BtutjL1nbh4yrzgyMG10accyxBy8Q3o+xy0g5ryuEdrYzEGXIP0oHWhZZu9rKJ77/niisxg3j9ihdoaDVCF8e5ktEUQksc0pCVxyV/8JINWX+oF5422MDWuPaezN+FOeDuL5gGetCKtdA7XqQipkMY5HawCzqmS9/8L3Q/DmPK0Qlf0r1QoiwJIDqUxswp2lOacoS9grBTREOjX4Fsl9LsHEq2oyRA69EPtDMUz7AzMpNHbofYRmiGWeRVXh61wPbdw9CN6P8H1BIEjjvIHSiHutfk5dX8sBd/NDPTfqbdnKzHezTHW1nWEzIB4CuHdFYX72bPuQoJ/ucZSLjp6AuHR1HE95H1Gb8depNoJklRvIMl8FpJOVavV0mo/rGlJSuNHzhigzqzq5ZKVKIrvrzbTWznYPOsGM/mkT+Rs8wpZw2cl98ymPmfNLXjpAK4feKZgESJADhj4kf2U8isjkbSMScAMkVuG7PDChzl7J7nfrSF+AgRAltrWJT1tzlkvf4giScq632YMfdPfRV5jKBPBZvRqfrju1sttr4RCGyD5klc8tEIwU1HXO/gHmjNc9g6fOjZJ9j4krLK6fGQYY6CKNyscbQvHGscjDRV+Gy9FQwn1xN/fyQiq2GGfbQitBgBTNUM/0uQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb4fa220-d78d-41c3-f211-08d88fb22c61 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:48.7390 (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: fyoE0UMjeD36iLxAwLAcfcKP53PQbzMqCI/FsNuEoDLhlx/lLx3d95qyxzWyh9CU4oY184ava5r115VhGeOAwk3BOE3ZspAivqjhIUiv62A= 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 Use IS_ENABLED(CONFIG_TIMER_EARLY) instead of #ifdef in initf_dm. Also, move timer code to the main ifdef, so that ret is defined. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none v2 updates: - add reviewed-by tag common/board_f.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 552552e328..3c4437341a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -775,11 +775,12 @@ static int initf_dm(void) bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (ret) return ret; -#endif -#ifdef CONFIG_TIMER_EARLY - ret = dm_timer_init(); - if (ret) - return ret; + + if (IS_ENABLED(CONFIG_TIMER_EARLY)) { + ret = dm_timer_init(); + if (ret) + return ret; + } #endif return 0;