From patchwork Sun Nov 22 08:35:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404443 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=nGC3w5dy; 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 4Cf3bx6PWwz9sSf for ; Sun, 22 Nov 2020 19:39:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6CE31825B4; Sun, 22 Nov 2020 09:37:44 +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="nGC3w5dy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22ACA82591; 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 3272982580 for ; Sun, 22 Nov 2020 09:37:16 +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=FeLPNMguEmUS45Hn8jM9um6ZbW8FanFaQCaYPV2223KgEvwjZu09BZvlKg8vvQ3MiATgSNo8NqyVrNw1gvssOvMz7OKAyaQsZqK8+6xT2Vo2O0KjWBH28FEv30ylvexCNjU+SH9ZamiZ2KQfVo/WRHeO9XzrC4tfI7srhXYX0Y1Oy9nAA8s2fbCuTYSnu8Vv2E2NAG2BwPWVh3zK1z7SJq7hRH2AyF+kzgCnX9t2w4tnt+XoacuMZxB0bbrutzp8ChhJRZqZ7XijwsijGwvopUyi3uqMjuzov2eTGQ/7iM0mVTu9+tD2pRZAppYGfZwvET318QrNP/Dqy9eyP3jw6g== 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=HQ+PXSUedZWl4aPHwmRb4486U4IVRcoUpYrDcPRpKWE=; b=luWhSSyJF14x/IyLKcKnBulYoGW5JylPCpMOhNQc9Y9r6VFcsJ89BtwdxY73MxHXscBa/LxhBOcnDucqSAhyohrkXDAZkl+HokQyJ0VCtsHhPzgbJov77O3Vi97Ui2DLYzDVGC6QoZjvrI3Y0h6gj7pEnLUdV1yyMXRMJQU5SpBvgjtowTKe6AIMjDjaFSaFzf6jV+AN5qQew4odGRncsqlIZhQfaz8Iqv5jkPDSuBCoeBQyfEZeHmMdlfCs3LiJXljP4EfyBaveJO+u0eRJgwgad82wnB2SeUjykadEdGDb13zaFq0gZOGPYfTyWfMSDxvW8h8C8N8Lh/pDJ+bRXw== 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=HQ+PXSUedZWl4aPHwmRb4486U4IVRcoUpYrDcPRpKWE=; b=nGC3w5dyyZgKXo4hdRXifIw0H7Wp4Gx5ztp6rNLoMgnJPONquahh6nqHW/NhK4z6eNpSQfcguAzdrQOEYWissQpORRU+MzwEpFwc3C4dYAHR8I7VJfPkf3mTZv0IZy+x22O7lXtZzSYnYUlnhO4D3sOx/taMXtxTnikcd9KbMfE= 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:01 +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:01 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 03/18] common: board_f: Use IS_ENABLED(CONFIG_TIMER_EARLY) in initf_dm Date: Sun, 22 Nov 2020 10:35:41 +0200 Message-Id: <20201122083556.6756-4-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:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07c05c3e-c9b3-46d9-6e35-08d88ec1c7ed X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: 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: nzfFWOM02a8lGKSO7KsRrmEelUsDeqh2mEfXhxaPnUN4v4OyzJyNMsk1RsHTkJSHlN3etp/j/fzqoFUZ36zMA2vqqleqR4vQI9es/q1SerK2ewna5vrQd/n34xrloy1qJKL6xR86CQno5e6Kx9oBQWYrGQ/LRRT5NfIys8XfQyOH/PoHmxQbA4hF2gnmHm5fEcMEylZ9ac4p7zBP5h5pYy5mUnOF5pIvDKgfrCvVCKbIHVDSTEUdcAbZmralfv7twhEiCnBSVjU62wsp65AZA9pobLcV8I7ZeblZHACs00jDUopnGMEvLMAFsCgsrCAt 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: FT7JGnkFtc8S+gwNZyu3DWs0z3GeDJVSH7bQCyEaPk5DpU7/+wynu0JyEeNRaUSUP/F4/FTqCVYp64Wcvg+2vraUIBMFam9kj6LFT19BwR12YBVDG3AD1vHBkulLHvV3vwFp4qNC8GUhcaIv9HUbUOO9onzXJaAuy4Xq8clSDlx3LNHZn6uil8wog+qCLUg6hjwGNhnYgzRUBeihZNDNLv7IAEn5rEpAbCaZCDj+sOv6t/u4ZFPYkAAGjGaRi0IwOhYcSaFk9lXO/SEknshUXumU/6HVHsL7DZhwH7hre9WL6ig2B4DTAEJRFO4TM151coUZ6pE7TlHjgc7BdAwzf7QzlM5MiNNVD6UT90rXtxwKmoze/mOkxZsw8GJeXOpHvKR+Y5Nc/b20plly7mpjoeXN4rHY1nQowOZhB/ZUYpYS4JQFAOZGTtN/I55kvGw941QNWAsr/z0N1eKR4eXbSjpdaTXpxGlZB4jAg6gbm29nscsEkdN4QL2VyJnskuTIc1lLtJ5zqX+VbHtA35OWOFKgre5uqZbc4EUAYS2ZYAnA662J77qGGA40DsKmYwU+XEtfs9IZFf3ub/QPBA2A9MwbxktU+R6pvAfG3V3EtaagF//oB+zE7IniVfPXxrrjuDUrwgLnmRJX8p0Xkyk0At7hei9+8VV09RGaXmMdENlg6+lkux0SQflqC/3d3eEXyJdTCDKmtWcj57j6CDS7M9odApxEWDApx+VvF9gSGAyneM4ILJnuV7kFOX86ctch8DeyIMSVTF6fIjImpSf4Mv7n4MtksXk6q2hesv7EnsNS49dLeNv8dujPKIscKE9hnNcURWT6sZaxSNlZsfE1m4Gw7pMzorVsn91xhUr/8MDWn/gznar3CaDJwqvX9GYBcRVo12U3CZXgmOaMxC0Fdg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07c05c3e-c9b3-46d9-6e35-08d88ec1c7ed 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:00.9752 (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: 8LTHskqBJgtzdummVXiiXW208Dscxwf4ERwH0XX88mj/TbV64zYAv/wGN7ysRutiHA3I3kDQHEkALkznEZUcC9hsm18xPCDDO8X4bcVAJkQ= 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 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 --- 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;