Message ID | 20201105090955.29641-3-ovidiu.panait@windriver.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=Qxe4q4bT; 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 4CRd8f6pfQz9sRK for <incoming@patchwork.ozlabs.org>; Thu, 5 Nov 2020 20:12:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9965F82564; Thu, 5 Nov 2020 10:11:23 +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="Qxe4q4bT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DF5C882553; Thu, 5 Nov 2020 10:11:02 +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 NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::622]) (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 1089482364 for <u-boot@lists.denx.de>; Thu, 5 Nov 2020 10:10:56 +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=TIIrVJfK9ZdWJfxy1Wg6zstEcc2NsE6gZRMKXqzOEweaIW09R0hoI1vtZm3IhoB2YbGRs7utKOiEaAPdNR6VSJ63lqwDHRdU8wsu1/fxDuIClWUY1CvXXehN3iANtOJmrkMGV65iJateD0YXIJUOk0ZSvd9RlLcZXQyqZzRSR7sgeKeBtusae5PX3yhVy6ocsTO47Tb51Kk8QU7WI4G7at8dMyVDEW+bSKmipsNU8PRkgWBMDOZwWk3uIAFCAiuVLPxLqrH6FK3Sn5DEjbJLLn5pbwAF8g2Cl4kXTVENHSg0+3JsqaSXB/htbfew+ch5Fb6BGGHmOXUtoAP9rh7Qlw== 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=1pGeP+TUAqD65kxDy5mGRTqCOIoWJto83zuFjD6Q+J0=; b=ZK+VrLjW6Dd4ZXO+uHZb/9ye1Rj/0lsdG678gF9Om7X34Us4VpmUWnPuZBlreH8asQXBpxyfKj+W4m7beCWe7lh7Ov8WxWqDNwPGgSuunVblTV2Ee7H0jrn8hFyncRNi7qWW941smYB5Zwd3VgEtFpi+3ZkbF17klqkz7I99Z6tVB0bGO5yFXNLwSI2frb/Vm5WhlWvbzPZOJ2+Maa+v5AHd+ScepO7C/WEIhtqeQrE/mGeFopngpP6SXEYQG1OGaQJcshBVzvQu3Xt0vvpDA6MIR3MiqNHhmHRezxp/ciKLZGHXyv6k42J241dBdAv3gYmVi/OgAjLKb1EM/AnNXw== 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=1pGeP+TUAqD65kxDy5mGRTqCOIoWJto83zuFjD6Q+J0=; b=Qxe4q4bTUOR1E5iBQficnA6ie1C+VMLy3hi1W4d+BfSajhGufnrKdkFa6pOnV5GpWbCQkv5GwIVgJvNb37s78ugn1Iig5T58pMNX7Q5qo2P29nHZ8fNWFH0+2XTyVz+Ozrv+mxbIHDDu3KFseUVA2tuTBr30yTAn3jwTqJEW9YM= 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:43 +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:43 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 02/18] common: board_f: Use IS_ENABLED(CONFIG_TIMER_EARLY) in initf_dm Date: Thu, 5 Nov 2020 11:09:39 +0200 Message-Id: <20201105090955.29641-3-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> Content-Type: text/plain 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:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a7f4b63-0309-4148-765f-08d8816aac1e X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-Microsoft-Antispam-PRVS: <MN2PR11MB43337D3C2F29BFCC182A75F3FEEE0@MN2PR11MB4333.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LyqF1+CSquAbPfVKJUeTSCDg6zc3M9RhYp9BcLMLF+hukTdJWsWq91FRDDx1UwziqGyCIo2t+PB+DwkiD2B07/yDYXmeNUrKtZXvRRA3UhX3ycJ7zGvIwYOc/GjTY+Hf1UJ6aiu6+UZFbK1khiV5py7KWxX/wdSPtgPJsF3dR3IuAgn+maIPVbPo58aWZtwI4ok4uvPxlJMRpJmk3ygkpvl/EKmZVOUH//1n4QSLrLlu4SpRUH9ZPi1fQPPUn2fu5qj3FKNDZukS0O+Vjz0gNQRjmIYQ7vq6T1xDwkFWrtramhosLxxNSgRRks76hjYkUfMiW4AiD/+0bqTq0Ue3tA== 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: +eiTcLE/AnPU+yWEtXzJY4iAqKQvhRqWpKVEdQAK17YdogLjwLTCogv7lmZdO2s7c3VQaGwF7hd14WDRw6WPFLF+PvZ5lYcOr9H1NFFgUBgMi8FpRru7TnHBUNXyghrR9cWuUwdjac3tZWqVlaKk5uvuKwqqb3w9twPvmqTJdO0Z7oYCDY74coB8IKPygoH7F8i3buqPPqPwsFyW1O9vC0s/Y9Z1x3w6mPZFxxexvFEabtQaNJgSLhmxB3MEu14r4JWavdOkPAXx+0MkqgM6EfYrRUHD48GwOJ96rHLXxfCOp2HainekMXDJKk17z+zE4or1MI0BgN3K6SAWehAIUFTk+DZCssk0RV8zCjU+dpAZazlNAZaUfu+5+zl+0ab3ddJKyxjTN0jbMfnpZjhnqQJ7Y76fKy3m4Pz4wOMvUtNlqwKilr0vMKZCQwnni5XHzM79db92c4ci7VcwQ1gqPkxJoMPSNJ71uu3Xfr5EbU4sVi4qfPRbO1Lyp7GCYaA9hxJgppPyvOafMuqXXZTWoatzfPy78dFA8RcsX6yJOdg4wxahlWy6owHAcFXfHqsIvm7J/fVwUaeeJUhHbCOEle5sAVW/mmZ5+5ER6ELr8LzPGeO3cL7uC/VPM46a3mBSzG038syR6XnZVOr/6YUO7g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a7f4b63-0309-4148-765f-08d8816aac1e 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:43.0767 (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: 2pur+BitTF5TTOtIMNJa3dSgPzll55nnAtwys0Owh15vXyF6H+gmo5c1fXkKuEYZbY0gPxEILeF1DKu/PBjmgaupAXl43P5zPlgaPkBNDLY= 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
Minor board_f/board_r cleanups
|
expand
|
On Thu, 5 Nov 2020 at 03:10, Ovidiu Panait <ovidiu.panait@windriver.com> wrote: > > 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 <ovidiu.panait@windriver.com> > --- > common/board_f.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/common/board_f.c b/common/board_f.c index cc4f32f9c3..a3c353a4b5 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;
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 <ovidiu.panait@windriver.com> --- common/board_f.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)