From patchwork Sun Nov 22 08:35:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404441 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=DK0+jU7O; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cf3Zs24bwz9sSf for ; Sun, 22 Nov 2020 19:38:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8EACA825A2; Sun, 22 Nov 2020 09:37:33 +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="DK0+jU7O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 61C128257F; Sun, 22 Nov 2020 09:37:26 +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 52DD58257F for ; Sun, 22 Nov 2020 09:37:10 +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=d8CoBM3rLfX4QkwWEdkp/c4VpTjobAYb3Prd/BgxOBJ86qquJqRiTuXBTnSrrujrd/LQ5gnLgfvhGE92W7sPtgC3I+GVXKj+fuPVYQXb5FICAhTH5g2JYY+FmRSWZMlj/NuuLVjKygtjUp7smMQePRl0wCFBQIV3/l0UH1KJLlU/OJRI4d4E0UgTrbacvumSN6SGVKyzoKHwENNhj+XUm7YyBJkidg0W+GrjB9DHds8x5F0F7E1+fovb+i52un8l+q5ZyjRStN7oBAB8BEIJlFSTKZFFPTgS1N0RTL7z0/womwbad4gofHKYr3iXsLMW6jZZLiSo7MLb/qBhgB6fRQ== 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=QrOhVCx2hw3OYEQD6JIpmRY+ZrrxNE93nCTGDk3nkwA=; b=FvivEi4OXVAoHGL50Rck6yPU/nlXVrzI1dXD2d5NIvGo/beVrOx1EvezOA640PZ7fwt2mTb+2ADi5bA79eTN/AtNpe+xAeeRVJf+1DuxIrjLquH8zBnn7Y7ftwJ1E0wXyQliK4gJI/lEGvFu9xFqz/SiUlWmbl8rHhh71WIryW57QYFvN4g3/Wmff9fl3Vbt5AGP4DTOq8xpPclgA/DUt23k83WU7beb+AHxyHLB/71vzpjokKwCxRjD/CUUYFgxx1FQ3vlhBlTH3LmOGVH0lYFjQdD7KKHHXyJQB8TNUnYQPBdPu5leNwHzhytRz3R2tYZnPxWDWb4LOg7uA4JnXw== 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=QrOhVCx2hw3OYEQD6JIpmRY+ZrrxNE93nCTGDk3nkwA=; b=DK0+jU7OKQQPwfI4/PfM9hDBfI+YOBV4HZWUr9B106pytAr2x2SCYvUAqC6yoAVSeoGhsz6SkW7BLeBOZX5AlDjrkGMwDA9n6bxRPgPFqv+e6y4t58UE2y4sSqRC3rfqofn1zNR1QC460Fo9RgtWyzx6fhMuUcMTMX9f1jn14uI= 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:36:58 +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:36:58 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 01/18] common: Kconfig: Introduce CONFIG_CONSOLE_RECORD_INIT_F Date: Sun, 22 Nov 2020 10:35:39 +0200 Message-Id: <20201122083556.6756-2-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:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7882a0c2-0fd1-4e05-70a6-08d88ec1c6aa X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:883; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qP1bGIt9TTudE1a8YPzWftrgfVAhQTI9i+NaAMBIKRJwmwZsYzmfUr8XGC5RSyYN8RR9UoZFQntRKQeIYSQXdTrSW2f8L2Nmrct/2EshL2BRF+Q8AE3YlpePVLxydr0i94kqmBHp+3A9zwlNeACHqV3IO22/zvARiMrWrj0+7gbvJ/82w3Dr7cdpjCC4Ftq9sP/ADOeX5kwKIDc2whx11MiHeJEniHgmKMOgylYLE0LAhbAL0EHWK3XAmg3ZoxM27SfKbRhjyuqIcSzYJxzD0eP/atGonNleG1LZx9eXphN+xRWG8BDHVOjPMsa6SJkBuEicITDW9wLBM8Enz+mE2w== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xR88urdgbzps5GFSCXOEoc4xRQs6n407Os41NptvrfEWYf6pifsROGm0kW9dmcImMMXAwH8a4bFsltq3cnWLLSr3W2ccHjTgdAHdOBL+WaogtP4WguTohHIDoYDwLh5zAQoMb1qPT/mGWMVmi9nTHHyojNXI3XC5wBu/ttZNhls8UAn9QKYgtsWvrh6zfU/W+iEoYFN1ybhycir0v4OqDHmGTXu7ExUHxsOISQ0qPzp8ZcYl2Yjpg7ilfsoJfJwZdx3E0Dr4sjJ0lg6uofft0eFcj+4xvwylFXy8RGQC3ccSk2lkQDaYuq0JBwV6c3cFta1wRQBe5bOSgYtIHYlqR+K73ibx5NFFQThF+incQbOpLLAjkwCpn7uCLzoGfgp3r8x77u4lBVPcKvAMIEOd21jKMNi2M3kFAS7Bg0Nl6/A/aNHYWevRs10n7rliZKgZe7A32v98NLYN4kSIoKMnphpPLg9FSjBChZPikYv0Ic9LuPV87qsIAiznqSF7m0gMCTbb3WDcG/6mnyAlZ/5a47EjqZOHApfhzDp/9H97BfHNpU5y0g6kQ89z6DeTIbbgeaGOxW5TOdFCuNVjUUFsg53g4+xrH/s5Z6iwkG706/IktIJkS1tfcW6kvauZbRUN2q87VHMypdUigZpZYMb3GcxcdgMj4HgX72PyjpxpU692yrzuAD/giLmdfmSeL/7baEhysr27hCGpROvGEW4G6xWE2LV0Pnvvj0TGXa4PealJeD5jst7FVGs9GY0ZTvt9NaUkU4b17mWdF8w8YoNDAx96QKrXXmNwOWh1Oe8xb/mf0Tsaw4290tw6H6n/ocj87z3Jvq3XPnemeivLTk+fDtYhFTTrRQM7JrXnfw78mJBHQaflORIHzTWdR+AuR7WZ8bgx7/c5FWPLhTF5tG0dyQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7882a0c2-0fd1-4e05-70a6-08d88ec1c6aa 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:58.7855 (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: 9qzWJbS/dRURgFQnd4EtJQW0cfxgfMbal5Gyioo8oAFV17yZet7LHQxW7qLW3T4ie9RoeXfLo6uRtsNih1lD4uA/vGKMh9LRCaQ/7OSwKc0= 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 Currently, the following #ifdef construct is used to check whether to run console_record_init() during pre-relocation init: defined(CONFIG_CONSOLE_RECORD) && CONFIG_VAL(SYS_MALLOC_F_LEN) Introduce CONFIG_CONSOLE_RECORD_INIT_F Kconfig option to get rid of the complex ifdef check. Also, use IS_ENABLED() instead of #ifdef. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - new patch common/Kconfig | 8 ++++++++ common/board_f.c | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 2bce8c9ba1..6f6abc7cbf 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -17,6 +17,14 @@ config CONSOLE_RECORD To enable console recording, call console_record_reset_enable() from your code. +config CONSOLE_RECORD_INIT_F + bool "Enable console recording during pre-relocation init" + depends on CONSOLE_RECORD && SYS_MALLOC_F + default y if SYS_MALLOC_F + help + This option enables console recording during pre-relocation init. + CONFIG_SYS_MALLOC_F must be enabled to use this feature. + config CONSOLE_RECORD_OUT_SIZE hex "Output buffer size" depends on CONSOLE_RECORD diff --git a/common/board_f.c b/common/board_f.c index 9f441c44f1..e5e69ff0fa 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -767,11 +767,10 @@ static int initf_bootstage(void) static int initf_console_record(void) { -#if defined(CONFIG_CONSOLE_RECORD) && CONFIG_VAL(SYS_MALLOC_F_LEN) - return console_record_init(); -#else + if (IS_ENABLED(CONFIG_CONSOLE_RECORD_INIT_F)) + return console_record_init(); + return 0; -#endif } static int initf_dm(void) 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 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; From patchwork Sun Nov 22 08:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404442 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=Yq6fiiQd; 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 4Cf3bB5jtwz9sSf for ; Sun, 22 Nov 2020 19:38:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27E47825D8; Sun, 22 Nov 2020 09:37:36 +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="Yq6fiiQd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87B5C825C4; Sun, 22 Nov 2020 09:37:25 +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 NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::61a]) (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 696FC821A4 for ; Sun, 22 Nov 2020 09:37:05 +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=FyUO/+ySgbB41o/1Eo+FqVhCNoAwFn7dscXn6u1Q9PPK5pewyPqrJOTFycitJQE7Qsv7roHG0CjDtVpcpyqz+jLrWuz38rv6k8epg3I2MAODDyqPd0IRGMatxTIyYBE6C9hV/WXNsy8Leumo1/1K0NkAyk569C8MTHALJFTq4zyb5TvcwRunBFI/1oemOgwW6mkEnjD2MO4sEw9vz7EqP3Ur/Vo4SkPyg3aYNvHq/7TRev8dhWYnpXD75L9jzz1oQ5ldactAkmvM/ATeKmzBJ+SBR4TKW0/j2QVjHLtdy6lkhaJle5/k7pTI6CNqy71gOLjQfVgsCJcRxQbvDElmwg== 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=Q6Rr5uTurhD3CrXZ3tWKoSCMtO8eJOCUV9fn7p9trqc=; b=kdE9ltLa8QKmSY1QGQUXavqBoZSGeIikvNg8c35EZA39dVA4gFGpckH2zLhmS0B7bz9AfyUsovuRYwn5tI2XX026ShLBQdqL7UQYzMOMbkI5s8yrJ1nIZNuHpjik4aJSolO7wOX7+ryxOM9rRb9+mCFUGhqErGioYtixiSjBn+zLo0TwkeP8mEF3M5Y35PALcZz9C1YwqjUNqb8OiW9WaGTeKqbHVhIt6ser9qgyhcJPbBev9ACwjchwYUI5O/h+N84o7YyD57e5nq9Q1ycoT6JItMGMCylQ8rtr5BaZTAb6FlRJ7zKKVYl1ZSyYkY74HXcOFTIEnPKruTGarzuIdg== 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=Q6Rr5uTurhD3CrXZ3tWKoSCMtO8eJOCUV9fn7p9trqc=; b=Yq6fiiQdZDs+f36pIncn2LVs+Y3XkMEheHXwW4XTA9QL7awGg04e5AjwvQ9iwr4ihw3Ds7uyFMlnbo3sBVA1LKMWeFvaePaFVRJnhsZJ8Vcgzi/WCs9wgZMQmS4obdDMCtYRpUMkC3V9dt4jOGuGq+9MSec5TV0NZFykxmH2ylg= 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 BL0PR11MB3345.namprd11.prod.outlook.com (2603:10b6:208:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Sun, 22 Nov 2020 08:37:02 +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:02 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 04/18] common: board_f: Move setup_machine code to setup_bdinfo Date: Sun, 22 Nov 2020 10:35:42 +0200 Message-Id: <20201122083556.6756-5-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:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d2a9fcd-2a27-4d39-ce40-08d88ec1c893 X-MS-TrafficTypeDiagnostic: BL0PR11MB3345: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g9Vf52BtLzs22hrUGZcMGhX2Dmpm9fXmCw8ZYbDX6YB18WNufQwxHJ1653C72CHp8hhikG93VkJu21uL6mk8C+m+j5gxDBAQaOutOGK5ccPgQ2wHvJs9cMvqb9Va+MVkw2nVzqvHjCZLgj7c9HvLTG97nFacKxzp+yIUH9klcvktReZscNK1ygITiQ7JwTy0f4V5thLWfgNcvg0OEMSHes/klRDetHX8RwEV1AW7O9YMjVVE9HYfqKn4xaZSCTej0jPTErEnj60GOQUG3H6kIRKA3qsTA3CW6TLv7mue1Xg4qupA2deOr0+kJuix4EiAbbe+2E6vm/n1A+Kw6mdNqQ== 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)(366004)(346002)(39840400004)(376002)(136003)(6666004)(1076003)(2616005)(5660300002)(44832011)(52116002)(8936002)(66556008)(36756003)(83380400001)(16526019)(6512007)(26005)(186003)(66476007)(4326008)(6506007)(6916009)(86362001)(956004)(66946007)(6486002)(8676002)(478600001)(316002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xyjp7UFr5MdKg0cm7aZWu8Ff9jzMbt4dTc2PzUMfScfoygm3dJe5w5Pi2gZIz4iYfI++nMkkblE222x/O4cjlw4SQX0Wbtfct/ZHNMqWOwRxi3ovKMrY1fHv0Bx3l4/LjtRH4/arIb1mdAw72pqJtyUSqXvgxHs6lac15XiLbeG9Wqb8wLiJXY2pRPo7ia3ZXCi1oPKz+WV1Uv0z8YXkzil5YKFw+M87WMvEAjX0IHYI+uWHsjEgTncASbCkR2AMrmBMm7PqokxWFu3C1zoh6qMM2ys05xcxqTEHqp7ymOcWyNYBBYaHkZIqlFHgSo27tSWx99KriWDHNHMbKZZ3ZOuuwjByESKhGAHPF8KQZCC1wFZoynEdpfqi1WcQjuHi6UTOiu9s5WbjVhQ4D/Es2bZCzgwh5T8zKtUeic9r2bZzI3H+sCTcOFJLgrwlZDdAa0lfTrXadk9MzaNKsT0m2Xc7j15dSf2yk9na5FTYSB5ADZUYMhzDy546RczLM/6abq6H5GiP8VMbyqsuNlKUi9RLyqM7v2RUbGjR9xXV5loee0c4BonQ7rkg9bodY+F7WG9oK/9X4bCo6V7R/RBpX542LhDytpSs+p53PtW+KTo4at5Ws6/LV/bbP6IFXijXVC4P1V/PnWOrqZJboWijdsSDnLzSoqYGQHYYXYCYL8uMCf3jbbjqT8f3ZcZWg+1cPvrB0PsTcfDwsYksz85dOaZeDdAUpQ772ZZq7wRgmPCP8goNkLBan0Y69CAAUxHbfba5LTuKXo1zb2Un3loB9a+DTqnskGf1+IVi4PXlsJYHVtF8f7JUjNPmAi3QOU5jSWbXaj2BZmVb5vnZPRTkcWAAJHE8r9/y54nDCpuJauN4J9NJf/YtZHugkdQUEi1+psO69qsun1M1Xl7Hw7uH0w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d2a9fcd-2a27-4d39-ce40-08d88ec1c893 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:02.1485 (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: a7MdEJ3DFRcMX1ku6xyMAkwOFAogpiJyiHcAouJ/oUW7Afp9Aac9yw2/1Jxc23aGBL8+nWQpYGsrr0Xjm+mhypMzR+nczYD2b8xEJtgA3r4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3345 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 setup_bdinfo is used to populate various bdinfo fields, so move setup_machine code there, as all it does is setting gd->bd->bi_arch_number. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag common/board_f.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 3c4437341a..fbf622e0f0 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -503,14 +503,6 @@ static int reserve_board(void) return 0; } -static int setup_machine(void) -{ -#ifdef CONFIG_MACH_TYPE - gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */ -#endif - return 0; -} - static int reserve_global_data(void) { gd->start_addr_sp = reserve_stack_aligned(sizeof(gd_t)); @@ -605,6 +597,10 @@ int setup_bdinfo(void) bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM */ } +#ifdef CONFIG_MACH_TYPE + bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */ +#endif + return arch_setup_bdinfo(); } @@ -916,7 +912,6 @@ static const init_fnc_t init_sequence_f[] = { reserve_uboot, reserve_malloc, reserve_board, - setup_machine, reserve_global_data, reserve_fdt, reserve_bootstage, From patchwork Sun Nov 22 08:35:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404445 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=fail reason="signature verification failed" (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=F9NjoYTn; 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 4Cf3cx23Vmz9sSf for ; Sun, 22 Nov 2020 19:40:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2ADF9825C8; Sun, 22 Nov 2020 09:38:00 +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=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="F9NjoYTn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E1568257F; 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 NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 486F882591 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=Iwh3uY9S4ii27JxY2psyxfL8lb2/MOWgcU22KsKTn7WiZVhm1t33Ucj6lQhyUfUFXILgR8YvYd/jYoKwAvzj8UcOOaIf7sQdbWWI+zCd83eAOkJlrpWgKOa3AmHKMKVMb9vXzTVf4KXSRyUV0xyB3jeYH9/Cu5hm5SYTtPDfJcBZOSE9gAKvs1sY9VzNPz+l8d48+Xpgbwt1g7OvU8oWaC9zgT12QeKBw2tvf5gc+oKOwWHq3K6vQKyNmJVua9ChebkRTRyPEkjem8TkzfBx7pcHUP/XCBqkIvHOs8zaX4Xjj7e4zcox+JaAT9LwZtC9MngQPQQNPw3doXEC/NB03A== 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=0vua5M2riF58ddy3AdMZ3AtANZZ+VMDvXpOhEeGl0iQ=; b=CvhZ4YYizZIMYdzl43KWOMh+pRvjxz6SQI+6ggIOT/XdUwrf1hlIyy9aPs7bxI3GwA0LluSJAJL3Ah6HfIZsXRTws3Lwj1DarW6O5TgPtS73hB/o11CH1A4pavYLrhxiokxEFhw52F9BwdnerRbS/di15DK/uaN0vHyV/vagej+UfSkGXBOpJ3FmcLjdufkJNZwYzUqxqJneIhlaUIyzuSgBJ9ZO5x0oVoNr+S+IZnbMqRuw3GBrOkIBhVxuA4pReXj3LD8j1XK9Ys1BcS32djVnqZ6wpZBliCPYgSLrR4xwSj9ajA/7D5j/TrMbcsbJb6UZVXqy3gppSHXJ58Rs/A== 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=0vua5M2riF58ddy3AdMZ3AtANZZ+VMDvXpOhEeGl0iQ=; b=F9NjoYTnlulCgEcniYRXUsGCMhXOp/wggF76PdRztccdrHUJCbDlN5c4EoCpi5/h7RNv7ER2OmFoMemR0ECEXNwgXuhvVv5qnv0RLANM9u43yL7wNu1CLj2B2+ieLOVOiAHvswG4WI0q7s1Ee+4iQ1epbRPdP/PcCPVcoo8N64I= 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:03 +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:03 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 05/18] common: board_f: Use IS_ENABLED(CONFIG_OF_EMBED) in reserve_fdt, reloc_fdt Date: Sun, 22 Nov 2020 10:35:43 +0200 Message-Id: <20201122083556.6756-6-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:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84eb7937-c6df-49c7-53f4-08d88ec1c94c X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 67ilt9vuJTy2fA3Z4Pv2vv7hNqBbjDADK6VfxalCV42khmO9I6+g2e9qraVvwyN2RO4hxVnQmNz+34aXln01PRKh6iLFKUVQdrIMg7FUAJztbXKqQYOW7Y9ypJ7oHofhXvd6BiuYy7mlC0vCeKSciatDRQ+0JC1+GRV0elBUzUzUxj7eoReXhtI3fpoSxK1cUnZ1pvI7J2LU/sqqfynyXeg+Eg9i6VbhWXOha3VRusXmdckvDjtwBnDW5O90aUVIc3p9FaFKiEGjy8DNRV3UrGRcTIHGrOWo+WhjJy1GypwB6GIFG4ZKycTxFRKmbL9y 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Rzakc9MmpUu4rkApyffKG3eDaWHBntajpBg43vI76c4iH7n/rDqzneMjG73cdRT+qNJsG77kP7ES7jXuROXY0zk8wQzV+VtRQar5xnTxQG4V81crnzjlI0kNlCgW6ReUuGyVy6RBrRD3NyNppYMvGKyxbBR1M+3Ir8KshEMl9ALFyW4MP2LEPff3NI7MkTmr5J2eyr4H8S31gywxK8ifzr3IzjywdZ8wc/05fGmbiw0Ia4amhujsKN01P807OpVyS49oByQUzONzWBhwwFQtoYJDGAllrzF0fe5B2OAyxbjgL/BsJXxV44xKGFNa83f0YhESotc+RAKHZSMs9GV/ZNmZPMLbMfNoaIccqsR0LLVg8PkrfKncHXpUIVgYwJLKclz7k/IQ2UYO8rYV1wcbpOtifHZIBbJhTYkFUMlQGumV5lOP0StvPsuPzuynt0GEbCHB0iIF0R56y4jxAWpHxbtnXG25vEIqXhxl+t0jYUjMsADDg6DJiEEWDBKLKfthmyjMNbOesuZRFJv26H678QyMm5Ep4YfKXzMjgRclqT9u9prDP70515Lxj27ikjnBj7MwiSDtMwnTr05M4FOzKYuUifcqyoFHWQNWd7RCN9FAFt5WBW/zZqEpckTCbNdlLVOhLvtAypJLoqeKRUCMVS0Z4fzbOuQZt17+PguUSpav/ZOylUSfPZe02juZxCZsF2u3E1v7n2zndSMvjBmBizh7wJHECO2CzmtPXkcFbU+R/w/L92KLTfa9bcDvN/nQxeZjTm/awSnlpmKqH0zpQZSVa8g54IpKTrCJnyqkFbS+onmpHgWjfznaB0eGVdX6cinEWuz4bWywY+5uQs+tlsO2LE6zKasFvH2Ls3nuAfufnHBeWHvazxeybko1n78CuIVVYKs2p9osKEQYBHx8cw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84eb7937-c6df-49c7-53f4-08d88ec1c94c 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:03.2038 (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: H3J872QxVHACN0ZurMzXx1GX5UevYluKm0OB+ZDbun9aHP5ftOlKMyC56C8LRxnjvaNR1Y9FlKvynbOyzSphI0Ek477t3QLcXh83COTLha0= 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_OF_EMBED) in instead of #ifdefs in reserve_fdt, reloc_fdt functions. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag common/board_f.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index fbf622e0f0..ae3001bed1 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -514,21 +514,21 @@ static int reserve_global_data(void) static int reserve_fdt(void) { -#ifndef CONFIG_OF_EMBED - /* - * If the device tree is sitting immediately above our image then we - * must relocate it. If it is embedded in the data section, then it - * will be relocated with other data. - */ - if (gd->fdt_blob) { - gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); + if (!IS_ENABLED(CONFIG_OF_EMBED)) { + /* + * If the device tree is sitting immediately above our image + * then we must relocate it. If it is embedded in the data + * section, then it will be relocated with other data. + */ + if (gd->fdt_blob) { + gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); - gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); - gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); - debug("Reserving %lu Bytes for FDT at: %08lx\n", - gd->fdt_size, gd->start_addr_sp); + gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); + gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); + debug("Reserving %lu Bytes for FDT at: %08lx\n", + gd->fdt_size, gd->start_addr_sp); + } } -#endif return 0; } @@ -616,14 +616,15 @@ static int init_post(void) static int reloc_fdt(void) { -#ifndef CONFIG_OF_EMBED - if (gd->flags & GD_FLG_SKIP_RELOC) - return 0; - if (gd->new_fdt) { - memcpy(gd->new_fdt, gd->fdt_blob, fdt_totalsize(gd->fdt_blob)); - gd->fdt_blob = gd->new_fdt; + if (!IS_ENABLED(CONFIG_OF_EMBED)) { + if (gd->flags & GD_FLG_SKIP_RELOC) + return 0; + if (gd->new_fdt) { + memcpy(gd->new_fdt, gd->fdt_blob, + fdt_totalsize(gd->fdt_blob)); + gd->fdt_blob = gd->new_fdt; + } } -#endif return 0; } From patchwork Sun Nov 22 08:35:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404444 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=qA36qMDk; 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 4Cf3cY6NRQz9sSf for ; Sun, 22 Nov 2020 19:39:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59013825AB; Sun, 22 Nov 2020 09:37:52 +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="qA36qMDk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5055382580; 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 16FA8825A1 for ; Sun, 22 Nov 2020 09:37:17 +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=A4Sk12oJFF34e9+Rbuqs8Gs5nih7X599AzwSkyr+Ore0xyw2yb/4AnM6h8nilTVP3+MBGf+CK6Xpln4gSq8JGHV/sJISTFOTu6pZWSx946DHjba9JanoZR1TrYcbmf8r5Gh0q5rGTuRGaJU+g3esHX+VHJMN3WgsmLIxBnBJDdDJW8i7dqtV2n/O+hK2lr9D/s0MufxF3yLzJKdLrSGhjfl7QBbkKHlsSI1VpePXNWd8i9TYAQmFIPYrzXe+ytoQI5ayZgsAnmSUBspQt2BKkV+z7QOfxQizJlM9pt7ovD7Rtn3eHqqazhCttdaYADty+zKFrf+zH2nnCgLcuDxMYw== 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=7lQyWAFYIH64x/9w2i0UTDGciJK+aEDOPW4JCR6DjAA=; b=DJvGku4HTOXnYXDJO2L7+Fzu/+qvQE1EQJ/gOtEmEOCuJSYrebokgATaP5ZuvlX6uXY2IelxDYbEMkyvGXqeyKBYuJnqxR5fEPiPf62DN3SI2x5yWFhxPNhMG9A/l9t4D5N6FYMUBXXHM+1BCqH9HT8mCFTgESqJ8EiW0NWbp2ydiTYgq2oVY56h4NWowaubVrLrt/G5lw5qCT+RYLdGmeBZbNmSAddW2GHHfDt9bCo9HIKQXys32WM/aNFm9I8XaoftS5u3ANNLmrr5EHziom5eWQ9Q3S3udRvproeGwHDfLRGlYpKvIAOnYR83zyukbsyAKApIj4bmCkmPWC55Rw== 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=7lQyWAFYIH64x/9w2i0UTDGciJK+aEDOPW4JCR6DjAA=; b=qA36qMDkVXCBdmK4zBWADvbLdaloL0TWzMtiPQ7oqCptwBWkqo6gnJXm9MeVeZaphRoOXG/kVMyF4fhUNpf4IogMKvPNoY5ICphmZww0rhjnVhSV5KBWt6a8sFXvh4FdmCrV/ppyTaf0LTxELnWNu+Q2U4IGf3CIH+xD/Y8N3DM= 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:04 +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:04 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 06/18] common: board_r: Drop initr_console_record wrapper Date: Sun, 22 Nov 2020 10:35:44 +0200 Message-Id: <20201122083556.6756-7-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e12873f0-34b3-413d-435d-08d88ec1c9f0 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:361; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SNIZrGjJJnwjzPIaxH5bpWU5F+2FRRRzY285blWOVwdlulqzVggk7G4jrLXihhLwnBDxkKOP9CrYgAv/r55g+ruIeqJVioHe7g/PFFs+5OTRtI0hR3/d/SYc3o1KkHD8ryiSm3n7olhkO7f3We4ZfdUU2jH0ousnyRGGhj8e8kBzanTlzp20Q9mpnmaS/hj0v6Cr3ilVbR/8KwDGCXMa6hF/y+ocsAlykE2W1mUkI9reX5avcUL+VBvDUPwZk+iDYv5AvKU8siUCfxeZmmZZOYRxnC6VbBUdAg/5Klj2afJpJFMMQzEjuCpTWneSYvb1 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: aBGyFjfhQSoRv4hTEXhiXBpq9jEqYJxGwvrVC6IUPhLLTIEiRLN4uYnleeLvvR2kgXc9lhew4S/ETNa3YtXi/x/G7Ltfs+z7x4arjmWiNpsazFBmiRw/oPbkkS37frXzGIvYMUKhqMfsLrrbbtJTpqHSfao4EmNCIgBFTuDvenJzkBimC3Rw1PHNGntZBJ9lCf/FVAJ+T592jKmycQxde5Ld4e/iR5+HeZjj1xi+HSUmzo8vRvTSomJkZLtDi3HIgJrZLMq+W/gPdNc4TFgU8cVSLm25DoKEftyCtFtXLyK58YRKiGndhLylE3ABGxi/qU0cMXx8sVJRs5uYT0jIOXnw1Nw3ZV1bGXrVIbf8GGkbVvmnNwE2FxYlaehTUhDJ+rkDcysr+T+ID192w5YkKjiqbjTzi3YYp3UPc6ZfPhI96i5+DlrI4ySJ3IjPxJjc0ouZYL4DuzdxNqvcBLpunGEYkb9B7Wbfjxash6bw3WvEs0SZNG3zZW6IxCr/EAMaTRsMo7LFZXXMIj2dvyY1vE8rK1vx22kUpK2BZn/L+ZH6X9yWhrS9mCbc/okMgslh5R943khodWogRXGKCceHcKphMKYb4gnSS1gqNr905gRXNgkgb18nPmqNd5EKoyVSHBrCHFK5N/THdn4nyI4uEqxA8rrjyyreKpHMMz38SJRxyzwquNAFPRXoJc7Vn42ozTnAS/9McgJgEMVEAbxKhm3m5OFQ0cZqw6g+5uiLFRDqpnOHdXCGcE6Jrc6JKRIOPPtEsE7sYri6Pgvo30VaCEqZROk/hPwRLtLfAjEebor7kgOT205R4eiiF/On2qJOEn/S4mVvNW7uSmHVmdpIYi7wXTGQN0pjktzXcP+WjkkseYcQG4yqRseaAknMZ3Nek28glijSm5N8uhyE4j8wiQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e12873f0-34b3-413d-435d-08d88ec1c9f0 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:04.3931 (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: OguYRNjrC7Csewkmn0buo8/5/HoSF0ZITnL+oZhEYcTupACnypPlDGpzsL9FV8c7pUg+jVJM9Ex+/0SVwyn48gB/521nhJguF87daU9uNog= 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 initr_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag common/board_r.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 29dd7d26d9..07c0ad363e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -282,15 +282,6 @@ static int initr_malloc(void) return 0; } -static int initr_console_record(void) -{ -#if defined(CONFIG_CONSOLE_RECORD) - return console_record_init(); -#else - return 0; -#endif -} - #ifdef CONFIG_SYS_NONCACHED_MEMORY static int initr_noncached(void) { @@ -713,7 +704,9 @@ static init_fnc_t init_sequence_r[] = { initr_malloc, log_init, initr_bootstage, /* Needs malloc() but has its own timer */ - initr_console_record, +#if defined(CONFIG_CONSOLE_RECORD) + console_record_init, +#endif #ifdef CONFIG_SYS_NONCACHED_MEMORY initr_noncached, #endif From patchwork Sun Nov 22 08:35:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404446 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=DIx8aflG; 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 4Cf3dR3XxJz9sSf for ; Sun, 22 Nov 2020 19:40:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D93E4825DC; Sun, 22 Nov 2020 09:38:03 +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="DIx8aflG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 643D7825A1; Sun, 22 Nov 2020 09:37:33 +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 99255825A2 for ; Sun, 22 Nov 2020 09:37:17 +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=d/3/arIk+RHVuSYRmlKmFZsPn+xV8BTMcVZxhNHiDkGH6BvnbNQbDrsjg4oObd4Z0/j12zhDstSOLhLtLJk47AQK+Rmewb+TdZoGnHER18LrZ0uvW+xYt17IhHkcrZYTZExUgdxHaw4h0LrN+XJCisyG0n2ZkQJnfEbSu3UkHJcs5saxCXtQFqxoKsuRiHLpiw8EbnDSS6cFkEbEW7I8C2G9lSbuBijy9IiBb8N9Fvr19WxvQboEniEaofE05F0MIke+2V7jen3eP0Fyv6VAVVMIoZc/+4PIobpCNR4A1D+DhY+g3LsNgrmXenE1MUNXvVJ2+WvTzMX+kvY/YFwh6g== 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=YXCOwHfrkhTyygaZoDvXyGrn2NCMk/prgIq2VpDo6iY=; b=EIxHusBwH0PznaOG1nskKdvrMCQ5ypdQOIkKyxTfedfDfLJCNN+qD6ksdKCCUbN9sfvDWBuUb+i2OhB7plML+NQ1GUjO/thi+LdcaneWdf/58OcJZicHCk76WHQ3dtMgcuHvkLzmH43gAMdA7rPsSAZ5wq1+/exgbCX4+A/m7L+GwJquigTrx8hJkBLeaGebqsQRo1a5w9HwfSPfJSkPcy24VXESYefl0tpX1QFmthYFfCTosnqQ/dLN5TYpwC0puv8lDrtv3ri1Tvn/Gf1BnSyNVpfJsdwKEyFwuWb0VySBO4nndtrKYkQYzhw3Drch0NoYuzWjfR2OAVjMzlOIhg== 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=YXCOwHfrkhTyygaZoDvXyGrn2NCMk/prgIq2VpDo6iY=; b=DIx8aflG5/V5zpXAKb7Tk6ddrX4UiUNVOywtiE5KaPmgYeW/bTi57l88eN0skH0KDaoSVB1UEmVvF0XeE9tyE2zSZ1LSQl9bs3aL3IQMawSfQEirdD+Rv9gNSLSm+Nct54RTv+RxTAUk7rSpJxMlzWX6SWBzOYiWtztp9gVT9Mg= 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:05 +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:05 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 07/18] common: board_r: Drop initr_secondary_cpu wrapper Date: Sun, 22 Nov 2020 10:35:45 +0200 Message-Id: <20201122083556.6756-8-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:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97a3a653-29bf-407b-8f6e-08d88ec1cab9 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PnciYkSmn5uQtyIZAp0/vZxIBNsve5KeeaIh8ZNhcMpauZAGY1hB0Ra+BE/FH6BGvsylOH0YKZ72X7LX1W7HPP663ul0hamg5n/Jx7YqY0R7EQkxPkDKUd6WP3pGUblFFhYuNtBr1jfBOTwEzshOYjEc8Ana3GUiqACkzzXyO8id64w1l+gKB8hbxD6AU3xFqr7O0NCCfeKT9JZWcQ9MVr/aMd+Gdje4tGIZQGDvr/t+BaAUooEEB5/CJmY2olheGCQZIzExkjx34IIS2F5xzrRxMg5e31u9WTlxgNp5w+/wWj8QQt4WDv8MJmnLhQSbtP2JHfoVllACmwWt9tIzSg== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 7vetj5RxI3zI1y/twwC3sAtRTfsW6436ArUIsWgLndCxZtmLx+zyiJyFlOyo13l+ErY5XU5Dg+1P+8Ee/RcZife68s3anGFTz4ceYdBBrGGc8UotPzQVjSZU1lkYnIhaLpES+g09z46RIclWV1M4RwgvxJWcwRlNM3l4UHtyuFOV0rB/lcXnf0L5Z+T1aGBXcQ2YzzdM4Q2y1pw6gII2ms9FeYlHDAZx0cT87g5jVrFmSGVLRYySaEz4hFSzdyXkbk9Gq2esLlD4Cv3nxTyR6hRS0zW61DE5FZI4mG/UTP+oX+rarShcc6OlLbo6ETFq2L30FYrWAG+CCjCXqCMviRGMWM0a4R140sJiSoXHKewV7xs0LYzD56mrUKMU2Gdf0Cy44ynEfUq78ud4mbxdriSEinnR++A+/x6gZ1ypCU/pwjYRumbEpmb9Xeu7KD3ymZXIV1NIgXdkYSuvRQxhqcnNjE1GOjdm1kSbnn/RaqtQsFMVlTwhRMqczG6UHl5QvldjUl+O78EvVDI+wGSMwS7Vt5oC36E9bGm8x5QMxK4IRAdasjPlfpNzwXsxQnV0yL+jEonBFb3byRIAX+F0oIjbl3LFGvRL1OSBy1QZwDxyWxS3W7fOcGRVcgMnybtel25qtcO0SoNn7hMgwPc2K31eA783dhKpqIt7uRTzEyUusOxOTntJcOaJb8EC/yY8NU53Wq06HWQelQIsLhNu6o/CcXAN4yD3mjQegzsYkwTP2KynDV02fttnbFzmBMs3MV+l6CHSzKD5hR8P9emIy8KVVmdidtQmdTBI4unrzJUAa0BK65X2omJsceYLSRiTuEjXC6TFM4QJJgCNBFmtO28/EP2zMxrPjjR4voIv9NGubjUottKX4RFGi39bKlcKqbgc1Wbu9hRL+petTPs1zA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97a3a653-29bf-407b-8f6e-08d88ec1cab9 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:05.6294 (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: ybYuC+kYdGum35lQmxNsqIcPp7c4ilzRBONVO4G0WUJtvMVYvQKXGbtIYYHy9C7W6KWBZ/PuKlhCq8UijAxbSv4UR9q9DiObhYBjpJic0y0= 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 Add a return value to cpu_secondary_init_r and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 +++- common/board_r.c | 17 ++--------------- include/init.h | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index e0f0f7ecda..e920e01b25 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -1028,7 +1028,7 @@ void arch_preboot_os(void) mtmsr(msr); } -void cpu_secondary_init_r(void) +int cpu_secondary_init_r(void) { #ifdef CONFIG_QE #ifdef CONFIG_U_QE @@ -1040,6 +1040,8 @@ void cpu_secondary_init_r(void) qe_init(qe_base); qe_reset(); #endif + + return 0; } #ifdef CONFIG_BOARD_LATE_INIT diff --git a/common/board_r.c b/common/board_r.c index 07c0ad363e..a291543d74 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -91,21 +91,8 @@ __weak int board_flash_wp_on(void) return 0; } -__weak void cpu_secondary_init_r(void) +__weak int cpu_secondary_init_r(void) { -} - -static int initr_secondary_cpu(void) -{ - /* - * after non-volatile devices & environment is setup and cpu code have - * another round to deal with any initialization that might require - * full access to the environment or loading of some image (firmware) - * from a non-volatile device - */ - /* TODO: maybe define this for all archs? */ - cpu_secondary_init_r(); - return 0; } @@ -801,7 +788,7 @@ static init_fnc_t init_sequence_r[] = { initr_malloc_bootparams, #endif INIT_FUNC_WATCHDOG_RESET - initr_secondary_cpu, + cpu_secondary_init_r, #if defined(CONFIG_ID_EEPROM) || defined(CONFIG_SYS_I2C_MAC_OFFSET) mac_read_from_eeprom, #endif diff --git a/include/init.h b/include/init.h index 0f48ccb57a..7cdc47cff1 100644 --- a/include/init.h +++ b/include/init.h @@ -163,6 +163,20 @@ int arch_setup_bdinfo(void); */ int setup_bdinfo(void); +/** + * cpu_secondary_init_r() - CPU-specific secondary initialization + * + * After non-volatile devices, environment and cpu code are setup, have + * another round to deal with any initialization that might require + * full access to the environment or loading of some image (firmware) + * from a non-volatile device. + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int cpu_secondary_init_r(void); + /** * init_cache_f_r() - Turn on the cache in preparation for relocation * From patchwork Sun Nov 22 08:35:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404448 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=AWBpOiQY; 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 4Cf3fM5spfz9sSf for ; Sun, 22 Nov 2020 19:41:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 250FB825FC; Sun, 22 Nov 2020 09:38:13 +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="AWBpOiQY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 08582825D9; Sun, 22 Nov 2020 09:37:42 +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=-1.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, T_SPF_HELO_TEMPERROR autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 EFFC5825A4 for ; Sun, 22 Nov 2020 09:37:17 +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=RggqOFoOShgWufwmnhzpj7Au4kuEFXwwVXibJIhBkKWgHoMGYyne7wG6fOkod80NXoSV+m4YRU3W8fXSLWHX5nRQuC1Kt3PNPmLjw+O7If2CtHwPgoom69nKuwMh2SlKCZcTqeLnkh6giUPooiZS4vhSct4mNIvY/AiEDOe1Sn3Yo39kGlZs/xaUkVZNGWAMaI0tmriCZvg+uWYX7uBW2h164HEmE7rka1QnEJQzvvbDZBXN8TJPpnCtEopf4jMKfQjzj+l2eKEIdZi+JoW1zXhxu0MhD6G6+QbAt94m2qhqRl0d0sKVqY6mmmdO/zJzCEzaHo7fi6f11Ewk+mkRsQ== 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=B152Vs81h6v1SIROCQhLa/3Bbki7wgU+x9d6rXrxOFY=; b=NEYnoFkAzATipi7H4VNicjNZ4mw2AVY10bFoF4nO4eEBKq5PzXmwR/upKV21vFI0VYbj8phA3n+1Ry9R34E95lBd8Wi1y8/LoPkpDlWXPalRwj11LXf4Pd3Z08rw9z6OKjTkuXk/smgM4E25YPdA2TEfuyG8YTIMNExC5NJv21g/Z73oS/9/3AgWuwydrEfqPI1oSkd95pA1thgKD3GjpgoYaJz3XMwFfvKMon4WfT7MAimmMb8lVLXu1cefQwrggBRy2aGfzx0Vs0BJgianuDV+vxRfkDTEDrujkJZWwGmJaZXd8dSDMMHUGN/9Q9um92dqXcc2JkYizh8jTytJyg== 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=B152Vs81h6v1SIROCQhLa/3Bbki7wgU+x9d6rXrxOFY=; b=AWBpOiQYChLHZJMett9zUn7OYFlEzRzPBG9lsg7mv2iyqWzToHmhR8qsJTO0XVd0Fkez8faMD8tZjDQPzrzZuQvtVg4FEUwIo7DRoLGB4dyDUJRwNRII9Vy9LcH4B9lrL7TK+dgZkiorbaJiyZf47jJXD/ldVHBuJQZTS6oHp7I= 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:06 +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:06 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 08/18] common: board_r: Drop initr_post_backlog wrapper Date: Sun, 22 Nov 2020 10:35:46 +0200 Message-Id: <20201122083556.6756-9-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 521a9e9c-ece5-43a1-1f7b-08d88ec1cb5c X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D3N59ZNBTS/ONhqmgEPumniYzojR6NfskIa52KrpSHqO0RkKm2QAJLEHRNMPehOlvwDbuenTmnaQ4OdM9dpnEAW7itX/puMQ75KZP8NjvOXjs9kRhqRYXr0NoI4Xjj0GduLWVU2TMC66DPdmkK/7JHzcOFPorNmcS52rQGaVNxy1eX/Jtu96XhTC9S8Wahv12OTYenYfzDfZh3nVn5if54nQ9cARUYPZkMA6luZn+/UPk8kfbv+evXSwMx//AJGbT/BvSVSRW0qmRgZwCpAodpcFFeuqyHuR7B7lwje6Se+pZxtjXYH87/BVNFPTry0X 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: F9Yg9N/GB37J3Jzche9uW6ycacM9H5k/9hAIQzN3IReGNCab8MLPhpKeLCI4/6gr8LpTKCuaHbphngDxihWrbl+u1O/hqIl5Pw7szs/96P7nwuPZ6vCbTHwlDO/fbm2BO43WSvMuXEcNX5fl0zXgJl+QArdHY206Dd4aiqZkN9gYMx+bwnbRaGUsT3JcfJw2COHowIGjpU6vlAI4vZv2hHohxDcaLKYJGh3bOEQYwfN5gfBALJl0jSRoWM5Ceq4nJGoLfHaLm46MhOULcmANYfwQt42n7m3SivLv0Sgqc0I+icFVdnPSxQMwf2OBHmvVBeW6sYLi+N9Z8nxi3lHqZajLbt9dpGNqYhPPs/LfUrEN7g2kKZg5eEjEG6GPG4X1tBnQqgLjPccN8K7/qbaSqZPpCycigNiz9jBZjVoTlLaX7zhJ0fRIgjvn1nxG0VDkBD0J3kjD9znOxgnEjdUFT2kzRbzOvDtFXOe0dXu1XZbx73t30D1HjrKY87MJkh1b27UgoW2R+XDA0PC4q8pKSopEkurl+6vbUIWTvZAdP1rZ0QJ3YMwrFt1rEp0HyfnrzixUSy66S21pS1xM6S20CUfsHdeSh3LFqerPoXR1yNqpgl7rtkA7icos+UN15W7ePjR9zn0p8QSmbe4/tHJBriBhvaKQJ25H7qL0gaKQgyLBamMnHFsEsPC6T1rmOYOYakotbRMyowt+d/G7YTG69xW/FiDC4d/R042DGRInBXnNPZwtQ6t71YNmi7Fq3H77xXKDqaw9rBxmtB5UpT73h3UCv3hIp/RGEp8w97T6HhrbqD28c5kVgSHp7MzNJuP6SkqLEbExUR5EZ1VDW432Ip36/QziAxz9LNI0GL9xE0CtDom3FM3FQ0T5ZW5bo3wtNVPwQlN76ea9EUaluQVOEg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 521a9e9c-ece5-43a1-1f7b-08d88ec1cb5c 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:06.6778 (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: EZdSiv1LdQ9QHimVJZcfAO/0/ulS+VPlWBQxZPrYE5m0/3nla59zOz75WVJNeDpN8+TQM7H8G3+/YDvq+doKxeiWAkhSPWkxhMSVXvlLdv4= 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 Add a return value to post_output_backlog and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment common/board_r.c | 10 +--------- include/post.h | 11 ++++++++++- post/post.c | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index a291543d74..7a06627ba9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -206,14 +206,6 @@ static int initr_addr_map(void) } #endif -#ifdef CONFIG_POST -static int initr_post_backlog(void) -{ - post_output_backlog(); - return 0; -} -#endif - #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) static int initr_unlock_ram_in_cache(void) { @@ -746,7 +738,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_POST - initr_post_backlog, + post_output_backlog, #endif INIT_FUNC_WATCHDOG_RESET #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) diff --git a/include/post.h b/include/post.h index eb218acde5..5695e2b533 100644 --- a/include/post.h +++ b/include/post.h @@ -107,7 +107,6 @@ int post_init_f (void); void post_bootmode_init (void); int post_bootmode_get (unsigned int * last_test); void post_bootmode_clear (void); -void post_output_backlog ( void ); int post_run (char *name, int flags); int post_info (char *name); int post_log (char *format, ...); @@ -116,6 +115,16 @@ void post_reloc (void); #endif unsigned long post_time_ms (unsigned long base); +/** + * post_output_backlog() - Print POST results + * + * Print POST results during the generic board init sequence, after + * relocation. + * + * Return: 0 if OK + */ +int post_output_backlog(void); + extern struct post_test post_list[]; extern unsigned int post_list_size; extern int post_hotkeys_pressed(void); diff --git a/post/post.c b/post/post.c index 0f1fe8d905..7d6a647312 100644 --- a/post/post.c +++ b/post/post.c @@ -128,7 +128,7 @@ static void post_log_mark_succ(unsigned long testid) } /* ... and the messages are output once we are relocated */ -void post_output_backlog(void) +int post_output_backlog(void) { int j; @@ -143,6 +143,8 @@ void post_output_backlog(void) } } } + + return 0; } static void post_bootmode_test_on(unsigned int last_test) From patchwork Sun Nov 22 08:35:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404452 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=bic7s8XA; 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 4Cf3hJ578pz9sSf for ; Sun, 22 Nov 2020 19:42:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BB5F825D8; Sun, 22 Nov 2020 09:39:09 +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="bic7s8XA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BAB3825C8; Sun, 22 Nov 2020 09:37:45 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR autolearn=ham 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 2DB69825A6 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=X7Mp9PkeAGljvafK0JwUNrNYrYtRgTQ5ns7fJ0qfYgGbX72/uaq5m4qvVhJyF821fdDM5ShkQpVvYz8EP3Htt5uMPp80XnbsPQJkIdwjzLfGcro6CoGP5rUx+sQsqHSA/pYZjyqU1se/DykcPIcMHNyiqZPxgqq6QfQCdEO7e0+M6x9vA9nJPJx1VSiNOpoTw3kj1cZXyrTS2BdTq1TCLIUD3aELwk5ZwSLQdJvbhARz2od92L07Zdo9lxCjufA5CfcJc8FL8ubN61rUZ1dIQXkgNjCHNv0rnhXiv9PKUfNIqTFteQvgf5dOwFU9zCs+ud1d2/kyYkXgCHCgwokehQ== 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=hrJRnAAq2mluwnR9e508wDwPmd65lUT04X9aoIE5c8Y=; b=OTomB4qWseT3o2Ft5YNAboxcy+TNEnow0Lq0yHLC/0U3uonTC29OAQHeveIwGhQ8NBj1F99jBVNhwovQRLRpq8O/2g9aI27y5A5UNpZvmDENfbFDUpHJMPymLwJ8atUcO3oo+CF0OiQWY13oo5KqsFr76NEL/xVUj58AWPVXQmSgMPdm0Yg5kjnZNZZnpFC34FEVA1N3/p/CX5wkUTsaRpw8y6g0fVoC+iEbLNKS34nzCeRnDUHxT30MViSD6P1RllJI6cXxgbV4NjeQKUrclhPa8yjZvSpFaJqk1fU0LKyyIopllIfKA9V/EqClcTf2S/LZ3jewRzWD5i43r9w29g== 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=hrJRnAAq2mluwnR9e508wDwPmd65lUT04X9aoIE5c8Y=; b=bic7s8XAOe9fgAL7PZig2UB+2VYW1J94mwtdrr8HYA+lkVPGr446IW/awb6JPjCFjNhZq2ne8GJGv1NPSLgMOPBei4cyV7HMd9ZMSZv3bH9P5RaYvoP28B+89z9WaDuR5GfBR0BjhEwwcN0jejippoYFfo4sVEDpOlsMHsvBcxc= 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:07 +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:07 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 09/18] common: board_r: Drop initr_pci_ep wrapper Date: Sun, 22 Nov 2020 10:35:47 +0200 Message-Id: <20201122083556.6756-10-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:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 608d2bbd-f213-40cb-7bb8-08d88ec1cbfb X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ocpvqPK0YuQ4tVIWICaaPLVIH5XaVWcpHbjAfCtbIjuK3znH/W/teCnFB8tO/0UEMzk8q/H57YaJoBH/vNNHCUJjkX1GiOdr4jFp470G0H8GmdhkFkfIFI1thr/nZGd2fOEcWXudyW+pcu66B8UAt5BBX+sS3NJOarxywG+e5XOVDET0yD4q7JpKqP/GKOI4Zs7jI3YOUUsHeLSbfNqgzmJIPlwEBIWKfDeVVRDLsVoa8LH2m8RuQtqv5qjaMk96BRPxfwkGnSMnOxQDoFf2Np2Ut6paZoQA1BlKQi7mL5a48PMPC2u+tTqQZqI3Ez5l1nQnni99NDbYd/XSnikmXA== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: zovOYdEz4haMWawUk6/mNLnNQVivHEpwvKboL+XW1sXhxdAyghsHL8nuRp12WoLKSua+1ja09pB+lBcguCMtOdf9ii+P2HOZcq79Fcc6L4ywxa/eg1g839zaJBf4PYYZQCL4f3c3x02LHY5g/rWy71uwz4oQD0Lw046S8pfs1G8RgfyHkS2QG14tIXeli4SP3LEhlOPzvKhFzAp55m/mfzBlQlSF3beRrNKQbqS0bbdJo8wVPcnkOuWDBvt5P51DthJCNmx0dyF9OhtJVM8QDyuMhAikUe9QIYb/mIin+Jj38OyI20utKaGxVjBe9E3wb7YK4RVcJ+XGX5O95tjDpXXhEiTsn+5rVIBNdih/0wN3oNyhC9Fmq0mdAkbkWvu8UjlbHrXTpQxrsDkKwpm32cnr6eRQqT6IZzvuJhV7n1/DbMF944XQwrzscU//eJPCQyp0LL9gmKtsCxfhchfrpohw640zP6jOevvbLxDFii53FXpwgdxTUk7ZtMHo0qOHnOQ9IRv9Unkfc9bxixfLFzO+qVXQ3Tl4iHlujwlyogIpkoswNIyUxR/Q1uwyT9nLYB+ZfsdSIxbTWGqgdqQxXlo9xzCbwUcCSpdlORa2w4ZmTtn2whbNDR9AkTzCF4blyJmk4k1cMwAx/gFTB3clzKfX56dOs1nrCMJbOlXY1I3yDeIUsW6O4fANvRKal88Dt1uR/YAnHJ3zfKi0QCTx+32YkITM6eO7WvrUByMNed6SD89v5DnTg9/4Q6UZqf7Ih6d8T0bDWxm3iSx9pFMwWF+S/GAGWTUK5buaMqYtqcIDWC5hGjkgzLZ3++3JGrBI0axAwmiY0Q4JnZwmiGcNN1srCuU1uxiCl2JnuDzsfz8LoXZFMOssmEBX5+X+s2ft8OdlI1OZYUOAgELOpeme7Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 608d2bbd-f213-40cb-7bb8-08d88ec1cbfb 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:07.7252 (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: yd7Pvg71mRTkPTv7muvhIfjB2kJuP4XpjnPMvtNxSAgj2urXMxqPqnxF9LZwEvPwT/xrvMN9nGa73MDAge3i53rOXD45PtkX+o+ZGufkeXs= 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 Add a return value to pci_ep_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment common/board_r.c | 11 +---------- drivers/pci_endpoint/pci_ep-uclass.c | 4 +++- include/init.h | 10 +++++++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 7a06627ba9..d86ff0cb5e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -214,15 +214,6 @@ static int initr_unlock_ram_in_cache(void) } #endif -#ifdef CONFIG_PCI_ENDPOINT -static int initr_pci_ep(void) -{ - pci_ep_init(); - - return 0; -} -#endif - #ifdef CONFIG_PCI static int initr_pci(void) { @@ -836,7 +827,7 @@ static init_fnc_t init_sequence_r[] = { initr_bbmii, #endif #ifdef CONFIG_PCI_ENDPOINT - initr_pci_ep, + pci_ep_init, #endif #ifdef CONFIG_CMD_NET INIT_FUNC_WATCHDOG_RESET diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c index 38a5f08376..aa89701de8 100644 --- a/drivers/pci_endpoint/pci_ep-uclass.c +++ b/drivers/pci_endpoint/pci_ep-uclass.c @@ -210,7 +210,7 @@ UCLASS_DRIVER(pci_ep) = { .flags = DM_UC_FLAG_SEQ_ALIAS, }; -void pci_ep_init(void) +int pci_ep_init(void) { struct udevice *dev; @@ -219,4 +219,6 @@ void pci_ep_init(void) uclass_next_device_check(&dev)) { ; } + + return 0; } diff --git a/include/init.h b/include/init.h index 7cdc47cff1..c6c5f34b55 100644 --- a/include/init.h +++ b/include/init.h @@ -177,6 +177,15 @@ int setup_bdinfo(void); */ int cpu_secondary_init_r(void); +/** + * pci_ep_init() - Initialize pci endpoint devices + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int pci_ep_init(void); + /** * init_cache_f_r() - Turn on the cache in preparation for relocation * @@ -249,7 +258,6 @@ int set_cpu_clk_info(void); int update_flash_size(int flash_size); int arch_early_init_r(void); void pci_init(void); -void pci_ep_init(void); int misc_init_r(void); #if defined(CONFIG_VID) int init_func_vid(void); From patchwork Sun Nov 22 08:35:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404447 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=jU2TWAZQ; 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 4Cf3f53Kqnz9sSf for ; Sun, 22 Nov 2020 19:41:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 30A66825EE; Sun, 22 Nov 2020 09:38: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=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="jU2TWAZQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CDD6B825DF; Sun, 22 Nov 2020 09:37:36 +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 NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 F1174825BB 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=dwrEHWYvSl2MKhGkB4IvbosHQWzE3WAB6vD2zF+gofflT8dbIYDxqodOgTDx3lhYfnJ3AgKSm1KhdnfvCaqq5Gn0tfTrh0CeVLdlKS97aa0lYmMtOuqEwOJ8LKLvElGYubQXXjsSS6J+ErQ4LrQcGIgmP0fbGxVj03NYug3/6s5gsr+g/ja3G+DhkIC0eeqeVjFaeqIdikT6hMgY5Ly9po8U9aegWEmLvAQEzimaYHRGWhjxs+6I0ktN5pKQeyou0jYk0ZJxiv73MuySj3wunTxkpvgZ2e1yZBNewIui+LgL1sGK07Oe1oYRngV1QG/BZEohR6W4KieCrHqzGYVLTg== 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=GowFMJQ6xds1olwocSDoFjC+ToqWcS+mjrylgHTzTRg=; b=ZRPTkgCb8xKKn0iNoejMoLGcAlPxGO+T6yUQWJb8I7kCSQhrVaB4qA//1N1snjfES2KnLzLQ3qf90GR7UlhQnb8U6Ek9s21MZB8UwvLNLTisE7QB2tCSLqa6QcdV8S2qhiKajff1qnc0J4LCHY0ioJXQ2ukdx8jwXlhaaOxi3en9aFOIoHcHu5VxaMAe4NCEdjowcKcVdXmGNh+6m5Om0ExLjDj0vOfWa2xcOp1g1B5EjzBXc5vQRnHPtwSTvPAC2cAnkLYI7D9QdfybL4Yg5bgP7Wt7HsBOshSTQGqPdcQ4iMFLqFfYMLoiNV23g0J77MYhnF6IlNZ8OynexddjXw== 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=GowFMJQ6xds1olwocSDoFjC+ToqWcS+mjrylgHTzTRg=; b=jU2TWAZQYbCog1yodlFW4ZH7QSqj+jMSnJsfCG/Nk208C5pRBOXP5hCXHGlufV327tKeqPo5JzhD/oiHsdCin5Z253fbkCjKaOhgf59GJ+tsjVEAB/yJz++LX6zNQ/I61WQKxqOZLvTkCzh+FgEuNNX1OVRBxXAmFH22z3QBGWw= 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:08 +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:08 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 10/18] common: board_r: Drop initr_pci wrapper Date: Sun, 22 Nov 2020 10:35:48 +0200 Message-Id: <20201122083556.6756-11-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:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fd8990a-7465-477d-b564-08d88ec1cc98 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nN2M/KsaTGcXhfLGYTE4xZ0i5lHzV0n9GQaXx+VdMj5hPDmYIswUFVAIW7dCxMuMC94rUVipW7YqQnZ4YR2MFyLx0T43yKYtCxthA8pGkLShL1k6n1hZZTBQTP2zUaTOEcD0fxFgl50MZ6Hq2vuiEjQ1ShxwrIFs/ZAOs5ajUvsr7+2UdTZu6xH0x7h4Rkey2HSJMtSZQMzJFqITYvr5K4E8LGotm1JgzoCocILWbw1cr8UxMomICLkQ20XYoIh5pGyx23RofPEhygWbJAp9k3YfCnNMnD8JfmBLmLWhBypuf9S2HmP3+irxnmTglkRzonhL+wJTRL3MchrI6dl7Wg== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ixd715VFdFYxh5UuJjU8pOaLHTIqP8MugjHsNA723nzV98s7BxWrdnWuuJJPJLtShCO1ETnAFsrlcWbn12O9CHD2/95Ucw9FnXBh8Mkx76+rSBqlKA0Ry/YR2hbCM+iDy3ZWNwvyHY8516bd6vLjRoH1+/7904I2UVTux29JeJuBu1pgPwFtFPs8vOgWU88xwDwiVMwIMiFQnTtAc/hTUmP6w6lVxN6NoMg+l4zoo8TQVbQWVRQxa+Qmduwq3/c55jFE3XQIXVGG4iZRnsGfE4WWWc2QVIwWigS2hgion+p3wr8BXiGaQo7gqu/JTQ9+Ohgr0BML3IDuFo1xmQjkb87x+nKNgKrQ4pPQSa2sfXGJXH72kpDF8PKBigTrRZaLJdleYcEm8lz0SebjtUeXtM+1DWmOfb4YSxSShpLCBO8vVGIRBz/UirEZ4VWu6cqJ5+Nw7L3TaRshcj+HRUYrrKFvmPYyatZOoo+QptdQmBtzsctXxX+RfDU4nGDDajRCD+KmT8xFByAr1za/V3B4qn0m6atVyAPO7zwprDnThZDAkrbU3uFCopOJ09JkfV3V5AUfArS69ikqbRIe2mWFXF7RxxssQvM4Y9jZmf6ab4b+QvxS40xXIzqKUSfivdh+OK1SISaTNtjTvguAQOBtvyp6nyfiX3Tqq9GKN0yyVdOVQz1RaEfoOJHRM7hkDxwpFGwPTLyKxaKfWi/6gN3KlL9AM0lRmdsSHaCWKA1VK2r2R542FtGtIIAQ5dTe2T8/kjvydj+E47bOJfnHs0MBitN7xdF2c4nuPbAtNOn32J+qne2ywwhnZHAAw3T68+vK52VJkOihFGU5dt2KFlpf0VGy9A4ZhDWfFojcvLWuAv0cCU4hHw4XwBMAoHnae39UpLGVhHJbsC3xo+CEltBeEQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fd8990a-7465-477d-b564-08d88ec1cc98 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:08.7816 (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: MuxQTu7j43wEmgyI7DxFNbp2NFrNqxC91EXQ8THsLsnhVdD3zQgLhoPWP+XuNyv00HrMWZsjB4Rhw4+ASg1sO4toBP9MscgJp472a2d3tLc= 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 Add a return value to pci_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment common/board_r.c | 18 ++++-------------- drivers/pci/pci-uclass.c | 4 +++- drivers/pci/pci.c | 6 ++++-- include/init.h | 13 ++++++++++++- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index d86ff0cb5e..414b6272c5 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -214,16 +214,6 @@ static int initr_unlock_ram_in_cache(void) } #endif -#ifdef CONFIG_PCI -static int initr_pci(void) -{ - if (IS_ENABLED(CONFIG_PCI_INIT_R)) - pci_init(); - - return 0; -} -#endif - static int initr_barrier(void) { #ifdef CONFIG_PPC @@ -732,12 +722,12 @@ static init_fnc_t init_sequence_r[] = { post_output_backlog, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) +#if defined(CONFIG_PCI_INIT_R) && defined(CONFIG_SYS_EARLY_PCI_INIT) /* * Do early PCI configuration _before_ the flash gets initialised, * because PCU resources are crucial for flash access on some boards. */ - initr_pci, + pci_init, #endif #ifdef CONFIG_ARCH_EARLY_INIT_R arch_early_init_r, @@ -776,11 +766,11 @@ static init_fnc_t init_sequence_r[] = { mac_read_from_eeprom, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PCI) && !defined(CONFIG_SYS_EARLY_PCI_INIT) +#if defined(CONFIG_PCI_INIT_R) && !defined(CONFIG_SYS_EARLY_PCI_INIT) /* * Do pci configuration */ - initr_pci, + pci_init, #endif stdio_add_devices, initr_jumptable, diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index eb07d25301..7e9b5cf0fa 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1834,7 +1834,7 @@ U_BOOT_DRIVER(pci_generic_drv) = { .of_match = pci_generic_ids, }; -void pci_init(void) +int pci_init(void) { struct udevice *bus; @@ -1847,4 +1847,6 @@ void pci_init(void) uclass_next_device_check(&bus)) { ; } + + return 0; } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 664e8379eb..a7453e5755 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -454,16 +454,18 @@ int pci_hose_scan(struct pci_controller *hose) return pci_hose_scan_bus(hose, hose->current_busno); } -void pci_init(void) +int pci_init(void) { hose_head = NULL; /* allow env to disable pci init/enum */ if (env_get("pcidisable") != NULL) - return; + return 0; /* now call board specific pci_init()... */ pci_init_board(); + + return 0; } /* Returns the address of the requested capability structure within the diff --git a/include/init.h b/include/init.h index c6c5f34b55..dded1cb871 100644 --- a/include/init.h +++ b/include/init.h @@ -186,6 +186,18 @@ int cpu_secondary_init_r(void); */ int pci_ep_init(void); +/** + * pci_init() - Enumerate pci devices + * + * It is called during the generic post-relocation init sequence to enumerate + * pci buses. This is needed, for instance, in the case of DM PCI-based + * Ethernet devices, which will not be detected without having the enumeration + * performed earlier. + * + * Return: 0 if OK + */ +int pci_init(void); + /** * init_cache_f_r() - Turn on the cache in preparation for relocation * @@ -257,7 +269,6 @@ int mac_read_from_eeprom(void); int set_cpu_clk_info(void); int update_flash_size(int flash_size); int arch_early_init_r(void); -void pci_init(void); int misc_init_r(void); #if defined(CONFIG_VID) int init_func_vid(void); From patchwork Sun Nov 22 08:35:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404453 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=X+PBxGkW; 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 4Cf3hg6X16z9sSf for ; Sun, 22 Nov 2020 19:43:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4296C82612; Sun, 22 Nov 2020 09:39:12 +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="X+PBxGkW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 805D4825AC; Sun, 22 Nov 2020 09:37:46 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR autolearn=ham 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 EBE70825AB for ; Sun, 22 Nov 2020 09:37: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PngYHlPzIDQKj2m/0tyLvg1KoJ9MwhulyrkAAP/dzXjPAqfPpgJp90jMDeV4eDIcMAX+7qTLsaSEokGejDjxFJE1nuCRWtr7pa1YOBI30ExYkeWmUGF5PIPWhlrkmWdTSUMSJZhCIBnzOE+JF5+PoCuHJt4JDkBWI/A0UkNiw8kJUV81agN6ihVrhllCvlZj8fMl+94tXpDotp5niRaNDExuGAeTfitdPMA+dxG/PNODY0xEZDnBTiMEta0eG4qrKuA+wEuMMtvJKkCLj53RKW8BLxwmbgtnVldoGYgKHSExGdwU1AtSQ6rcwerRYtYVyEmotsT8Bck2KhzL2SDcSQ== 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=2ysSpnszKJgBRFb7rdRUDnWYTw0hGpqvrIpdZy8sl8Q=; b=MgS+n9dWTgN3e8GeG/1L1dk0Xqf2uVjWvYy/tAiJ57WjvQw1qqKAZK3fYxQM9tBRVND0mTnA1hQXIXSVAdI6uBtML/rvrpYud08DKEXE6zG4CYRzTjHTSOASy2qFJCc1V5TsCMNziz5xKYxMTVoFdDuh2Q2mzJATfiwDzSzbgGSmNrtBi8zrnn0UU9zU+Ozuy7P9YeJrOlq3Mx/HNjMQnupZYxxmLBYDIGT+Z/n78Miij6MvB2LDYhDtId8pX+HHWRKFcwaOpqVQ04DxtHD3RE9SgSk2sSAMQmFCfnyOanmkkkVCYYBlgBWvdMgulOgyN9RcmtnHg2QVOjgjbcDMDg== 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=2ysSpnszKJgBRFb7rdRUDnWYTw0hGpqvrIpdZy8sl8Q=; b=X+PBxGkWPhFZ1NeupNrq6D7rUjaEBMuihnCxVQCVC4I8FghE8wzJwJJ5w98T+56XO95dphuRspX7IaW7BhwAkyRrWmZwdCoi5xU1D6tbOlmSetemrcSyvmuR6g8FqOieHgKaC0e0TtAYw2dx8Zxztg341wDwpG3B2CYD1eSVGIs= 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:09 +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:09 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 11/18] common: board_r: Drop initr_noncached wrapper Date: Sun, 22 Nov 2020 10:35:49 +0200 Message-Id: <20201122083556.6756-12-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:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5fb77950-61a5-4fea-3428-08d88ec1cd3a X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N3QhvZHHsc8hjrduA9QcYFAOfFfyHUOruMLyMV/RUr6qBH0N+GMUGn0VvjwZHPK58YnDFY5tcW/fV6q+P3A9jjuHOWFp6G5uKnq9mPBFCTPSDTQirNjvNXmuXDkAs3zDwdPhlxgE3EWPqFO24HlVcgyzQYhDvfIa2A97T113gPYpkYT6AHAm6GuDzsCPIYvNH8fhPafLOHC5CWvEmdoyRuopWzFUgeWhZfCjpLsGA1iPgozlQNEV+VnP2zSfAlsru3OKtPApG1259VxMcxErBUWO2CAIqiLPzxeXL4xtW/aWMRec9RFCjQpb9yOtCSUzeJ0PugXSk6rK+B9Bjd8IaQ== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 2Ajca/3X0zNm/iatb8dtOxaE07zbo5i9IERNOTC6V/lNUW4n8pO2rSmdV3V6+hQoQPhYbRU+vAN/h9JaYetKPPMVo3KYu1H6eck9qob5os0H7eKEiMlAheQhljl+cpd5Qplh9t32g6u7UD5wmEdQLiPbYR7+8iD9M4K4onQNzRcZ+saF5qV1I0hw0qRP7lWNXdHKlnrU/Aae5boyMm89tNV5HzaB7HFMEZ2Q0zOVFeim334ARC7/25oZEM8+YMJqCppOyeJT+Q+b+IDczXquEBjCoRNCMBgrcQBtwQV8sRmBhPOnQifeYFiwFRN0iQi238ueqRy6TTXA9qs8FoncB4/+kuXDi3YVziuChDLA1PMQOxKdDA3/gIDVy4Ej1W762cZHRhE/VfkjpgMaPFI1LHfILprHbeTWpGUzAFeYa/M1oM6Dnp1Bif8r98hZIFwXDbV3bhOzmL3vmes19ipbPrdhmTC650nlMbo4KssTIFT0uCZvOSGfBS0ZRaSq54isP5k+HJ0qLMscXm0HiazJC6zn1kdDQVHsqjulghd+NXb0KA78MFMfMInvkyk35poC1Rie1W3YrgCiiuJb5wqwNDWoww1lsNpPlsxG5oUtxIvJCd+xRBI0kR6fVwaKLku0tgn8xBPUuknsUhn6V3v1GRTsh4qCMe3UTo73bLAyJ4H29rOM9oGRo5rgYCi7DdzFyoSV0HWdE8WE/ccdTzHO7hEvuctQUPdeLPL49cG8y+niaw4eyOPCwoVWmqdXIGjtfXbl0TYzQodvlVJl7VBd29FQ5CGXLsJDLEyd31mzxF+nJBQ11j+Tsqaqx/Swso/kMHYcEEcH3aLx4anc57P8j1DO1FEWA9Dt7waGnw1CyiCTIkOEtmASPAHN9aUAYrz6skx++t1RmVHKC0XjuGlGuQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fb77950-61a5-4fea-3428-08d88ec1cd3a 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:09.7790 (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: AzxYdyEZ94/OcXGtz3L/hEtXZVGbdlvor05AqxeqyrzpaLOcbCZb3VlV2s7F0s3y9PCuwFvrzUdbCMlDXrESvZjtpR5RYOK26v5c1+gFBUg= 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 Add a return value to noncached_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment arch/arm/include/asm/system.h | 13 ++++++++++++- arch/arm/lib/cache.c | 4 +++- common/board_r.c | 10 +--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index ce552944b7..5fe83699f4 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -628,7 +628,18 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size, enum dcache_option option); #ifdef CONFIG_SYS_NONCACHED_MEMORY -void noncached_init(void); +/** + * noncached_init() - Initialize non-cached memory region + * + * Initialize non-cached memory area. This memory region will be typically + * located right below the malloc() area and mapped uncached in the MMU. + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int noncached_init(void); + phys_addr_t noncached_alloc(size_t size, size_t align); #endif /* CONFIG_SYS_NONCACHED_MEMORY */ diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index ee7d14b2d3..bdde9cdad5 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -86,7 +86,7 @@ void noncached_set_region(void) #endif } -void noncached_init(void) +int noncached_init(void) { phys_addr_t start, end; size_t size; @@ -103,6 +103,8 @@ void noncached_init(void) noncached_next = start; noncached_set_region(); + + return 0; } phys_addr_t noncached_alloc(size_t size, size_t align) diff --git a/common/board_r.c b/common/board_r.c index 414b6272c5..48e898b586 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -242,14 +242,6 @@ static int initr_malloc(void) return 0; } -#ifdef CONFIG_SYS_NONCACHED_MEMORY -static int initr_noncached(void) -{ - noncached_init(); - return 0; -} -#endif - static int initr_of_live(void) { if (CONFIG_IS_ENABLED(OF_LIVE)) { @@ -668,7 +660,7 @@ static init_fnc_t init_sequence_r[] = { console_record_init, #endif #ifdef CONFIG_SYS_NONCACHED_MEMORY - initr_noncached, + noncached_init, #endif initr_of_live, #ifdef CONFIG_DM From patchwork Sun Nov 22 08:35:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404451 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=JYR/yyi/; 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 4Cf3gz0GwQz9sSf for ; Sun, 22 Nov 2020 19:42:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D95668260D; Sun, 22 Nov 2020 09:38:32 +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="JYR/yyi/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C705B825A6; Sun, 22 Nov 2020 09:37:45 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR autolearn=ham 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 5902B825AC for ; Sun, 22 Nov 2020 09:37:22 +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=LE4utCJQw9ILgrBQkyiRUEUv/tdrAizLhF0UJAgzA0e+E2/9hGlmSmr0JkE+2kXdI0x5c7Ju9x4vn6M32oG+jqK2BmqkCjCO7fm5ivJ7k07b9TzpUvvkv7q+sEe8cgGMGaV2a79tRJ79RqSw43hhR23XFc8x24ZAqJjYQ39x6s9mWQnpgbiDNRjX7dOsVRva/cGztM48kInLjE+9nlhb6xPc+aDk9aBbyl7DPBonORzUDq1ebs1ISfEbUuFGH/uMWIFxcPyTs8BUaMBkH5LI9NRrI41jRYqzGqL7HtEXIF42WrincDsRLk9TYxNiZyofcgnR/oJAE+wR/6vMha+p0w== 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=LP/hYq3KvPlQT4xihM9c2vcOHorf2arRJNiSjtjP+ZY=; b=l2iX08YzyuC4pUxXwpRYDTksl06cyComSfTQg5f605SvaHWNeTOwV2vOcCmizmwkn4/mHlV7xZ3tS4i4jj/oDjaM6NX9eqP01pAvA6Xp1CPzxGs7tz21dp8HugpBR3vbgWbwTrhdgCkxEIyLdaaglolcmeCTwG6YO9QpZ7IkjJErkWWC8XLoDMueNW3dagjBSaU1BBFv/xum6KFZo1JitJxiYbM1cxYnh9Dpizxndi3rH+LpwK9PPigJPuEqFRv77Fc5BxWGRO+VRrpBodaCpGPmPiEGhyywEZV3sKpqNkziYPK8hH8dNc4loazMasfXJUgVxPRaUZSY+TZXqzXjYQ== 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=LP/hYq3KvPlQT4xihM9c2vcOHorf2arRJNiSjtjP+ZY=; b=JYR/yyi/QxHppul7Qbtj/NnRaDggc1DoemGlpWoLq9IS11rITquFhgtajqtCrrEQRtMI7Y99yJKp36w5B2pmuqxCzMqAbTFh753lFtcfSIX+3QbgwhfLdbPZ/QLNi/5ZKyHQ1EEjbaFEokUlIgaGqVcDzgEGbRCQvShHu/bJFFI= 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:10 +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:10 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 12/18] common: board_r: Drop initr_xen wrapper Date: Sun, 22 Nov 2020 10:35:50 +0200 Message-Id: <20201122083556.6756-13-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:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eeebebd8-6931-483e-df22-08d88ec1cdd0 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZvU/gfxaFOe9sDVjGtpKfETTEtaZRfDmtwlGpH3hPKXYncsNCSTTrHkFu76ERYqhl7zCuhNSPBzmvTyYAdrAcpZc/wb/JLImPQw9+TM7HN8QFIds3uzFq02uDescPcUjxGSy/vLrFfT1odlAB6FfQzLZbkQ7nV2F4cxmJlZN3xaKdl6wPebM2l8+NCkn+FM0IQ5cXmBPu7h1GcoI6fea/FoIuCriGmw6niuV761kHlZjlBAzPpvlZ2IBmB+BWu1eQQhBRl+vkKOdHUcs6fboDBgzAwV/J5+zMneA4roamBVAE87xDFlUFEexsOb8gUSf5669Evr2UK4TyZSwNX+5Q== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: V+8Y5PeoP0oIjo96lmAIE14Lcx8M/WRT3d1+CG1C176U12PbL/V0OVh7yTWMPn6a+E9rEkvwAL9QmvAM0IeannP2xxDdxJAAVlnEiQeg+VZdQ7uO5vq3iyMBk+wdQFW2ppESRx55tzC2MCDNhzA/hbnetq8J9tBzgn673wP9b15EIRNClPC5XQI49OK1TrsW6opsOEfXwuNfQaNnmqDau0+vjEscvOx7DptFeuCJ5vW06iympdqAoWeZumzN4rdKYCXFvCx8IsKgsnIh3kv8E520Aro4Z59ki8r02caWmqL4Ps9fzQngXMtI9FvgQBS52mcgHKHp5mZLjHgwPHUxwtIKSL7E8sijWikqLiMdeVwN7tpGn06LsjMWPzC/wHKEetC5RQbNyewza182/kEY4QM0+EudVAJCvS4tgetg52oETMwLmETMP2UnG7wIcV6Q/gpP+Y29RB3gziws9BL9MIv3hVV57inJe5zzI07kSsVAGU0IeXB2/ft2H3HfjNfR9iX/OYYBsFK+TPbNBlaWqWeKLJfgNvvENazZkuN5Rh5Gk/rAAhpstVogFsEqhi3iUNhbqxmybT5VgpaYaqxeD4zvhQf+RVwox8tQLUaVa3MkVO8fWy8AWd/e9eVh+1zLoiEP3fvkAn1OYeTsQOr1Bj6PJ1vksntGC1cjfeX34LgdoIgGLsH7PYVBhGnxOT+hRb7yue90CHw/oKJBD0iKv+2eNOk1WCe+W6erE9bKAScPvkh2txTDH8XZMzAzfLse4r6q0o9uFZ3YLS4c9W37x0TZxabsgHkneCDT7t1F/O8Q8nDaKNHDtwtxfz/9+/OLInl+wrBpkc819xVLRzlk9b3rnT2ZOvOOZ+96eiOW738iUgpeCc3m1krtz7Foc7v8pkOQCzp3WoKwijgIYIP4fw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeebebd8-6931-483e-df22-08d88ec1cdd0 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:10.7934 (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: 4x1I43xQGCeDuK/JcgC0IOQXFFZdRx/NNgbXJA5IKvzgflgwHSyiWCvmwUuUTEtjz0xC3nMHabAbbSgkmmRk7pj6BCir9Ixgzv02wo+KHZM= 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 Add a return value to xen_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag common/board_r.c | 10 +--------- drivers/xen/hypervisor.c | 4 +++- include/xen.h | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 48e898b586..a5cbbcc343 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -428,14 +428,6 @@ static int initr_mmc(void) } #endif -#ifdef CONFIG_XEN -static int initr_xen(void) -{ - xen_init(); - return 0; -} -#endif - #ifdef CONFIG_PVBLOCK static int initr_pvblock(void) { @@ -743,7 +735,7 @@ static init_fnc_t init_sequence_r[] = { initr_mmc, #endif #ifdef CONFIG_XEN - initr_xen, + xen_init, #endif #ifdef CONFIG_PVBLOCK initr_pvblock, diff --git a/drivers/xen/hypervisor.c b/drivers/xen/hypervisor.c index 178c206f5b..2560894832 100644 --- a/drivers/xen/hypervisor.c +++ b/drivers/xen/hypervisor.c @@ -232,7 +232,7 @@ void clear_evtchn(uint32_t port) synch_clear_bit(port, &s->evtchn_pending[0]); } -void xen_init(void) +int xen_init(void) { debug("%s\n", __func__); @@ -240,6 +240,8 @@ void xen_init(void) init_events(); init_xenbus(); init_gnttab(); + + return 0; } void xen_fini(void) diff --git a/include/xen.h b/include/xen.h index a952a2c84b..868132156e 100644 --- a/include/xen.h +++ b/include/xen.h @@ -11,7 +11,7 @@ * Map Xen memory pages, initialize event handler and xenbus, * setup the grant table. */ -void xen_init(void); +int xen_init(void); /** * xen_fini() - Board cleanup before Linux kernel start From patchwork Sun Nov 22 08:35:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404450 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=XaZc7wLj; 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 4Cf3gZ70hWz9sSf for ; Sun, 22 Nov 2020 19:42:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFE58825EC; Sun, 22 Nov 2020 09:38:28 +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="XaZc7wLj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1933E825E6; Sun, 22 Nov 2020 09:37:45 +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 B7FB4821A4 for ; Sun, 22 Nov 2020 09:37:25 +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=OPJ+MRr1CvEpizo5MHxymUHGVwwz+z/DRUCcqV1jfXaziGIXimhnTBtxP7QHxN+RfqnkFONxhKbWSITP8B8jpIvw2CVdnOSi8wMyk+Ms3WqIUVEiWmRcpcIQezhKsvgZs656Bq9MXSJKH51tJpjdAce93w/JbrV0xzjXAke8iUI+PEzfpTC5b60V9mo4F6cFWS7Rpp53K/5kcobUbG7N9JCH6MOLsmkNXNMj1apU5jljZ+1i3NWevXWV4CgflAiqTNdlRj5iLmPllXtvTndg5wU4aS6g6sVEqEK9hOovaM2jDYQxgAsDea+ta1bfWFLXEeHfruonNFmYtzUtHQnQUA== 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=yXipc3EqcN65S+f7w+Wy/NnJ/0Xz9JtLoo9Hr1IqKuU=; b=AjILCL6lLQ5uIapuiZjNB4S+9k5Un6dI+xF6G1NS5ehSGTfARUSd11bsnhfJM55F4nUiVbAOfpyz58sR6DlkP5mcGXM77BmtShi+QjRWT5MQtZBQwYFgeyFj8x2RQNbaHUtncZbbXx/ySIsXZgONPdbjbM0HTaU0N6jgxPbKJ8fQPVTPdnIWxL7vBmj6Ful5ND0aTDxXWhbpyd9i4t4kZIJ2Gby02jTt/1MtEa9lmmcxcyUxsiC7fGAvtvQWVbjN6ZxzLVgl/9R50eFlok7nf/nHdytJRWmHrruG7sjwxQUKBWXw5/x5M54SZCqbLIndG5yKlDObPdtcSQrQ3C37kQ== 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=yXipc3EqcN65S+f7w+Wy/NnJ/0Xz9JtLoo9Hr1IqKuU=; b=XaZc7wLjkJoGxlCHPxeKcWBlH38htIzZJJqZGs8/6lpkEwOJEwsIBFo9idlWTvcyoct9hXjrnA0Si9wvRATkcCHZRBdXaereBw/zFAwUiGL2KVXX684kVo3h9D3clb6gZJErGKTunf4P+YYZp5t34uKT13H1bBhbt8guscT3rj4= 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:12 +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:11 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 13/18] common: board_r: Drop initr_jumptable wrapper Date: Sun, 22 Nov 2020 10:35:51 +0200 Message-Id: <20201122083556.6756-14-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa99f9fc-c431-40f8-a3b2-08d88ec1ce6d X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /YpaGdwBfvG7WatczY1Fq0cIN/yNTOyCCR8uWiInslURDkUISjli3C8Nlh+a8dmenyyOI3H81haCAqKhO8LHJC3jfnO0NcuvrMOE0UgRfOMvF1eYIYd+NJAz8O/hVjB5G2pc8jKFGhEFOos/NoswrNhr1Haewjg1DckN2/LmrucxjkGWZut2x/W571NB009erCD6VwaZBAVW1XfBDzYcnz+TbS8REFermS+FybmLw/AyaGD+XQCXtO8R2mfCCoNmSUFgXpMBItuYAtCnc6lp1JdGfCI5S4IXTSsw0yueEQvIa5ODEyzU2uvFWPQZ8G0hyF9X232YDOpI4CahotrLrA== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 2hgJKFNMW95Wd6Q0fV2T4Wp4JJbeszVHk1LPtLpGpFiVve4YMXIbd2iPbUTCSdpxu85B2nWW6ICroK0g72LwAcMuhPKHhbK129yCjUdar7VPmIwQ7KWph2Lyf9B5MFwUNi1d8hPKD0209jte9JqjLo2Qg5bCWAPHy3lbw7rFmfox1nIqCm3+paeVTIJV44k1od3ewI49FuLaK1DYre5E1lp0r+Im/g3hz2CqbFYVjCMBxMjl+4Slb2b+VU1RSAgvpvLYR+aixIABgpXk1eUQ1CA40C88nuef9R9AOx08N/xKex+lvbpvfeGsQjxBytIigABfxcxbeIpDAr3j9q2cyNcf8TOpY1PT6QJ3PJCyPFn4O4XzEbWcELx/hykDCQbhiCmMwAHi5TT9EGbo2ofS6nkNjXlJwnCEZCgXrWjS87FwGswp7iVgar6khPzNuzZX0xGFf8hO19ibZ9nT8zpoMjERrZz0qgHTM/VTsJB6w5e4V8vdRPpUctx6azOciFXr1FcNxyGauQV+Fb2Vne0/l0HuYf8/OXI0zA5k1Jbk48QdzAXpr8nl6FHO/46t81EmKebqd2vyIpMd6Aim94iY9z/SRUUc3u9SlpO6m45k1ieOYXLQtB83bJHzWTsrixIqFJUKRb+HY0twHjTBd9zYEj+pdRf15oXJRityGeX5f+XFBxdXwX2WrwcWOT6FdI1MxVnNnw0+f/HTdS0Ixn97bMiZrf6unHqCxwHbZCfdcFBsyzqKx7EuCRWAhtiOciuDCsssmw+onT6+2OBYQuCQs6e/FJLaIRVSN06u43WHmaGjcRrO/szF4eak7lKhNg33eMvVrcb0Sbo1cV6um2di5rhHcAuGAxTBVoPQmNClfgu25UUK9tvsgULtKF+NCz1npMuaxSpC0nUv0uMsmYbb6w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa99f9fc-c431-40f8-a3b2-08d88ec1ce6d 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:11.8078 (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: nFUZIPQIYJnaL+rg4/2oz075t3wLVLCOF4qyqSWzXxYefiqsXfLA/DfT2g29OAKCSEVkxXSNOEAMucs/0uQw6uHczG885ouwJxrdFugTnMA= 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 Add a return value to jumptable_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment common/board_r.c | 8 +------- common/exports.c | 4 +++- include/exports.h | 10 ++++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index a5cbbcc343..32ad40d372 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -490,12 +490,6 @@ static int initr_malloc_bootparams(void) } #endif -static int initr_jumptable(void) -{ - jumptable_init(); - return 0; -} - #if defined(CONFIG_API) static int initr_api(void) { @@ -757,7 +751,7 @@ static init_fnc_t init_sequence_r[] = { pci_init, #endif stdio_add_devices, - initr_jumptable, + jumptable_init, #ifdef CONFIG_API initr_api, #endif diff --git a/common/exports.c b/common/exports.c index 6253b55694..4578f07021 100644 --- a/common/exports.c +++ b/common/exports.c @@ -25,8 +25,10 @@ unsigned long get_version(void) # define miiphy_set_current_dev dummy #endif -void jumptable_init(void) +int jumptable_init(void) { gd->jt = malloc(sizeof(struct jt_funcs)); #include <_exports.h> + + return 0; } diff --git a/include/exports.h b/include/exports.h index b300554091..faf0f59244 100644 --- a/include/exports.h +++ b/include/exports.h @@ -15,8 +15,14 @@ struct cmd_tbl; struct spi_slave; -/* Set up the jump table for use by the API */ -void jumptable_init(void); +/** + * jumptable_init() - Set up the jump table for use by the API + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int jumptable_init(void); /* These are declarations of exported functions available in C code */ unsigned long get_version(void); From patchwork Sun Nov 22 08:35:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404458 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=kkHkN47A; 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 4Cf3kH41zgz9sSs for ; Sun, 22 Nov 2020 19:44:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A0B8D8262A; Sun, 22 Nov 2020 09:39: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=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="kkHkN47A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B34F825D0; Sun, 22 Nov 2020 09:38:00 +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.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_SPF_HELO,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 3A135825D0 for ; Sun, 22 Nov 2020 09:37:26 +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=gDC4YzpGWyuHQmCWDS4I+vsyovHSwmbYjdzwyUD2o/9mM0hgPL4voZ9Of/CGDzvmVVIFXfZ4yNvWxfyHnjKtq8liWzJxB3mnOLN4PYYl8vGaKOBCBlabMLu2ef5rkgPA3MVDX5xFvDIq1zyvy/96xMwDeb5iHw5GNgZ/Yy04MADTNHw3kcfdFe0sH61E/LMAl7wXYE0/wNtJ3hrfKy3K+FCWaiPX5KbUaNpI87Po9RwxEe50rBAf02fQdN4gxPqDv80IQmJDYK9Y3mqhy8IW5oOLwipaA6edNydVF3x1Lw+zCtzJtnqMN2wwGXp8QzM2eGMCWCEJrX/XbQdi370fUA== 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=ubSJmeIA920J5QwkRPHzVYPJt3m7aLn6Z9tlgqwvYO0=; b=aNohQndznJRZlprgKrZ/uY/AwVH2KaFTsWyBze26bDzHJC+qGCtWsyzRtWMghzxOV/wFNt5Dkrdqdxq4TXWKsPgL2GdGbinPpOSFp62AGUeriH5errYDgB2/FfeGipuy0Zhvba2Oh3IWCwRm+4St5S2zL0uWsUjRfNY3s+xKKoBNeQVs3NTiBVuFt2Om4s+eXmUIhBWsMwt6WqnqrtkKX8YKRo1wn+OnlHgr4Yh9RVDfLd13ezXZyTQxYiNm2FhBmm+kC8s3sz1xVHoefICkeQlJrffj8jcjF4AIHlD5iflEN1Gm4t5e7q50avv0pMqN1Q3vzG5h+mPh6JZGpqzJpQ== 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=ubSJmeIA920J5QwkRPHzVYPJt3m7aLn6Z9tlgqwvYO0=; b=kkHkN47AOwcIepcxDjpoaEJYI8UtkvKCLYX0MKZsd34E1H28oM8tBxVkevt995dM29Plf44vAXFJcpF3IT/LK0HbkrbpAHa2f9DL40vw7tO9DqMn/dQXZmn+oimQkWthracG6xaDmYYEtKEZeBumzAF4ZdO3PiXrItuOHulocaw= 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:12 +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:12 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 14/18] common: board_r: Drop initr_api wrapper Date: Sun, 22 Nov 2020 10:35:52 +0200 Message-Id: <20201122083556.6756-15-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:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa7f0414-01d5-4acd-e1de-08d88ec1cf08 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OJEGU3gm1cvdkbgEgjXln+ZO2ryLJKt6YaiBgfFDNKFuEQ/iLUBQS+scu2qah2LNZVSGqoyD0HMcI+qy4ixsy94JS2aU4wjslw25SA+YCqKK0wtDFlfC9hygi9a0LMnyVzHp62JrgKFLVysZCNn2XZiFqdYiUxTKjCdnsScBEup9RajUukkOWBRv4ACz1a8/b+6JOVxfv1OIcbQqy36HPD7KdMxRh1S8gZGqctfpL35cXnxXMdoIjrMZBnK8urAt3/0n7UPhY4SnsURX2QUpesLhQ9PXV7M38dkRsT3GaafpOMgHsJE3oHW7XntNxaEnR3fipUKajeY8t18X1rv73g== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ZE/dTRwh3kf5THEqTyyTDC/l7IWg9QzpoRp0ydHSRlD0Fs0vgT/eO8370O0iTdalvIeG9MdInPXzHC/kaCsC78GalriNQ+42h1Z59Cps/zjMntWtlLbbdU++/O3/fJ62G+DwVD7daUEgXF9Wzrvb63Eo42dIk50PsgheflVqU+irmrSvQR0p/+BwClcv3AA4umyp+uhnx1co4ebNeIkTRoxMHC7T+eRq9Z4jjgzf66/r8cR61EFvER5TYReQO+RaKOjG/lfR1HjhmJrOI+hN5zihFt4Hylgjjc/QeYnbXo71LoslZqyR2CrGWPkH6O7Uy4HVd0Hgj3RcHAtSxcEW9/0pc+HXb4d6iyyt+iFmuqjMU84D1iaQYnf+E1ss5/LKs8v/PpsP/5muhLvEqY67Bmq6DZ2XcuXaGsfYbsqyOK8JqlRrG6lRXei71hWM8kiZFB/8oWG5E3FalKzWjlCqvdTfwS7zdA03meCkpkExUHbo8B6jBA3hESDRbRY95A70gHhrCxu6w4VyiHatseMq9x9S6cxywkPdmB3v6sE8Pe41R4hsYBnyclByI6VpzJXkgk44A7ItFeiQ3zSdu/tK0kkzlkUg7q4E3GqSnzfTcQggM6WCvoex20Eia93PVcqrAXxP7w9/Bh2I5Ocs2XsIf/CTbysaF2K5tDM0/ypynZvb4sSQvx8qpBCeHXhxiBpq8bienROZZ4dBYsHexu/Jg/AH/3sHPf4wc83KTlj9WNsqsq/W2wrfO8TkKZ4Li3AGd2QPC6+bopm6A8fVWssTS594OuxlLrqTBR7cuCJwNzOHLB19JCDvfrwEYsiCpft/2OLkXAXappAIObZY/+y1MR8MT4+rxPXmb5NaigA6cGgDFZCHMyWRctVMhG6f9B/QbCaNY/ujtBFyZv2qJRWswA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa7f0414-01d5-4acd-e1de-08d88ec1cf08 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:12.7842 (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: eVuHClVFSsk4mb+rXbse26GokUFHBiebfSnNyIFOG6Zb1pnHROdGx4TuN8kp17zKDq3GnEq49a9BFJU5qGxuLdgfFYjjuJ7EyRFquz8rT18= 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 Add a return value to api_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment api/api.c | 6 ++++-- api/api_private.h | 2 +- common/board_r.c | 11 +---------- include/api.h | 10 +++++++++- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/api/api.c b/api/api.c index 493b77f809..89003c161c 100644 --- a/api/api.c +++ b/api/api.c @@ -642,7 +642,7 @@ int syscall(int call, int *retval, ...) return 1; } -void api_init(void) +int api_init(void) { struct api_signature *sig; @@ -679,7 +679,7 @@ void api_init(void) sig = malloc(sizeof(struct api_signature)); if (sig == NULL) { printf("API: could not allocate memory for the signature!\n"); - return; + return -ENOMEM; } env_set_hex("api_address", (unsigned long)sig); @@ -691,6 +691,8 @@ void api_init(void) sig->checksum = crc32(0, (unsigned char *)sig, sizeof(struct api_signature)); debugf("syscall entry: 0x%lX\n", (unsigned long)sig->syscall); + + return 0; } void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long size, diff --git a/api/api_private.h b/api/api_private.h index 07fd50ad3a..bb23821c2c 100644 --- a/api/api_private.h +++ b/api/api_private.h @@ -8,7 +8,7 @@ #ifndef _API_PRIVATE_H_ #define _API_PRIVATE_H_ -void api_init(void); +int api_init(void); void platform_set_mr(struct sys_info *, unsigned long, unsigned long, int); int platform_sys_info(struct sys_info *); diff --git a/common/board_r.c b/common/board_r.c index 32ad40d372..500457b080 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -490,15 +490,6 @@ static int initr_malloc_bootparams(void) } #endif -#if defined(CONFIG_API) -static int initr_api(void) -{ - /* Initialize API */ - api_init(); - return 0; -} -#endif - #ifdef CONFIG_CMD_NET static int initr_ethaddr(void) { @@ -753,7 +744,7 @@ static init_fnc_t init_sequence_r[] = { stdio_add_devices, jumptable_init, #ifdef CONFIG_API - initr_api, + api_init, #endif console_init_r, /* fully init console as a device */ #ifdef CONFIG_DISPLAY_BOARDINFO_LATE diff --git a/include/api.h b/include/api.h index 84d81dc817..83412a7c87 100644 --- a/include/api.h +++ b/include/api.h @@ -7,6 +7,14 @@ #ifndef __API_H #define __API_H -void api_init(void); +/** + * api_init() - Initialize API for external applications + * + * Initialize API for external (standalone) applications running on top of + * U-Boot. It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int api_init(void); #endif From patchwork Sun Nov 22 08:35:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404454 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=OfTXSHSr; 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 4Cf3jC1ghMz9sSf for ; Sun, 22 Nov 2020 19:43:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB54B82618; Sun, 22 Nov 2020 09:39: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="OfTXSHSr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 54769825AB; Sun, 22 Nov 2020 09:37:50 +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 2F1A282569 for ; Sun, 22 Nov 2020 09:37:32 +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=LhEtP1RU5qGH38iHMKeiK26Jlnt8squY2hNuqVRM8BVEoGCa6H/gWimIC2D/MjtAq0D0QsPSnUdkWZPPv0g6JDA9jQbbfmWtZG/HF2ds4WTvbGHNVdut2Roi0ziOiYVlIldfXz2ZNd/kJvzKL+3ksTT0rrT9lkkf0bltzsXfo+EcctHhMYIVtBG6efnP/iV3JL/0374dwSPcecOXl5PocFh6ptEBoxsHlB7Ym498wMgYJ/RQBnbLgGVTUNtpQQP1IsxipkUOl3pBuDkD9NL2Dtv/RgE7CBnqqXlf+BS3T9gBLL6UEW36vFhiwa5N8hxI5zf1ZAUVxWzDP/ZCWMivKw== 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=uQvI8JoeRIno9+5Fg0STj7O+MBcUbNDA4IIv8y194tw=; b=CMwwejsINbKkK0qVPeD5wi5NRWmAVtA0RIjIxyzQuwEmLfGZi6O4OuGI9R++Lh8QleeFFKXdYrEAZz+N1LV6itZ9Z87xP2kQSFuT4YsWchdjInEy6WHigqPH/DFeLvu1HpPCl4YjHDBQ42co/x8FHzg6GZ/6HiNY1vCJ2siBtkuvmOXs1BV50tj/pERwE+h8zOnE9wiiEDpNdri926PkZh0G8zahfreQgQlWgHQ7wYn5JXF05U8CsnskPtCJ2R5RbbBo4UTEm/mt+OUM6/OxLBij/1O/0tfii3rUgx9gaewkPCr7uNw20n8VRAsAkFW83uSIIe5/Xb2bGeHQkauEKA== 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=uQvI8JoeRIno9+5Fg0STj7O+MBcUbNDA4IIv8y194tw=; b=OfTXSHSr5ePswGV52jLRnx/6+EPjV/0zR95d6NFAeHbzDi4DKAEYveaK/dEgsxAzv6pQn5+uylDMGSMm2SFsRppXOCNzWjloZ5Br41SQBlcjimt1XRpFiU95MpEwJTZ3VAbkK4iSpUNHlsuJZ0O7+HvtyqNVNXVtzTAJBpo9BZ8= 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:14 +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:13 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 15/18] common: board_r: Drop initr_bbmii wrapper Date: Sun, 22 Nov 2020 10:35:53 +0200 Message-Id: <20201122083556.6756-16-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:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b8d24c4-5320-4505-9e1d-08d88ec1cfa0 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KYtec+Q0lBHQJIdp7r9ntZZKLKXYJmLfsgB18VdI+ZXKNTOmqW7wzdCmYyzQgcknItSATaubsidFXSl+7yf1bgBXD5iLKHxgC8EWIrqIpY7RtZs5iRtWrktaFa9hcUAVfJ+w/6c+asskbdCmkkN/HlynOuygKZst/PHk/vcPDO99MGY4w02rzlO8p7KSepJyMcyhiFgu9YlCN+fQYC0Dgbxm2TAB1ZM/FhtiQpWT9j3vwwjeh7qNCQiYtJsih0oil1B5m5XggAgHO0JEJRaRT2Mzja9Pz1V6sA5rZvb9UdLLZuhgogtPQyqAzgOaJrP7B1bXwdvjucRvlmzZp8Ynjg== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: NNJN+aXjrT0ud4lx1H4NS6SNAWXNTMGOYHvN1rIuAcrXU50/8uqsfkHBvfzsvQ0ryrufQbp4yzas4Az97oubfuLP33kMsxb1zslrpxwHRQTglWTPnVUFd+C8Fy72AKfzO5Yz81pmFiVD0dkSngYuwdD7FSAgjxU5asih+YiAwBLt64ZGLKFifIsNUVUVqxsfybJgLYc5WOWqOlgNEXwxwQeR9jHYO2bQemq9PYaYPOdqkZPqPSWZF0BvB7wAbXGq07yyIAalcPtkbuLB80g6t1+qtBW2vSEFYy6xAAEutru7yCt8vq9ZhvIOJDRBTjBHGqu2tdDxfeoijlpU1CCoMhkCgQ7F4KmvecOi5asezpC47r+hsbYUZlWLBTyvSXKgnYh0clTdrZeidpP0m35Vmu74IxkTXCUUelEGGCh6r79PNVE0EC5WZPhWqbcWWZtDICHRFcaYQPBkxNRr+zwXm1r1ey/XNzsXhhmKnZqQQumYwNg8H7VxEvn1NGYx9HzmQUeV908JYtNCDYK9NgPjBLY07stHDkA+TbzKcltw1DH1uzMr9en/Lnf8b6gRtsyw6lYU3EZEnY6jilFwulVolfG1+bkOJx+OU5bV5GwEL4MKv40cWEEhiXAAkRrGpXyK2blU7xjvTp2tV3L1+Jo5870u9YiFMFGhci/2e9k4y5d8Yq22k+5s3P16J/DqVDhc8N8h7Z30yREB96+/BFMMLR6baG+vPBP2ct/PyENDON62KhyRrCauV7jW2wa+wuHFHuuEaDxtUcYzZIS5i5S3Bkxz843ctVkU1y9zI6uRouBp7o9jZKr+nzcmKnzpjLmQeur3DAFimqijx7/dZ0iIqpKKjMoNulLGCiRk3nEBhOxyR9bxlAhY+n773OSd6LqJ//KxFL6dwmKYOdwy93tkZg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b8d24c4-5320-4505-9e1d-08d88ec1cfa0 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:13.9235 (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: IdZSoNzg6sNiuN2pFg2hMwHaYQCSskUxFOEDfERmUVSmHA3j4j0T9OE2x/UCdTBoDvV5+80DBon9fFeDucuBWZzDtg28TBauCQL/x17SwXQ= 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 Add a return value to bb_miiphy_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment common/board_r.c | 10 +--------- drivers/net/phy/miiphybb.c | 4 +++- include/miiphy.h | 10 +++++++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 500457b080..c083eb0a03 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -534,14 +534,6 @@ static int initr_scsi(void) } #endif -#ifdef CONFIG_BITBANGMII -static int initr_bbmii(void) -{ - bb_miiphy_init(); - return 0; -} -#endif - #ifdef CONFIG_CMD_NET static int initr_net(void) { @@ -783,7 +775,7 @@ static init_fnc_t init_sequence_r[] = { initr_scsi, #endif #ifdef CONFIG_BITBANGMII - initr_bbmii, + bb_miiphy_init, #endif #ifdef CONFIG_PCI_ENDPOINT pci_ep_init, diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index ba97a54c06..59a32c4913 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -105,7 +105,7 @@ int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) / sizeof(bb_miiphy_buses[0]); #endif -void bb_miiphy_init(void) +int bb_miiphy_init(void) { int i; @@ -124,6 +124,8 @@ void bb_miiphy_init(void) bb_miiphy_buses[i].init(&bb_miiphy_buses[i]); } } + + return 0; } static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname) diff --git a/include/miiphy.h b/include/miiphy.h index 61c136b114..8b77bac01e 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -81,7 +81,15 @@ struct bb_miiphy_bus { extern struct bb_miiphy_bus bb_miiphy_buses[]; extern int bb_miiphy_buses_num; -void bb_miiphy_init(void); +/** + * bb_miiphy_init() - Initialize bit-banged MII bus driver + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int bb_miiphy_init(void); + int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg); int bb_miiphy_write(struct mii_dev *miidev, int addr, int devad, int reg, u16 value); From patchwork Sun Nov 22 08:35:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404455 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=C8DPSLEY; 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 4Cf3jM2frBz9sSf for ; Sun, 22 Nov 2020 19:43:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0E6D825EA; Sun, 22 Nov 2020 09:39:31 +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="C8DPSLEY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5CEA825AB; Sun, 22 Nov 2020 09:37:51 +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 EB40682591 for ; Sun, 22 Nov 2020 09:37:32 +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=RVshJApscc89Vd4hJGsxfF64lyznviIBzSPRe5ICTZ98qqert2BSyoLiunAAJKLjNajP6u6aAnyq8m2VDQG1QjVtM3kxS+t/8fNffyElg9i3Kq8lF2vWCd/301oD0Yv4T+UfustuWArD6k1ZYP7b1u8VwZ7dNXdP6SbC8Ex0pp4QSBIw7R7gZWiAXBJYxwirm3fCdbL6v75bPKnIdp3Lb07NrvvTR1mxFY6nnTCIUcaflQdq4zpf1n/VggrNkbI0Q/MNLkLhN+1v2Ko1MFQ5vY9BiW3Cn1cBnKTqHWp6PgykQdYu8b4q7L7C+u7o4B7f4IGosIld8Wk5FsuwEPyQqQ== 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=GJU4UXtIrOGIrrFLzM8in1a6P8UT5kBn30HkUo9euQA=; b=RMJ1cemweLdpOz1JARqhy7pZBd2r3NpADdivd5/eq9HRbIeygmj+v/Uh+yfBqXvsJHoijf+rV/4lEuhfvJxwVus/wKbKSiFjKeofhric++GqvMSPXrB9P4EpCA+FaFw9Fcd0Wq0GKPCdEyW9a4YWRMMVXRvK+qEvbRgKQVXcNSrLMfVz+ANa6W1ZUULRSZTc0qfCn9cEKMlAGHfkELINiHHowoJWj7ZVWv5A9R91aGgB5NxXZAkaPWxUjy6lLcfAAC7JbHHo1Vj4v7UZ56wZfA1qtmAtwarLsExZ4QmYB5pihPQBj6SPS2C9xaGJMWL0FI6br6mlJ8V4oGJnuyEJbw== 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=GJU4UXtIrOGIrrFLzM8in1a6P8UT5kBn30HkUo9euQA=; b=C8DPSLEYOfLpEkRIgi29RF+QkOH9/An78/g49YS+NUdvYTorMOdcGpT+xINZU1O/tCEFBJ/LG4cYk1oXte8OLO0y6zPLN6LJqqW4EWNw13H4XCwSUKy6N0jIkYDV7dchIdt45Vw8JjZgsZ7Bb+j/YAuF/HGrmYZEUCfRYlx7nrU= 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:15 +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:15 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 16/18] common: board_r: Drop arch-specific ifdefs around initr_trap Date: Sun, 22 Nov 2020 10:35:54 +0200 Message-Id: <20201122083556.6756-17-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:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a498896-d228-4aff-0aef-08d88ec1d04a X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A5lcu5keSVqglJxjP7oFGpxF1evjM4KCwhvWb9LJFo1rIAyViAHb6EK2bXwM8Hn2SwuHlBqv8LqO/eb3Ffigdtzv9Kskizf0kJuRMmqxYZO9y61QIm6UjziM9TfOgNUlv8BwZ+dHM2kPGQrFFYEPd03XCW/xs4SDqmEVKYp76HWSe1RrvT2y+6yV4WxZu+tmrBdSyVYDihynWgvVip9/Z/fZIn36QwQHsm75m6HybWCM9KP0aLWRQNVM9NVabNpRXA4xyBa33GU1OYNpYS8KpD7DkfYQzzgiei+8nrksnJfUyVtPU38X9TSOF60Gmz39XGx3lW7TzFvXR9irWMihyA== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QQwVZZQkyEmhPM+7nfeIUo4YVdKCf+osjhckGJa0emu/BsmP1owFDUoukUyiAYq6qdABLMCoEU5GVoWUHVVJH2swi8IouJ+2o91WwaL5zyhvSLr+YbHgy7vV1acxaEg9UFdTao0VirZ12zWI+E4c/5JysJuqsNMhklLbcikMWfphcP9fvkTA+RniMUMmPjnkHAqk9x3xYYWUyqNt2BC2ds33U1fWe6Gmu8C8EXHq9cRfq/JtdmOZ1nBr81uVmGavJYH+6yIk5zpyKvfdOziJ78F702Ux1zeJLocY3gWLB+BBix2NfXX8m8hXma9tTWXjySiU7JVD4edA8Jku10YiDMfvKhtxFcdCFy2H491GBw4c92OnfI0cSNxAne4QN3dTqP8vnPEmP3I7G3mMo5tu+7tevyViazixI936uCnWjxciBQsK0F6u9tsnd4YgXitd0Ml6V0xZ7HpD9suz/3O6BCNvWKa4sgXMNxLEuEh9imDGTL46vSUSS21lkjHRE+Le1MpXlgWhxP2M/age41mKDT/OUY8lZXvgZngoL2XYlY5QiVWOZTnUXR5OXtmIf+Jkalfeq+Q6hG0Z7x3TbOvciZ7pNyhvTfNEcjLQsCOtafyKxFzaqBIL55ZJxS+GxIq+FkMXSULm1BbTqHyrrzQ7A+bD294ZTFIn6YazUoWBAL9gF3BsX+dDJ9Vv2VYLybKKLB3ARAEh96+xB2adm3DWM+lzpk6P7sz3fvQRu3kNX0Nhxnkj47AxUK37Iuf/LNFwFQaLN5cuBYye9i3wd4yvs4oKAjJHKid8kcz4yIuqiUYGMBuSINh55IslVAgeGk8r7YHMQISvWvPHCG7bBvtMY0JOeTvR6O7M2a8Hhzsx09W6bsI9b8WWM8GLvR7XP3w+l7y+Y2xzhOIRGsEBavRAAQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a498896-d228-4aff-0aef-08d88ec1d04a 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:14.9739 (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: 415Mz1+mLHKWnTTy+2WPUiNAHnrw9+zCFWqtS0CAL8oxLqTGRHIl/6omZjwTviJuDvYdOFbMNf8y1LW87GuFWvgz+miplNz99FSnjnZbWmQ= 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 In order to remove the arch-specific ifdefs around initr_trap, introduce arch_initr_trap weak initcall. Implementations for ppc/m68k/mips have been moved to arch//lib/traps.c Default implementation is a nop stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag arch/m68k/lib/traps.c | 7 +++++++ arch/mips/lib/traps.c | 7 +++++++ arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/traps.c | 17 +++++++++++++++++ common/board_r.c | 16 ++-------------- include/init.h | 9 +++++++++ 6 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 arch/powerpc/lib/traps.c diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index c49141f376..a9b055cedf 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -59,3 +59,10 @@ void trap_init(ulong value) { setvbr(value); /* set vector base register to new table */ } + +int arch_initr_trap(void) +{ + trap_init(CONFIG_SYS_SDRAM_BASE); + + return 0; +} diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index df8b63f383..4f2efd6115 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -131,3 +131,10 @@ void trap_restore(void) clear_c0_status(ST0_BEV); execution_hazard_barrier(); } + +int arch_initr_trap(void) +{ + trap_init(CONFIG_SYS_SDRAM_BASE); + + return 0; +} diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index f61809ab05..2782740bf5 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -40,6 +40,7 @@ obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o obj-y += stack.o obj-y += time.o +obj-y += traps.o endif # not minimal ifdef CONFIG_SPL_BUILD diff --git a/arch/powerpc/lib/traps.c b/arch/powerpc/lib/traps.c new file mode 100644 index 0000000000..80822a006a --- /dev/null +++ b/arch/powerpc/lib/traps.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +int arch_initr_trap(void) +{ + trap_init(gd->relocaddr); + + return 0; +} diff --git a/common/board_r.c b/common/board_r.c index c083eb0a03..9fa4d4b42e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -182,20 +182,10 @@ static int initr_reloc_global_data(void) return 0; } -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) -static int initr_trap(void) +__weak int arch_initr_trap(void) { - /* - * Setup trap handlers - */ -#if defined(CONFIG_PPC) - trap_init(gd->relocaddr); -#else - trap_init(CONFIG_SYS_SDRAM_BASE); -#endif return 0; } -#endif #ifdef CONFIG_ADDR_MAP static int initr_addr_map(void) @@ -669,9 +659,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_NEEDS_MANUAL_RELOC initr_manual_reloc_cmdtable, #endif -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) - initr_trap, -#endif + arch_initr_trap, #ifdef CONFIG_ADDR_MAP initr_addr_map, #endif diff --git a/include/init.h b/include/init.h index dded1cb871..bc1854f0e5 100644 --- a/include/init.h +++ b/include/init.h @@ -300,6 +300,15 @@ int board_early_init_r(void); /* TODO(sjg@chromium.org): Drop this when DM_PCI migration is completed */ void pci_init_board(void); +/** + * arch_initr_trap() - Init traps + * + * Arch specific routine for initializing traps. It is called during the + * generic board init sequence, after relocation. + * + * Return: 0 if OK + */ +int arch_initr_trap(void); void trap_init(unsigned long reloc_addr); /** From patchwork Sun Nov 22 08:35:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404457 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=oBhBJtvo; 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 4Cf3js6cMSz9sSf for ; Sun, 22 Nov 2020 19:44:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B3E8682624; Sun, 22 Nov 2020 09:39: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="oBhBJtvo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 79FC5825C4; Sun, 22 Nov 2020 09:37:53 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR,URIBL_BLOCKED autolearn=ham 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 C0B1F825C2 for ; Sun, 22 Nov 2020 09:37:33 +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=OM6ds0ITITWXRw3bbSlXoO8NbQkuddtGq0D8nQ00IOaV/eaPJ2aXx/ZMkeVVT/Szr9bD3bJEcQy8BWnYPCVq9Hubs/jVRMHtLp9pcSLEkGTrBw/gLci6eW+1qBC9VdJ4lmldRx/BGghINwyGQ2NvdnOdEUPr4mXHkeOoI2JFPIsTjyGIe59P4kneJz9TSubwQUSIQZybH4QtsHg+2RrEknGrwjdwNIBgFNpNV4+ZWYVh/zxSyTiZVQi7D9Ekq4NGc6ivGIh1zzvkPWftpYsyLDueNrE4W6Eq6tYdUiiyIo9q9DC0Htpkq+nBc4JqT/bVQt5H31Ai18PJnpXrNpc2lg== 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=5HAgA+AfG2Kicx78g89CzxMaT0kzM9I34JzzQQbJH1Y=; b=kez+BdPjnqPTxxGlMPSzKV5cy52q4lMz8cLZ2Ry9bhMCpGwh7CBRQWGGlBuBC639Ouf3MFaUHQrir+97e38q9pCuwLBefN6HbVcpLSvVoftOeDdLvnhBRcxXaIxrl8wK+P0MGARRZEr/35/aeZl/ZSbGKVO1UyMKz+P8OoZtO27c2IfPyvQ0kcWxWJd6qlMAVYBsMQizvapmSDU58QECvw1k1bk/adY0CTA5WK2TWAUmf0MmjpEKetyXL2HTfH+/bAfXylHbL1tkaMtsvkITuxER5B9DIx7EU6eKB06gHKB9iIVNmrLAvG5o8Q62FItOF8NjRUQ4avKM/3BvKYeYXQ== 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=5HAgA+AfG2Kicx78g89CzxMaT0kzM9I34JzzQQbJH1Y=; b=oBhBJtvo/36+gANC6zR/O3R3df30BSyRagRMCKX1pTDd8xtu4MfG3trr/PUtc7qHoLsjT5U1ih8HsN5Qao2kdTiyFws6TSdhdJ16d28xpBhsnfQeDd+7807NQ/6BxDLGUrERT/45JUd/PUGSDVehmdwVPWZAYnhhtRKYdPy+G0o= 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:16 +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:16 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 17/18] spl: Kconfig: Add SPL dependency to CONFIG_HANDOFF Date: Sun, 22 Nov 2020 10:35:55 +0200 Message-Id: <20201122083556.6756-18-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:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39bd2777-7f10-4e38-c688-08d88ec1d0ea X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:339; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pu1JxvUm6C8cGKfI7kWfypyKXMHFOlepxw2M+gcv6OudCKRwstNLudwq5h31/dtBf6V7bjmlmY6xU8kQuX02EFAx1F15SIznbG8BIjUTqRc42+ox3M7hCqY5xroNUZdat5h4chgKgNaEkbd1yb/+8+deSN4AVNuCui/ULIq8tn2vuT0VvDMm76rECUqyIo25Q43N2KkcKyYc3aVInBWBk9GJnXs3UY++pdfldHI9rwZCd9dD+5VBIIFe3ephTGjG3b4A1Hcmj38mirnQ3T6fv+iXjTlBAIwgGewzuftfYk0J0+o/qh+HT9IzlpbB4mO6cOj0ibfNBVaaAyi6824o+Q== 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)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: IIg2riXTgec9dxodnJyIDPqJpRT/ocaugWRnBKZnA/4nf/KrrNgC37XXXocFspTYNO8eAy5MYD3pQkmSXzk4LCxTDpXmr/vipeK78pW61Ldd2OmBT5yHlcXD1JW36L6VmvpiLU5aaTC5qEIsaAODWej1NQsi4fVA75tkxYpCMdEAaxMscYZCa3eI992r0/4PpKRBL/pP50FJGkXkigUHe7o9SjrBbRhrp/IEBaB+QzG/Opo3YQrtl/+iYeEFDpYQeGaU/OXhej6dx5RmeUrRwxphPLdJLlOYu9yf8KdTN2Ynv1ymDbfcmuotxIdah7yhWYOLBMXX/RffL1iclr3eWtH7n/cwdc8IyN8Y+i7srA/jkJmxHVWi3pjYA8EOwqNQDGEDu5HHQKKz89edNYA/MgCTi5VhrQc5KBuZfQPCWoqF+flKpHY+tmfNfyPZsJ+Fk6vNoe20BMDIZCpUG2QgHyARbDSRMknWZkowHzL5de8PjSzb5OkqweJaHeLMBqqmj692VHqUDygAcMBqKI3a9kz5e7j/10ert+4/I+06wRuSwUxgJsb3IlVaItcE0uKPdC2c4eYQcZnc0cQwwC9s9i0AHBNAKzkYzErtpJrrFAY11C4SxHkjsG40B9SaHdrr9CDPGeL3sQZ9Au0S9NgqXX1PnJDiIRvtqmjPlmKy4Yh6f9JKm31Ku6Fn1Jk4AEIeKHyhfy6oAeEBvb75gAmAMzeM1mBGoh6kFE6hLC4z+SrmQZUmvpXvKr++dHK4n6UDQb+bmVh1RyFml2AiWvFBC/vfKrmYfdYRe9EK6QSxx00jwEYjpYygkLfmB3Lw+KjAV8Zae5gGHGQaI6siZpffc6U1lv2X5IVVy/2TYUwu8sWkLzvWrQ//GA+eZ4OwlVHz+5au2/cFLZ/cQxSGbFMe6Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39bd2777-7f10-4e38-c688-08d88ec1d0ea 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:16.1092 (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: QbVjXqL5i4HqmyLJKeCH+7QA8SdrLemmxi9DZv9ZEJBgYcbw+4mcJOb3j9I8NQbpm3kwgXeplCJbK0XbL39exR06kMqdaOf2T70kflvAUDE= 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 CONFIG_HANDOFF is used in u-boot proper to locate handoff info from SPL during pre-relocation init (in setup_spl_handoff). Add explicit dependency on CONFIG_SPL, to fix the following build error when CONFIG_HANDOFF && !CONFIG_SPL: common/board_f.c: In function ‘setup_spl_handoff’: common/board_f.c:283:4: error: ‘gd_t {aka struct global_data}’ has no member named ‘spl_handoff’ gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF, ^~ Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index d8086bd9e8..cd980e96b8 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -117,7 +117,7 @@ endmenu config HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" - depends on BLOBLIST + depends on SPL && BLOBLIST help It is useful to be able to pass information from SPL to U-Boot proper to preserve state that is known in SPL and is needed in U-Boot. From patchwork Sun Nov 22 08:35:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404456 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=dd77/FQS; 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 4Cf3jl0DZwz9sSf for ; Sun, 22 Nov 2020 19:44:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57AD9825A4; Sun, 22 Nov 2020 09:39:48 +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="dd77/FQS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31ADA825E8; Sun, 22 Nov 2020 09:37:53 +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 NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 41B04825C4 for ; Sun, 22 Nov 2020 09:37:34 +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=BHeSDsNr0Tu8Wad7MxASBmfKtPk3TkbQbxkfLeFFO7AYONYvDTPRfZftSsOlWsf7kbDbM1a4t0sa3lUyV4LWkq4tppVQchTXIeS/M0da5Lu4JiR2+X3t4RQAW7K0B9wJrUfc+1V+cc/hgV4rtcNrXaCKopq/5auWdVY9Q9EWgVpQ0vQC+PK0I0R2ZoLr3sxI8mMIxox9TjxjbWpV6EGf//GJCldnfJgpkD6pb5e/pLeXspGKEKyEtgoFHJGcJLfv/VP3Qdkqjuqe8hiCtVyZn6tAvRh/+1wTtVub9gEclG9aCJnS//jy2Jk/hmuTkTr2o8c8BJm7i5e/c2cf6TlWWg== 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=pCC5ImfAut4CAUKxOTfOF3E9HcdXJHEG/Q+BB12YtTM=; b=LpCy1oqdkLvXSYZZ0TELar1kOW3h4PaNMTV50IOa2gvKWPYfuD3y9N0np3a+7ZS4FwtsYnvvRtOZ94KT7Mjx5R1R/Px9t95uiOMzDx3Aeh4HFH2w2peUah/s1TipQVLpAmEXbTcASHYlNxBMScSLqGcXbwgOH4pCEK/Zphi5lEGh4aogeyxBbJtLpg1Xpi9cb3z1uxuiTBN69NjWhxJV8XZFtv1LsZUS6IHA8n4zVz81g1lMuDQSVp3LwJVc0/A8lzjimANoW/prOSKPSISb1j/kz+EQ4NPd5XaaQr8uCtaoU3wGPMTp3WGttXA2eKJi8CtTSUr7fvdqz6kmneNp1w== 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=pCC5ImfAut4CAUKxOTfOF3E9HcdXJHEG/Q+BB12YtTM=; b=dd77/FQSH9RLn6jv4NZAunjCNZc+zsS9fFbY0UmpjPGnD2TGOEcG7wnLuQqLPwxdSN1jH18gQ6Zb0ghzU6pwMBBrLCZ9gmLFKczxMOZayokVEf6Z02lTH3JOTU8vLg91d3Wlq5p1nUlEBlL14aY8jz66+HN9YAiqDt6PN7FEGbE= 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:17 +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:17 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Sun, 22 Nov 2020 10:35:56 +0200 Message-Id: <20201122083556.6756-19-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:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2140a4de-8826-4b9d-6bac-08d88ec1d195 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 022xmAipdJrB4cQdPsVFL4Pya9qghlw8tAjBu50TPTELg7h4+uc0Isp+YqdFSPXHrvU57fuayVTfhghBtk+l1g9hgzf84mYRD0d1rHOBa0BQNman6T/Ma/aBuEFqoSsixQTnhGpjJO3JOzM5iikyr4Wjf9Bsk3xFNXpovSlSsjUESc72X5rFAHVmg+7hsyNb7cO9XJubgb5eZkGZvO1FdZK8KlXykNKShVztim+1UpdGsQ8wkFKGe3xWQSJn094WYmOZv0fSPitpILi8huZmh8uB0c/m/YjNoF8dubifxisG6qfaUauzsojSKMdwMwO5asaOBcVC8L4KcHHzNCkqlw== 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: 1VPWxYAe2SI8QrIeILzxgE6qmvOt5JV0feJAbq7LEOYcbksBA8gEBk2J3+1MFdsDWk6D0XwvC7X/fwWZCPGcZ6Oysa+XHX4bUYW0T07hPawBMZaL53ZGxZXU7485od4Qc6xpdCRg1RhfC+LI+qy8fQwmlxwmP2BZD0xaKwlBUQO6B8GpnPIedZRp0I5DUyNCeDXADdT+0toEoup/EX/bdO0ro2OskgoBNxdh7zqNp001n2HsPxzav5pmsa7nskyNejvXJhCLdBwvn5ql44ckI/kZGlHxwiz0Zh3rV850Zs15xSRQ6OQ8DNGpL2q0die65RJNYoS3FqIVQMGFYM5WlPiTmGXQmZImR2hKb6Pa8+W2dSD99CUSc/pXKWAdfT/AI8D5rS4vK3UWgrFhBVz93BkhRfOf3TnR3S1H1I6zNDvH9M630GbSCX8ulZyVeW0JvP0czSpHSBpqm3154fXPM5+niwEe/k+FvWd6pTebDZN4+5d9rzv2iQfSJeOM2eVExCf5/1u44hFYlAjx2oARvGjf3wVVFEIGv+NZyCAWmFsIDalDd3mCRBGxuWgPZQ+V5txJE2KuOvYF4fV/2Tv7R6L00ku6fzRQ655Ks6JVs6kzy/EXqgpii57dJKVqsyc6SKSbzfyTVISqkd1wyn8cy+6ZVJWp4ri86+bJmFSPq2s6dBQT+kCjQNqB0eoGL3cyIMrF0ZVFYuFcCSAsRbRRIkdUnK8tlhE3bgeMMCRVp5lic5xL3MwEFOPs2XkB3aTo19Di7KWp2CRQ1tuftyWPc4I8mzt/IoAufvUHLg3Kl258CmzqkoFLqrQHsCP45nETKlYKUwTEMJ/p5T/r8SIUDrYFXDx/GNu61+RWrBSGdVM2hNIp2mMgnans+NfA91GRLGUuZ1TF1hGriNuJiCl0Yg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2140a4de-8826-4b9d-6bac-08d88ec1d195 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:17.1626 (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: D7YZ4LBQ1Wt2w+TAegmLXLEGkeb28j8p19CYyfc3PnbsC/bcj+pv3Y2YA2snfA8b+28MykX+ABZe4amXl8fxCQpQEoNx+bBPxZ+57M4g/Wo= 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 spl_handoff should only be enabled when CONFIG_HANDOFF is set. Drop the nested ifdefs and check for CONFIG_HANDOFF instead. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add reviewed-by tag include/asm-generic/global_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 87d827d0f4..5b1a7f1131 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -400,12 +400,12 @@ struct global_data { * @new_bloblist: relocated blob list information */ struct bloblist_hdr *new_bloblist; -# ifdef CONFIG_SPL +#endif +#if CONFIG_IS_ENABLED(HANDOFF) /** * @spl_handoff: SPL hand-off information */ struct spl_handoff *spl_handoff; -# endif #endif #if defined(CONFIG_TRANSLATION_OFFSET) /**