From patchwork Mon Nov 23 13:16:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404782 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=TpIwekA9; 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 4CfnrV5h21zB3ty for ; Tue, 24 Nov 2020 00:22:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C72218260A; Mon, 23 Nov 2020 14:19:27 +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="TpIwekA9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 71390825C2; Mon, 23 Nov 2020 14:18:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::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 2253A825C3 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BjH6LuQ6kYeCQDPCPiUtk6tQuiikJKj9nm9+cUciKqyH9qhONfR3/VKi8A2Qi7sbWLCY6So29XOQPXeqG93FFapnUB67UxjFSBZjHu9FsszQHHxxhePTGwENMHDy4JaUCYSn9soei1qg8Dtf1gcMquqS+QyJg5BvJphi9BaO/USzh6n7U6BobMPnfmX9vX1Emqg2RLjJD3+D3b1sLMGD9NMHMG1kkeL2GP2gpeQVGcajj/xV+aboXspqIASFF4KA4ZlA5vjGJuRmNDVOuS/FmuyHdKAPHuq2WaJAc2URYb17zJ59IJQA7AcCblfouIcx3qRWvUwImB8cM5XE21NbzA== 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=JB9N4H4ww94o+mkWQ14FLTdpN3vmO0Ed/lZK1vyI3mM=; b=cr0BuTUeDRQX/XVLuqfFyk/JKClV9lOXfehcZkOpku0kHPryzO+LJWR6WcymKmVbYfLGtLE5HjKcwilcVczvO+aYj918YV+epJR4CQokmSaSwa0VaVkySfR3mB7JICy20Z8Aon0gWSHxIYCqWDIkTopPgliDtngt1k3zFsUjYiiBBF0wZiDYoi7VxrFLlQU4bU5BsVHTNvZdR8517re8j8M1qKBiLbMIs+2VTWahSKzz+4z0LvlDMBXc0e//nD/rhSAcN5bwwf5ERRcJUPl2Pwtk9LwTCfxJTBbiaLE0KaoWLHqgTA80hy4V0sdS+lGJapJskPY6u8r7SdUA5duMYQ== 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=JB9N4H4ww94o+mkWQ14FLTdpN3vmO0Ed/lZK1vyI3mM=; b=TpIwekA9MW/3UiS9CdRZ4XAduO07tTt2uDHoK4/lBrba8/TLmnYOLNLmYIDED6N7mUM2bV1dzihYkvcbBHdBSKYdI5aCNlaLfkpUr9oRmKKxBhYvpnC/epiho0eRjIpuNFvHXE1UVy+v/fcy5f6dVA4xuyQ6mmRIcs3VY4Ksl9w= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:46 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:46 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 01/18] common: Kconfig: Introduce CONFIG_CONSOLE_RECORD_INIT_F Date: Mon, 23 Nov 2020 15:16:34 +0200 Message-Id: <20201123131651.33032-2-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e530b59-2654-474a-693f-08d88fb22b1f X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: K6mVFwruzW9ivqYBnvb+RtK62xvywPsc47CwY0JwBjnNkD6UH6cc2Gy380yAdoPQA1/WNEq+EJ8xvcdockJqIUzeNzDI0CmDxkUb1MiXjszAsrgrmy1oTP7uR8G6hnboHw3cAhLzWahAhChqUegOybsi6WzoK+tvFFW4Y33nJWT+IKlymWY8/fm/5RbGtUEmOjDvijO9hTEDlGW2vd9iULHkrEXtJFF/mn2mLyCBxPbO2Mekm/FWqw+W6kX258ZG1FbMt4KXBCVkJ8da6jXPnuhmKSBb3eY5Lj6vJyWmuCdEnciX+tTcdTTN8sd8zHZCMA0FfDraDMGQ6JtFM/vkIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: iERGFjQkD3XfCR4vI6YDyOc3rOBbEpEVJiXw8zRWYB1XA+YYFgwJ5/snGijLeHMOrFIQsgiwEgJSyOaBx+GJvKmSUlIo4ZDkQhB2yNjHZTXBhIdEIVxB87k9jl1/R35LNflBRzxYDZwA+ObJmpssbIDbEDrc4quY3wD442l3+9tPASWaq7BHJRq9ddz9MlOgSpuz15VbTbpAGeE7uwbda/6wXVyZyTp4Pvh1AXhKPaFTleXm8rDajZGwsU9edWpHDbhJQf9uGkk95d3tULEb3HkCkrErf6Y17VmcCzupNIcmEuxEsODz12zH/7AbAJX+2No4FwrOjb3et/ICI+RqeWKzaMcw09yVKuGjmBH1LAAAkDtOUAAkPyNm1nHou+ADr3MooKF9sgN41Hka6rrBZjNUd3UTWqx4DR8SV30M2o83mSPdAN1NDayFDVSriO9eeUDAKMlrgrKFZCRPivhHD7nP2CljYdLCR2otyqy5dGqf7VgRo12/hBVGmdpyLMOrolBHpZtphz18F6goECk1T8no9DRN1Iytgy+9POaF/zyuOeUmeOfBZifFBlUNhj9/HuQuFrYpBJwAgw5aiFBYlpNM8g1KmvgYKMtu/HWKrwmso+dG2pgDrTFML7efwVzUcwIOGuSJ2miC9p2C4E9DuD7daSjNqm1mjDlcCb3r39AZD4yDjGimvs3d2zuWlsK7Wv73WWEhHU9yWYX7V7KVFx64Mn6bNzafKwbto7Fz9T2bTMouyjL9dA6Gdoy1n7SJIXSRdA2xegDREThvHwyTIPUKGv5U/FDf4uGzD5KFc1fOPX3qA1SuFcMuJ/G7LYpEOnPW7GsSs7OmfHyem5lV+t5i6gqgxEOBNYp9w30SJ8ZAYWaVvPTgP/Arhc+1Pf98tTNVS4hdpzKC877Lk1hg0w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e530b59-2654-474a-693f-08d88fb22b1f X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:46.5263 (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: 9zzmyXvqOa3DkPlBCXwjCtACsREyrBe2zbiprScegVxPn5Hqi9SLYtnwwFCmw5nvTLD/2/tbcK7YILQMGQRtHOfO82GL+qvS6DkYoiZLGQM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - use only "default y" for CONSOLE_RECORD_INIT_F 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..d8982ba377 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 + 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 Mon Nov 23 13:16:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404778 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=JYmhcDGA; 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 4Cfnq46CbLzB3tF for ; Tue, 24 Nov 2020 00:21:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8BC17825E8; Mon, 23 Nov 2020 14:19:07 +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="JYmhcDGA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67BC3825A8; Mon, 23 Nov 2020 14:18:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BB0A3825A6 for ; Mon, 23 Nov 2020 14:17:57 +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=QCZeklhvDg0wWmauHt1HNnHG37TCl8p7QJ/OF5sTUTOQ8xOs94YwCCcZwTxRPS8bMJlf6LLXY8eP5egiOQs3HqbTlU8At58hCaFWzUnZzGgMEyJAIjYu73Yj2W7CMTbt7BKb8zcr4NNTxY87VJv+EtIyAhMM8E0Wx3UZge3ndvOn5yKsfjaXJxPGfDFbZ1f3bMjpRNgWJW2i+/lMuOk/6B8HDjVKMIQjK1tND/Dsu4NwuQSJq1uRKNuWHum1GSS5GwdEh2J6jriqgB/yo1xQwJB9Tc9CtAtEGk6QlF2YjHLQnrMUcPDAxZCxahoRynd1Cn3qZTC+jDhp7YhHX/oUbQ== 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=326tS7NKUlwqlqsZj69w55eJl+vbNtYvR0A43dZQKrQ=; b=mHLnyFvXxIC/Q/qhfKM0yMwgF7lAu04n+zUBWrA4JcldLzq0tUR4NxdMSLlIZsKQDqKQQlpSz1sG1lVQXLEX+ngUCW67dto0RyFuK7OetmhYaL92F5uYkIpzu6ucNogPnBOda70Q8p6z+7Q76Q875dUqnReDAl1KvsNmYI9CBM1ToWJGdlqZF/sCfPdJJ4/0Gtd48s0VrHKI8Kikpj8zHCuy0jaqB3qKiPZqT8t0ELthNb1JxXo9JBTO4kv3Cyeh0PiDDcG/lzo9QUjp2kUQlc2gew43s2tqKypzavQW6Th0wAm6NNmnPMhZkvzgEPGWktlNgwJU74Itx1UITlwVIA== 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=326tS7NKUlwqlqsZj69w55eJl+vbNtYvR0A43dZQKrQ=; b=JYmhcDGAjiKL2zeWI54IvKO8sz+bdbFtO98Wu3qKNwgXHdq1laZI/fGHRdoi3pFw68cCC4x/T7mVXK/LBBGWNnzes8ckJAwI577+Gy5uFxYF6gh+R6S6syNAor3z6YIZ5T1RY4q9qjkp3VMPDJZLljyw+PBe3ml17o+ZKnAy7sY= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:47 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:47 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 02/18] common: board_f: Drop initf_console_record wrapper Date: Mon, 23 Nov 2020 15:16:35 +0200 Message-Id: <20201123131651.33032-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9afa79fd-0bd3-43a6-b8d9-08d88fb22bbb X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: XmFx9Xzw6NmzP7DLiXnU4DgQTvhAXnIs5VwxA3t79TmFyXYTXC7GNcK85GXGEMVgPjMZ4euSgm13KtR20Mp5bnasTvwMhlvANErux7sTvk8yYRJpfohX9v7XzousvrZz808qvnEp2xisWopZzf27wkapCt3Nb06mHh5CfT3cMF/jpqEd64fTbmFPq2e7R4+hIUoqmpK5TelFzBvH+XMmV4TgSoiwxx2SXueKkJ/d9StzPp0qh6llOlJYbGuWr/X0uIGZ+RZfLBMSx+66JUI9ncMYeKLXZUkcgtPBtRbv7+Ji9/lAPWTVShY++rAmC7// X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(4744005)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: VZo/tzRX79LQXMwLq2NGoElsFVVRXOnTb3KBnOiB0tJ6b9ee7dgeNr6E6jKK/hUsnvNjF8UT8wZvEZZxc2WnxuMR/goQgs8KsfjoDJ1z5BYTtZKX1CA36AWhGrv3sc/xz7kJjdoBzj+gEDHbOns2f2Pf8+Uf7UWQNwhFdNJMSOelH9vC8aRPWMtKsFkEZPnSX7J0ewjWaRQbdgh5wjWf/Tr7yCjw//5eLTdnguP/rrRadtB+ZdGGe3lOWnCEEKIbuG+h2K3ZdcWFUbqHT0/r0ynnXdse/5xutIvuwNAYDL8rp8fZJYDf4IRMTYQbMIxf9brgR+bhqfpKYKuYeqTK09pNMk9z9YqC6nqcSaJARaSqcRaGEQeMMGNo2ZO1CIWYI3uqF5gZCEw+jEwktLoGRzH2ugiXb0/uT/jk+8FpSTdEimKUoPiQseiYZqM525mFcejnj3HrjTT7aO7k+mI4PngktvtVC97A+Pjzx1iZ8zpT3doQUwCpTMtEPuaI4+05zRTztL7CBR2ruIWDBlHq/ujH2h478WTrLjvFdIcrH0NEVNptPFbsZBPqeXc0a5ksXYxPn2RrhDpKzFLCkWgzhKezIJ2GoG9GPuDAM74Zxq4ZxzmbFTiNgrjQEZvJJZADLtnnrfdqyZznaioAZp6qTkmI5NFmq4iJrZRevR6SEe4ab//kgj2SMVU5IfWB5Z+0C87kKZg6lihJZqJsKZa6htpyunoeNt1S20K3tYOFpi3SsFln0sMGZrv+hjqkEHzq8jyJbzoxPwKI33N1VJcoXmYAPRjHA8XdAVgBnsfHUuIa2w7HH4l4n/PTqiV09vQe15u9r6YeL7aYdn76Ba3ckn9K2wwPWbleTlxGG5NhRry8Ng3bxtOX9P4DyUbGcO4elpXi7yOMJnZOitZFzSyrVA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9afa79fd-0bd3-43a6-b8d9-08d88fb22bbb X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:47.6137 (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: 5FYzuNaA7SF1uACqFA11Pbm/xhtVdj5230iBp9sdnLnGhNCe64vDE1ormE1K8AgHbsyufzz9YvN2Yzp9Zh3wetbS9rvWVToyPScGNQTJBBA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Drop initf_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none 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 Mon Nov 23 13:16:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404776 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=Dya1dY1l; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cfnp441XszB3tJ for ; Tue, 24 Nov 2020 00:20:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA560825D9; Mon, 23 Nov 2020 14:18:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="Dya1dY1l"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A5F4825DE; Mon, 23 Nov 2020 14:18:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5FCDB825A8 for ; Mon, 23 Nov 2020 14:18:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=obKBiQ1138islGsi/DMZEQ7N6IVtsCrh55iebkDDDASO8C64MztXqhexioJCv6oBCFuedfrdd6ux8cRmMHk9MbE/rA50aOiv2X2iqQL1U20qKN25Yw6GiNvenXegR3ElbjRl3dihg4Xc8zaLTrw5kqUa8fhDzMH2uc8N5vAyRhA3GMU+GC4T6LzdR5e/+UFzAmqr1BBJ50EIM0w2qG8VJvalADHobLKRuxHRMV2QssJFsMnVZ8orh04g+zsGGwtMpV6S6eRpz7LKJj4+h1NsUXpXQQUhYT3qPVuxgUtOa+dLE3ZGeXHpidG1gHuyZJjLVrso/lXqnxgAPzvBFQ8i/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0OJlhmOzIJVJQDwytNDaktz+eiW2QFFJdfSUdmjI1rI=; b=AtQBo2eHE7w7a181YNlh6RqcFAm2e6vqo4sbLQHp1PKgj5MlD3dmnrDtH1r6rUYnmReKOpuWMCBhjfp5h96EhznattJMKslhtLrkWWPfclxVijeFQC5QJD/y49I77k9JJsz8QIkOTn2Q1Kxc+0MohWv3dEIe8GRrKDF7R9tm+Rk8urq71awxTGssARzdOBMs/sSvj9IMCO6BU3dVqstlAHC6JSDmb/5Tkgb9z+xmFx6Gt8P7BbzsYXKQrQKDxbuvH3n53dyiDnhZYOWOPVw5N1GHFV9wThlS2GB3G2J87462h5LpSBAGOUbml+t9IVtEr4QeDGdpdkSg5fZYxaNoLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0OJlhmOzIJVJQDwytNDaktz+eiW2QFFJdfSUdmjI1rI=; b=Dya1dY1l6bPla1mxc27+SnafHmwkpaO/bVraoGdzc+PTmIDoVbYbr7GTJW90R56KA2R0EmJl/qNIcXKeax4KEBRWF3lxXW7bEcx6S6V5mTgre95pablDTZeo1QbA22djAS7eHho6Ua5wNUyq6v/w9I1Q7xUYimnCp9MkfiQGz0k= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:48 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:48 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 03/18] common: board_f: Use IS_ENABLED(CONFIG_TIMER_EARLY) in initf_dm Date: Mon, 23 Nov 2020 15:16:36 +0200 Message-Id: <20201123131651.33032-4-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb4fa220-d78d-41c3-f211-08d88fb22c61 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yjl/kxetjItUBrrNiPVMa/tEcjlBt9a9xL9NdtLF2CT6XHNfRaoX5hMohyIq+qsbFLYowwuL2FuGceY6TwpPupZlBOVsCeDO9B1uZ833Cj6jMTNSTHj05pZqTpBTjghl+HFndxuJBT2nx7BhPvxh+eP04L/qZDeJ5u8GyDqNZssEt9RTDF7mqEu1gt5mi9NM9WTwSLuhCJsrb+aBznHR5K7GYnw1q63xT5shvJq6kK2gt9oWTKRSDcj4Q7Hx10Voez5V/vBvuE2LiF2SHS74zxjlRmGjKXNpM7roVlGptuPyQn7ssGOjJWjJ41cj5eli X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(4744005)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: vh9/slhsPrJou6yO6SnT/LB582DEAeVCFrpIfYPHHt6xEpBTaSjq/klGwmOPCjeXFVR7vHHVt8MwA3uTpJAPwVa5r8AfNnqRBKY5E1+EADs0IzvxEbSJEzixWtZujhZvt6RyQE7FMIDKhgnvKbitKTjR5gleDx7adig0TolL1XNJWaOWvtm5ZIWrBxTBPbh4QMtxT6vfpZ4GRbZ8piEyuvCSuZyaKdwdxBucrwmwPjb3YjsVQGbXjH7JWxkxNR3rp8c/nL1+Qya+BtutjL1nbh4yrzgyMG10accyxBy8Q3o+xy0g5ryuEdrYzEGXIP0oHWhZZu9rKJ77/niisxg3j9ihdoaDVCF8e5ktEUQksc0pCVxyV/8JINWX+oF5422MDWuPaezN+FOeDuL5gGetCKtdA7XqQipkMY5HawCzqmS9/8L3Q/DmPK0Qlf0r1QoiwJIDqUxswp2lOacoS9grBTREOjX4Fsl9LsHEq2oyRA69EPtDMUz7AzMpNHbofYRmiGWeRVXh61wPbdw9CN6P8H1BIEjjvIHSiHutfk5dX8sBd/NDPTfqbdnKzHezTHW1nWEzIB4CuHdFYX72bPuQoJ/ucZSLjp6AuHR1HE95H1Gb8depNoJklRvIMl8FpJOVavV0mo/rGlJSuNHzhigzqzq5ZKVKIrvrzbTWznYPOsGM/mkT+Rs8wpZw2cl98ymPmfNLXjpAK4feKZgESJADhj4kf2U8isjkbSMScAMkVuG7PDChzl7J7nfrSF+AgRAltrWJT1tzlkvf4giScq632YMfdPfRV5jKBPBZvRqfrju1sttr4RCGyD5klc8tEIwU1HXO/gHmjNc9g6fOjZJ9j4krLK6fGQYY6CKNyscbQvHGscjDRV+Gy9FQwn1xN/fyQiq2GGfbQitBgBTNUM/0uQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb4fa220-d78d-41c3-f211-08d88fb22c61 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:48.7390 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fyoE0UMjeD36iLxAwLAcfcKP53PQbzMqCI/FsNuEoDLhlx/lLx3d95qyxzWyh9CU4oY184ava5r115VhGeOAwk3BOE3ZspAivqjhIUiv62A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Use IS_ENABLED(CONFIG_TIMER_EARLY) instead of #ifdef in initf_dm. Also, move timer code to the main ifdef, so that ret is defined. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none v2 updates: - add reviewed-by tag common/board_f.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 552552e328..3c4437341a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -775,11 +775,12 @@ static int initf_dm(void) bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (ret) return ret; -#endif -#ifdef CONFIG_TIMER_EARLY - ret = dm_timer_init(); - if (ret) - return ret; + + if (IS_ENABLED(CONFIG_TIMER_EARLY)) { + ret = dm_timer_init(); + if (ret) + return ret; + } #endif return 0; From patchwork Mon Nov 23 13:16:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404775 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=kXq0fdGr; 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 4CfnnW5KRBz9sWy for ; Tue, 24 Nov 2020 00:19:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A8DF825C4; Mon, 23 Nov 2020 14:18:47 +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="kXq0fdGr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C9E1825C1; Mon, 23 Nov 2020 14:18:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0ED77825C1 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZ1qdaJ4HakJs2Gt3RUl0LuVcSh/FzN7VrqYuE50pistE1I9Lm0D6T1+j5wMTbX8orD2LqSYiq8NqPvN/u65WKt0xGs97ke8BQahXeeDM7oYsg7RbyK6BbA+R707FywqiVgK9W5xKfMe6+ztOkfiO9hEHSv8CHoNBPzvc45yevdCUH5XVBVen5WhBjTQNiCJI6LeSpKb3nbQIgQRVMEitRAuGrcXALFmqTmEBtdNqGugrPZ1dirXfz45JnXgF3ydqIyQQeLvr3pKNBCBJo2eBQyIo6JYx23+2vHC6A8kFYo9D8fm6iuOEwUoc6FG3ACeYHp28BaUrSDEWBY6YRrvYg== 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=EzzamgQn9sM7mIUIOwQx9eeSrmk5aq0wjQn3kJuNv1U=; b=mLv60qtu8kr5YhrOXkdoyBXVX1s/kOm4ElvVVMA4KrCiMBAJGoPrP5uiS5tVQgnGf/IbSeC2HT0gnIcJRaa+I4Mqae0sB/NOy+vLZI38jVK79dHfzanI6p3/b1UjILjocEouHFbd68qERvEUXrLeIMA1JsSpfK9uZxDvhgmuUEJoXLC0piX/VxTx8QQ8XLQ4jC2ZP3hUDkZpd9g7+8QSHEyQiUDJGzTT0SfAqQIEF/193Bdamf7DSxJuRPSZn2C7FwdfrWUpSmn+zNxr+5aKWAq34DmF9coEngg3pyfwAl7jvxj31+jDXeb19U+tpkkMjMsjMRov4xbrNNEIMSB5Bg== 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=EzzamgQn9sM7mIUIOwQx9eeSrmk5aq0wjQn3kJuNv1U=; b=kXq0fdGrwnEpSJWnpyFGg9QaWit1MLbzIO0PYC9LtRS8XAvC+RxPBq3vEKm+tqjDvVp0eR6Hs/QJ7QdzPthHcutCQQzkxhcE7gndC5sZ8oIJc0aDPy1f6TuNjgHCgkTwWaJpxQLRb48pUopDivgH39Rkf5JrtHMUskYSY1yNK24= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:49 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:49 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 04/18] common: board_f: Move setup_machine code to setup_bdinfo Date: Mon, 23 Nov 2020 15:16:37 +0200 Message-Id: <20201123131651.33032-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1990edfe-31c9-46e4-9765-08d88fb22d0c X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: 3MIvUFYJR9oJ8ZapXV9abg+bLxe2enzHuo7Sdxn2O6JiMyRlVekmssHuuJ1dv5o21BsAmOvyICJH+/CyQEURFS+jRe8GCjgfk0iWnl8g9ytX/GD5B+MSfZnkORrhEqZA3Om3oxfG63/dkIAtiyBGugsPHzntzlcQITGR/ISAH3YaAVaB1/Ro6XTbxdnWUUKJwpM16xgrL+oR/9H3RIrplapK4VvRgqGIj/shqt6RDLmv3U+/kgotzacGuTP5PgE8PiBm8b7o3R+yMTjinEZAtdeFMxWlCk0cqIZa0lebmtJf9/IWyPkCV2LbqytI4f8gjSDsTK80NxD2sjfpM3wFXw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GEulwLvQOI6OZ4T9Ec2oqtVsY9aaN2VO22o2oHTe9ELKFoe+Gn06us9HOEJJEoOqTxB1yW9035HwcS5QSrwYg2pDXHjrenNcPkALVmEHPnO4vCk5Fai7xfGj/5lyZX8IQ6w8yh25B6Zez1ju6sXKw/KquJbL14bUU1uAWTYZVH6jpDTCgKIFa4/ShoQTvyhwkxNNJzcl7Ya/BS5oI8+k12wmamIDyO4WhNk5HJwBSPuhym1RLgQAtPQ86PmVVHkmUfdNCqg8JwPC4CIenwhgU5q3SZhMyeP1mKCALRv54nFg0GlxWvAJH4k1Sho2C1qxs1ezz0AylnnECIhtqXqiAwPbQaimrhlT7ogpk7DxZSDzV6Ha7oGK9DUeeI8qaTRCE6lOrASqe6jH/avKKs1ByhjLx/S/xtZGim/zf5FbLnEPcNRtXTO1acxbrRm6mKSeYZAAmMtQkspvJfgueljPVnfAoxy0lWujA9OOavZJaJtPl0hLAk+WFnI7PYUBktnLO41oR0lwwGI8J+PsjepxnnBlufaP3PdH8Ua/6766HnLdkNo7Fv3DR1+sn2EepQSPCj2yn6FCnO5JNw+JABKTrLwExAecjH7JmqkVehSnWoWmRK8GLm1TarN+hzQFvcCkN0M18SZG/HFmx0giB8txqhewoLJY/d6vNv7Aq7hDa7GFkwgAx2zqtlnmxBjlXPfwRzzoQSiEhDAcKS1uu0qDVJEYP1ui9EFmV+R4kwKWVRR7PNZla/+OWT4zeOO4560MW9K47W9POVZMlDlwzwi0DKdAiRmPZytMQvFHu2AfIiuP1ar0IG7Isvr/1VQLVxsYYN3fhFSjS2VHXWvOL+8ltVpE3KKZnf+RJhGNaDOmF3TVSZtwLGf/MoxRh38gTsSRzAWqWiG/FNEziY4PNxoKgg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1990edfe-31c9-46e4-9765-08d88fb22d0c X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:49.8354 (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: xZYsdp7/GwKZuZotI7lcU65lQgShaC9y1RQxSihHvYhJZp4JTjXbybdou5DMeIyau3zAp4gVsBOE1lmOz2mtjUISlYda/zuamBGbKJIpzBc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - none 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 Mon Nov 23 13:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404781 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=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=IMr97dMd; 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 4Cfnr06VmSzB3tb for ; Tue, 24 Nov 2020 00:22:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 40E89825A1; Mon, 23 Nov 2020 14:19:20 +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="IMr97dMd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0D34825C1; Mon, 23 Nov 2020 14:18:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::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 AF8F18242B for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J28CeFGY0g+HBHWSD/RdoW7wluhNW7dvq1rHZYKWCR/fx3iIm8vcXI76IWJuwMhUDk1MEgmszr9BKmVYCKo1JkX7UgaIxqgGIv68QT8o4HpwEEqgV12YuCB6Pr+IFYvjIcvFvZZ7FEgphnX8DknUGoqhdA2VdMVnxcUad/TULROZnJl0XvPL/KBfxDBrVa1x1qKBNXcGsrk9X5/fwcFkmeuS1jlYai2yAWie6gGaZZnoAboBDaCuht+f4fh/Eo4iApKS4gYiFKO17QoZIaRxIwLXJhjfHa4hiz8gcnNKfmBaEgZYNv/0CF5TQijtBoBrP5eHqfz71iUwVxX6ho575Q== 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=gTXOsHcOzbeBnYgd4lrvQvG5rMWPC6FzWWeeGc0Qy0A=; b=bU596L7nr422kEH1Dv/SeUG80yAo8Pg90tGfjt+HgkcU4plUROgbv1Q7b58zJyVSg76y7jH9j8a2ziNOK6jIyv7EwTYxkLmej7Vi/+atXRmvycW9HuF6BU+IygYB7e4vWo9caaBlrINjJByywCMadegxcB1suP6DJjDB+3/V8VblCggn5ldhY7fEdGAbfzaOC1n/ZPkDN01qHwVhno974yxMZ0kPv+lXUncnC0GK6q8AvJVWNhyLwzW2DIV4J3goGGsjAEV9ou1XxjfczscQMkWaXdXw2iJa9MucnSs8sYcsdYiTDR1bIalnxeBV8KnhVxR+8KopMZS3o3oqVdpxYQ== 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=gTXOsHcOzbeBnYgd4lrvQvG5rMWPC6FzWWeeGc0Qy0A=; b=IMr97dMdlBC/ek+PGsVtk3iJF25XdSIrv9A78Z+3T3zYP+uooCDL5mZvReAvaU3pRTXTe+eZmt8g15s3B9V3AQBwWDUMQejYSFPy9mUUPr9QI++Hdu7cskNcE5bqVyD6qeZlPGbgcAa+PAOBHdb7fdqHEN7rgADglIOns20Iz1k= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:50 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:50 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 05/18] common: board_f: Use IS_ENABLED(CONFIG_OF_EMBED) in reserve_fdt, reloc_fdt Date: Mon, 23 Nov 2020 15:16:38 +0200 Message-Id: <20201123131651.33032-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1462f2ec-b768-4935-78e2-08d88fb22dbf X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: nn7UXv+J3e3+6iDTi4OQndVuC6dtq2LOh3ljqf2hLRIdGD9xZEuoVS8jUw2Yc5eps3c3d8mUjtgTPkC/NXhVC2FU6WM5gKJcawBMhcW1pj2TTUIJO5zvqd6Tc6Gc9uyj2FDhEL6+nI75Igphf7WtaQm1p3cM9gNy0s0LODvxxxe4pT4e52tRxkGAVy4/Q7rribxhj6WYBq2NsHFknohD9vJlNap9906iJse0myYl/4KcDVpCPm+Bdn7C4j/BNP29W2qv0RcGwi7daR69T29mEzHtzz8/q1pVKOrsgdvADdDLSXC5EYxdF+Trb5kLGFsK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +fMh4cHG+AS3Rj07YiWEfIoJP8IKM0bBQUtxFvGDEE7gRRkVWV4/p+COSxpIDbXUKtoHa84tKK/qGssyvR+b4ByPSM8GWOmLmzZJDw4TOyXbVXc4SZHh2Coky5XaKJj9gGtiE6bZlKYBwfw1G5CLmrhXUc1l021cyhLGcYC8TE8mQirR3XYGUCyb2QF08d5drzmXBYo5uY7Eak1MWGWS4sYBykkWSnE5M684Z5+F1Sr/WTkDWxc18i2VPCfKk7GCGo8wTZsQG13xLcQW6w6xHoU1jQiUKtCrtT+aN5ocoDS8D4p3ld7L9sRUCeFjbTSrYNKzcD1s2VOVhxCbB483wvCkTKYQsm0VqjzRAx6vP07SW/B9Bc48C8BjCLo0w8vD3LOQSMbs+k8O+/WelR+f/dQ2a1e7CFBQvSi84wCK1B0zXnE/4oZJe3prD2m533yzL7oU8Br6oiXgR70mhFQ9FU3amnbYh1x4V8z4Db6GYRkdPbyjNnSYUfIg+AWbGajaVzMSk6xuRNRZEVVc94gfLNaiX+Q7wzVbBd+0zREGY7nz0l/bUFo93UHJU4EEkuc/4AD1YS0uHuonBWWDBpM11tuGu+Pql1kX8YEfRn8mvdxSNZMYwop3+2W07RiYCjf9MaUIvA/EvULERj4WpbtNWjC3G0GHV3KZBQ5AHsMgY/caEGbUJiJwGdhV3nI4M35/w86TvS/fnRO+vIa/Fox1scUtfay9iTze7wnQiy1XjruS+2FiNQXNTzw96jZLjbd54uxo4LJ9xop2kWLh7o2CBKAy96b7y+M2X65tMtWySPGHPGyji+zapuc7h2Ttl+bPS1JuJzkKd7DaAopU8HWR7WC38TqQen4jDXc6tNVdRuyhWxzV/K1Fa8zV29PyRCF1jvOt19dYLrnpbHpkQesTEQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1462f2ec-b768-4935-78e2-08d88fb22dbf X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:50.8987 (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: OTANwGE6q9Yv9osvfzffVliIQ6IZcuJ7tqv6AEYrL3x10QBnpuPsEChbAUSMV+tlJ+xwcJzUFshh97nvLoW19fWjBOQyNA62W7YKVVDw13k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Use IS_ENABLED(CONFIG_OF_EMBED) in instead of #ifdefs in reserve_fdt, reloc_fdt functions. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none 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 Mon Nov 23 13:16: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: 1404787 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=AzuiXobO; 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 4Cfntp6GP0zB3yq for ; Tue, 24 Nov 2020 00:24:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7317882628; Mon, 23 Nov 2020 14:20: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=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="AzuiXobO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9C53E825C4; Mon, 23 Nov 2020 14:18:35 +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,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B1550825C4 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxt+UF+nT3GdSE21cpTdK+oqULyNl6lR/fT4znytcfalsc3gj74FQ3qi8jVAXl3y7NUngTOWR9zJvrm1R6xUK6VDNEjWG2y6Rn5p2uOuldla2+czpCW4GVSJaLE1qVV9I9KojcsdPPwG0U5necW0/yaZHeRNvOU7WHoZ0/bcgJhY73LTKpnazu/PkBP8IJ3Wjg0GNzGO6l7N2gFDaPVnQZ5/9s6rUIwThGUhpjHudxBeEgZXjZZKg7XE8WL86WFVow6Irx9am4sem9uuXRNCP0bdr2Ox+oJt4rSRGXRA9F3rY3gObZXyHU+gtleaixOFmJFOOUXWNqRfTerBtczatA== 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=VxNM7Gh/D02wkIG+GE/Am7hPLeUv0D1TLm8DmN3oRB8=; b=nLz5NQZSkhTFTJybhQC3VIlIVIKglxR+CAammC2Qkd3X5bAds2WLJxARADbJ9WFylCxamLPze5WJgHT2Pv4UArjW0gO/zCoiBFZtXzCWLmQUK4CLHFjAOjUYqUIYgvKn7qhBoDuaPsWow5oE7rmvELY2/ulnIdjKdT+jKaVZKduJ6FNmE0XhojCkfQ4VEHcZKk1kS+4dadGUNB0CbSzSQQ/6M5heDT257MzsoW09E1vYubuQOhdPM/bpGWhYevEIJYJ8KfQ6FOtlncr+0081MGCYw36LaL2cdwNh0e+8OFeAzVXkNhTlRGLoTxfRADk2DmQCxGKt5+muHQQjQkLD/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=VxNM7Gh/D02wkIG+GE/Am7hPLeUv0D1TLm8DmN3oRB8=; b=AzuiXobOxqKBVrRiEDHeYxLHMrV1EgZw0EuWmISVz4ykmDtNNaYgKSY+ecVABl90UJALP8mtTvCmzxKJh53fHQZbq886Ytc+69YJQZOemMRUGQMd1UP1iNdb54k7uMdIwQNK7Et8TZJgYQo499saT9/V/d+QXS7urBmV7phbbEc= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:52 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:52 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 06/18] common: board_r: Drop initr_console_record wrapper Date: Mon, 23 Nov 2020 15:16:39 +0200 Message-Id: <20201123131651.33032-7-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e59424f-9942-4bd1-30d2-08d88fb22e59 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: UuOG9WtTZSYWjlXrefUxl2Lq3Me/euj1frq3NgN3aot+dOC45FUzSylbgBXrtdgKsz0C9MHzEG7ofK6wnEKuT2QyTxJuG0mIEZM2kV33IzWmJi/XKIYqx4drfDxKVA8DLIXBPbMU/Pn0itc8gOx5IN44GR6w5VJ+Z4XUtVojQsuktSQ0Y9/mdz6laVszwQ29/8WRMv+GmtRpRjnpm0cce9U20oxAwqCA/RtyGPKa3+YU8Ul9gFgvyjWJrRwJXqjfyrQprZ2s//zLQEvEgzAx6PjrWPAvEobpfjJOznWbaXiaV5I6dI+pZCSZVv2Ioemj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ijgL4XgArzMgwcsWrFQcqzFfMgtnKzy+fxgftv6tXv3DlUkVhtnd0TDjwc9ZlWZ+g9aYGXugj2PQTLBKqPc0iEnqaE/UMihqvQ06gmx/G143JtJbw0cKDB/6JSLJ4cc7hqX3lYAvWaox7Im4BXSlboga3I6gNyK27q+huZoCkaf6l7jLQ2/LFMK97gXUVbL1cTUWmZ3dRRsJppZouhbogz9q1815GssBnJ7wbaR6DKRSBYZJJPeltRE22N8JzHsp3H4zhF7SxNtCAGW//oKaDKGuxS+evvCzyAARQYku/ICPx5WIYzZI0mbLwsmBg28CqTl/K96wPyDR/JCxXrSA4+V24SVMq3NAxxj5viyfPpYw8jCMixPa1fF528AJd81jVNWH3VE3gv3dG5P0btbpPOt2X6mBKJFVJaQJaJo8qfiM830E1Mf524+QA8g/f71DQ7Q8pAQAMHG8mUCXzh+N559tFKXCisSEW+1DIhgG4oqpEt3gTbXxAOYcB71uTsRAQQDi3vg6RgsDtJBebQI2FjdfefKE7JukDVTT3SdelEI4OcC+n4TFTfjH6bDrPjGadhteWNaZHLz20J1SwP1nlW85hls6K8BHn70XC/8rQBg2B16tsBTsP+ZYBKV16yem5DkPRQ+hTmfs6yARJc0pWWj1pK1YGY6CR53IUjL62WNXv+5hXY02oQBEx1eRCQK+XQKHgZKMKosSSfGsN0tjuTQrb8XB2ZWxKifmt6pqHcRC5y5IQFG7WnZmjypWdflFMCV0Ivf/BiKzw8l7ow5xli1nwG9aRyjnZeHaGplFLCANya2ftuKdG0/ipqkdIeon/M/GK23QKDuvi/FvTGjOrcenJSOOb79xwkOWMNYnVmy67x6Ks4QHrbAPBPp+6xCB+w6prRwcsB+IxtltwBJT0Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e59424f-9942-4bd1-30d2-08d88fb22e59 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:52.0391 (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: YzVjUOcHV3eOnd3G3zqaykjhcOt5z2XMKVylVR/nybNcMQ4B4SF8pfBQ/VKxkvlQb8MkjshsWyxh2WYz3724UgMnh9peNLxttiO99spqToc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Drop initr_console_record wrapper and call console_record_init directly. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v3 updates: - none 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 Mon Nov 23 13:16: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: 1404786 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=jBWyVKtN; 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 4CfntF1VP3zB40T for ; Tue, 24 Nov 2020 00:24:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 292B78261B; Mon, 23 Nov 2020 14:19: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="jBWyVKtN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 89660825CA; Mon, 23 Nov 2020 14:18:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::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 573E8825D9 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EG/TU+iPDEL8JSq9ScImpdCfQtjXA/xjC6D/5pmYSFYqHUesiCktPbvNSrzvEPNYXxiJBLVU3+Keugf/fU7XV7LvdVfI/fLqKPsTi0ns2zkGW3RvZyBuVYHdQ1x2RA5+iIK07JADrzG1JiusjDUhk6c8ie5YTv5w1XG4VLcgCpAq+AjNbMyctpOYs9K6qLbXR1+r66UXF6c1zdzdHz6D/3A8bG9irpa5TMiZMmqh9bSH2DXm+tZ0BLXihDBdGH2Ub24SNrMDWPucAMd0pGdbJg3f3tZ7Xf5pQcJ/EFd70DpmkUizzNtP9p+g7J7uoLk3rLdZcmNnaauAtZQYHaso8w== 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=au1MTqYAkefVF/kGPPw2XKBIa7Kd7fr2ucDwYHZ3ZXE=; b=aoNntVSFHxKtCapNZtVzwHXiHKffPd1Mh0adHe4yYUqcLNXG/eRgIJawTFGQ0PQaDFyRxZTF4eYugSz27pRbWQPwJPJKI3t7/FCRcuwy1TavE6TFwpaI7zeSMbbCofw6uf3LRMUU2LV0Kz3xi6egLyoUHOL5Jpi63fOirpvqeB4kVEcS8NyONJKNJcUkbj/OrZCx4OZ+b4MCpt8y4cz9qgQOqbYZKVw4Ge9I6AH7t8STphnX1UOzxpGNdVIPzGRxfCDEb0I3QFgwZ72H3XyvHV47R2UEFcl4vKVkesMQb4lthCwpy23FLhizV2v+IJFXQwsNVTTk+o2QWUBdxGKTow== 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=au1MTqYAkefVF/kGPPw2XKBIa7Kd7fr2ucDwYHZ3ZXE=; b=jBWyVKtNwmR0JcotatY293qjfxgHHHnmaEKXYGwWjLbUlOGygzK6CSt6erQaTIhdgP7kKU4pOj2oeAKFiBGtxBwd0kXcjWChBqYFSJP6T1GInXH/15cJvITDgwpcNpATH+r0tcK9S+Tk8RbMY+pDSH4EUMZv8a/5y79a4G6p22U= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:53 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:53 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 07/18] common: board_r: Drop initr_secondary_cpu wrapper Date: Mon, 23 Nov 2020 15:16:40 +0200 Message-Id: <20201123131651.33032-8-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ece5b67-0903-461a-e2f3-08d88fb22f06 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: fgmYqTD+Kfu9tpmuD+kZCcjmyyfBPBm/gTMkm70SZzWtC9dEYrGV0GEi38RZeUfiEE4AfePHEU+Q3x6yNJQuJUCI/Nqmnxplq7wtJrY63PZz8hN9djKOUDAjmvmvXXnyb5wJqnWeJ1xKG6uNa2eABcbd2er4JXkiGEJy+Sfc0hWKR4TLrcizegh8UzOSwcEChWfxF3RLzjncmyQ6sp8/c7zEk16oOrByYLKX2qI8JPWVbfyBZ0yZZFRrtznLA7uVvcdjgWGxD6J0eeLiqh3X3HRkHBkZwKHURUk/edElFnMLAnO/wBzsXzUvrmILC1Ta++3SaV8LkCaV+Ud1AdGqgA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Ws8SiqXv648fkhnqI6EaKipOCaXBYnDxMBXD9mojCHoANIuMCp2VmGdEjG4/zkvvGne+TQDIGBG+aFa0Dgss3lBdCowGk9lua9odY93CtTMZZXA9cceP5Yrf47P6W6+jQTiQvaaJqa+o78zBOvFfUaB2ZAmYMHmnaSaHBpCeWU/YcID6lOIHLmWSfq/iTcBTXKMw3ueYa7jZmfA3i1f4wKj4vZqJ8EoJrVtinmpg05sGScf6X0sjZmWBETL7t4WDH7P5TDHzbQSqR33xdpHVLTeJswkBb8E4/Roy1QLEUVr3irjrkrhd5oPIn8Conm3hOEKLzYGEAun7/fIi98FzzIj5jCGm/rM1t4V6m/ApfWZ5c8TGOcR7dpaPhVtQ+r+hrtGbkHgG6KSfmc+lQaoZ+p9qDTMyEwy84P4kQh8eIQU2cR6jFH2eUzNB+4tvNcJQo1cfahzRaqE9/sN6fgA6P7uuDEpZw06FBiA6azlgHmWZyw7qRYF783INJlWM1NVjoXNTEuMOyuNQ0KW92UD+n9JhTskomNZAkql/aW/S1i5gwuB6FddpCcY88MpAkcqLQAGfKats88WujQsx8M8O7OUGRZ+jZ1qdI/f8KGXfCNABeEnmqca28IMFeM1UyB+QUi3uJrkmExHx0YQYUvNkzHTaGLJjPH998kUl724iVkrTYJBdWxpTI4/hDIhFLucZobZnA17xPQ9sRR85awN42Y32RIokyLg/tYvQoEO9NFRsyCrtkKpZcYjUbeMzvxtwkGJBHRQlB1d3DSaXy1fha86rsew1aBwI2pvVxwxkLFf9V4LATzCSjiAINw4+Ukyq2vw8StOL3Bny/MfAtSFqqQYenooxTfTzw/0OC9vGSgdv2IIKI7RA/ttoSU0czTUE3K0r4DmOoGmlhEeq+SLcQQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ece5b67-0903-461a-e2f3-08d88fb22f06 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:53.0695 (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: 78GmvD6VqgfulODgdwQm29tXKvyPNdplxvGIWs9iRM3gUpr6SLsasiHQz4mP8xIMTds5FfzWPs517FNxOaY4Q+UbkldheviadUjOFD4C3/w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: -none 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 Mon Nov 23 13:16: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: 1404783 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=GzqYmTHl; 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 4Cfns33TtkzB3yN for ; Tue, 24 Nov 2020 00:23:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B624882614; Mon, 23 Nov 2020 14:19:29 +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="GzqYmTHl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B530B825E6; Mon, 23 Nov 2020 14:18: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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7688A825D0 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dW5B03SpYeZTfkRC0ADgF+0UhUAQhf18kiGliz4bhHX75ynMPErnCeGcSg1GtAi179nOkjil4KGWAlO2AaggkJmEFYVsEZj/qdq/zmG1TLlcG2/JdetN7rpyQ9hua9TILTjiDpmeirbB6+j1w8TS6W7DE9FqY+eWRthlvZS2my6Sj6UINWQK6sKFSsXvhznllJRF5q7aOKrWs9/9rlYyDmNkQ8tjTXxg5o/VAW6W1hbPw87eq2PmPSMf+QIo8IhbBrOZdaPW0N6v6Ds04KvZ7AWxh+VrDSonbs2PO2AabR71rhoaJqCKSyoYiJ0z3B/ZewNa0V43G9eEJUE4ZvhFsA== 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=d9Osba2mmSGsCz/ZqYq+xC3nL8D5vsTTDJVUBzuqNZ8=; b=Tr8afLio7Xyls1chvChUY4N3NleHs86poEps5qaywo6GZtN6zuenmqK6j70RScjaARW+poQu9L/FKssi7CdgAfOdE+fD06co7yBWohC/a3fI78G9mE08ayjHVegNfj9L0UGvkFNVSASaTQwJJ8/trI2v51JAnDq6RGDGuw53xL1kxthtSGzHiY7tMnAYLxuiqq4K+3bfMzfZHRtmCxA+HFlxAX/UI/OnpoQ9OyLR9ES3ekAstYste1xX7icGn24346kmxKXEkPmiZp2DeRB2N+WOibAsBkv/ejg5rjOUwvrAyovc2EcLkPfRgO+pG+W14cscx7VemzzPeYWpmgnDZQ== 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=d9Osba2mmSGsCz/ZqYq+xC3nL8D5vsTTDJVUBzuqNZ8=; b=GzqYmTHl0Sr8T469Sokd4BXSm8VbvTeRSFuCMwWBtGlj/MFl7RApnlKaSjCNqPLpn0RfJXgNA3DgnXfOH+L7wBAJTPjurnmkZpVmwDx3zmITEjuqJA6zFYQedaq6wRjeiuI6uyYZE1C7BNhkjSo2GzMT4V3VskMkWBRiAfa8ObU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:54 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:54 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 08/18] common: board_r: Drop initr_post_backlog wrapper Date: Mon, 23 Nov 2020 15:16:41 +0200 Message-Id: <20201123131651.33032-9-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77bb986b-0a35-40e2-e478-08d88fb22fa2 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: LT64jz7Mf017H6RsWB/FYwVY3efYOTkYiftbaUiyt+ytXp5RXz7+t+AiyVnvndextIS6UvZCrLNaZlu1850tJH+LvrrrMXoMcd2drTz6hKIbMuDK0QXlfW2z/l9AqAtiVIVau/IMNrZbWhpoMsTOSNKTPwApMgC+nXnRBxhYc1oLjHGMcNjy2nHF1eszAkV7ejP7cjl3/r1hfO7030W6tLRNt9GWBIeiI+r9uxjumZ4qW9WcQ7sndrNXvRzBJt7deo4hBF76kJ4cZlXNDTOQhbEWFngBK9Rn1Sy9OXOnITtN3YAQB96YK60ehH4kjh/j X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ozfgUry+rQ/MRmb2ikQEWyqbRKstRRMOVJsLMxWB7CT69r6XdW6hKs0zVFejDlxYZwsScMaKUvhn9sG5nuCTdXpyo3NIIyQi4irKpZJoSEsx+gznoIW/hseb3Nrx0kNvay2WCATrmTO18KdRJmC1+elcO9w2nfFoZQqA/8bHSUQteTq+tfThXyum4qaK/d4zzE2EOuLLyTAoynNECaxkctXz1XKFt+8QH5MORc1CJRNrxZN8A3lFeLFgm4kPI+XkfxsRJuTVwr6B95SlMmNGU4w5JyxeW/UYwAOesqfA7DF6LxBlOuTYnMNX4X43SE8Lf3LhAYnyVgjgD7zT8uRm8qXAOVUdGwZn/G3+Uabeqnry3WRKLL+LPf+S6OIZ+jbLaWHMzcj5E7+/EvN6fvvudJB0kixdQMm+ZcbQqpYM3WsbMPw/xoFSh5ohSFP7gcO7rukTYsN4sKkHDgWcr8bTmTagIX6opbdXXJT0WcYYcRILJ+/nvvCTEV0mFfa8Fw/v0CHZPSeF4y2RjkBZZzQ88F4DlFuiQY/+1I0EhJco7ZV1o5DVLAyascCXnfqSrEWYP1X5IYLTcUnBJ5zJI7IuzgcdDY7jIgiwv/IoE5ikCCfJvIujEQQw+4x893fH9FffggrBO4se3rk2BIMqgKJ58uTgjXnK1VEopQiuse4jwnvyDXmVes/s71plj92mTyQ+YBDGQbtaoVOQHhpe/CeG+uhhNW6H1xP5zL9FU9rVF8l2k9AmXVritv3qy7t9PqDLwTthiogLlWLx4dn93ja+zQcPMH7lETkgvR8JbwP7j3O17S5tnfpDQyIEPXqnVU2+T3lyAaQzXBztHlyGaLEsoOiOFTlQBBUROd+3GfPDFMqzsoyb0oUyYrOcqHd7+l974KqJ0dX+cZYZlf2iuADQRA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77bb986b-0a35-40e2-e478-08d88fb22fa2 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:54.1059 (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: kuD+gDYxM/mqXulVFCltOgNRWBFnnAezF/2gQOk9SGUBEFIfIeH7V3HZLtdmGU+M54LTWXEwWw3F+StOKo+QxgaDgVl8CEAouQpLiTpSjUI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404790 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=IPhdopYL; 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 4CfnwS0wrvzB3yQ for ; Tue, 24 Nov 2020 00:25:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65FB2825C8; Mon, 23 Nov 2020 14:20:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="IPhdopYL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5EC6825D0; Mon, 23 Nov 2020 14:18: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,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::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 F0FF0825C8 for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WwR8qewil4fhO7qqBEbwJNnR5LdSeX42CdG0fSHIwdZG+oJl81X7BCtNy8xb8qomggQwuL4K4hcwCJsxcuFQN81WjL/eQyHrF9T0FnxJxwVVf1Ywt53bLOR/l2+wyi2Z5fm3St7H0aP3qglxuyUETPVC0KJ2C3DGg8VGZlPjKy65aS6W3E23dbKhyLYYm+k9nVIwEKWj4x8XCZ0pW7pRo9nRDWwwNoTh31Cs5EZhNzhdpRlFlHhQ7j8PNVOyYcSA60/0cTcYpJSZ06BNU84ILBnpsjjP6C14Zy4gVkPyVBNzueWk956iokH6VeC00/1JKdIy7646lk110cMzEtJgKg== 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=WCvbzSQqWnUtNhdgdCoPspi5h414FO9/2VdYDANfklw=; b=E973GTCEbQbwDjgYSFBNN1ukqHzNAaeXsDOHaGW+kQ84d7vsz7lOcr+cqouVz2WfDWKZ0eI+pitv0udAN5Y2BpAcLmJfqQYLJM4FDciV30PyGdJ2gfuttsp7IMFJbgYCu6X7nqpm+zV0ba8idAHchJtr1xbx9x6Qb2BUfcJVi1s0J0GY2CltCpHDeUiZ/lkL3CTrr/PYcYjbk2K/hIW06pFWDVXylaZWhP8yf7XIkVIdLgufnhFDISK/gEJ5ZDXWhOE25p1znnDW2e06uC7JvgFWlxrEv6aGv0iIS3mmBiJcc5BtY7ilNyskFnvRg/0br7EdTz1F8Mdb+5cvb/c7hw== 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=WCvbzSQqWnUtNhdgdCoPspi5h414FO9/2VdYDANfklw=; b=IPhdopYL2ByxblK9lyoeJ8Z0Ab/BrxEhVH8XC3XmMTo3GF/M0TeZcyUtPJVna059DOpdOdE/YA1FFbWaaSa8KeJVLeCZqmFk/6VOMYbNefIB0fDo+75l5xAI6z7VjX08nIEUT3BROWj7N9UYNy5dKBWO2Bjxfz/8/4fuwHFPUA8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:55 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:55 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 09/18] common: board_r: Drop initr_pci_ep wrapper Date: Mon, 23 Nov 2020 15:16:42 +0200 Message-Id: <20201123131651.33032-10-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bc95b82-e592-4c71-440f-08d88fb23052 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: oNjmKhyIEMdrV8IeWl8lAXQ1nY7wec+Jgk2dac1pPje88LJ4kx7P/lVzsb71+erV+s4Qy+eWcoTMGtdlhb+Gj6n6Y5Vg0f+hLvbI9X6vVNcabFFcZd1zDkGjvJvuzQJg0JCNpn9kXOge8CJ9jW+1VnyrUUCO2d9nKoKSEN/h/h/jZttU/lsPV1NBs+nTIj0fxbM9EJVQ2UatDN5zqLJMMsKKDqobPl4+VKL3kv/yaXBecZmxLxqoMqywfhFFX6RxZijHMG/DMy8zxhN/PxmON70nVzOZo3xFTc+27PHn3q1oKuF8QDZu4zvGfUYuz66+7weaX9s2/nhtThZzJxX7NQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uASNWFNkoChJ7dyvcWl2nuvyZ4YwK1iX/xaYI80H940n94aN7VAaKJk5D84iDcBvBrGbS6KVOHCVgMAReUGXBgVq6ELH5pPqxCnALVmsFind+ZU86Rj0R8DCdB68uxQnfjj3FWJzKl9alySCVtsF4erNGl/FY61vLIWg1dQmx3DTBSNCWbi/yd1Dn+DFLf7qeN9TuuS5CfzAlFp3Mwftd20jfikXl5X7zAXLKkzla4YEEHK+NONEJQLSWLo+xbl0ajT80QZ6v1z2hJuvkBpeQV/DmmTSHl+puQbeMkBRItzpzpSjQe301HcRzPpKgO4UNeWprEwfCY5WohZF7YEyGdwzrTVaro3GquWpZ063kSVILO23F3aAhYagwSBKHd581rKsBy5JnxJdKUKXRTW9KLkSsL7LNvVzyngkHstq/Go+5N7nRfUmwBXlWvBg1C45orzKK66uJxS3yNzgsKQq5LXeeCa1bLW10ipkf8GpVJczfxrKEvmxQuOyWVrC3E7dNIELMGMol+88hjsxusbOYXXOFsuchKO/EQOdpUZQV+oU5DqakDYKMQN3hgOMS1Lv+V1xRQ9jYZMWU4+34eRxmV6NG3apMRQidJHUg1E41RA5UqkktbMaTA6eFD9elTOO/r6raw+KDnFz9YNpryGE3VEU2cNbcaHvB0iDFRqaPOyx3qdTCcK+fm7M0s6p4ojhZ5d7bXubPUKzPNDCe+9xI4hZCx8y1ZbmbNle8iYiXTQ2cZmg23oBRtNxMM+54yyea0KQcans5tCgAOKEAE4Mso5fPEvXZoDQkDLuF9QWyjngN53T24mKtWRNl/YZ3RjnzRcDNIlawDJ7sXj+3961/APfnsumMhlLsS/lw/ZqNHQeEddLji3nNSWn1WBy6kJnecBbGEvxzWRE9JB48PKg9w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc95b82-e592-4c71-440f-08d88fb23052 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:55.3132 (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: C8nXFqFPkdBsf5UHiBby1V6/ItGcPjXjCl1vqGelL8Jctjo2iO3ddTYcCBZTF9J1MqTyVXgL0rTZyMrZmGTnKoCCs544hLsO+siejvBqUHo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404791 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=Lp7E+MA8; 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 4Cfnws1rTlzB3yp for ; Tue, 24 Nov 2020 00:26:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9AEBD82642; Mon, 23 Nov 2020 14:20: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=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="Lp7E+MA8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1BC23825D6; Mon, 23 Nov 2020 14:18:49 +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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 290CF825D6 for ; Mon, 23 Nov 2020 14:18:14 +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=FUOKID2sIBqKCD+vbDNQx8gRPP/2jy3VijUzK0HBJ4uTKWlykfb1dvyOXdOTIPhlcnlFLC4DsP/n44J5iG3+9IUe/bmWCRi0txkxjV/mrnl6vFI+1Kgv+tQ6G79zz51r8ytanMa8d2M3iQ7WsssglAWzIRxGgdLpqUv0P1c35k8s1aTjnfdMoj0qoJTghbcbpCzE7PHh3NpAehcBrPTDgu439DvygsnTuoqiXiOQXjQQrtX5M4sCVVbSI3qLZvFpqi3wDOqk/MYbWEprbJt9t23u4Tw2Sv7Hyh4SS5t+y3D+f10JXqUmNcDk1QN/QQT8lO7HLhQBpGzhwl58B+lxCQ== 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=qIO2pz8SSFB/DqOGIEluWFpeZwUChfykH1VCWRmQdK4=; b=Z9i3ghHPK+dOyl8PC87NfEcSEY/LvUOggekwWmbAD2VmZzLzmDOKpm62IbCcxwSyKzoEENFHPmeketzYlBWVh2b8zVzIIxYEUy5TTWfycLreSzC2wHpxQNsafnXigp6sRGKJapx90rpea/Xy35+GEry2pQRS4K5tnd24OyWiWiYo6fD9crHeh2938eVzYo0QcnhiGqiC7/p4ywk0bbEYDF7Vapo/6vaD87XIuoTZsUTVmtsyd3JJPudCpjcIls9iZzEPqfjYek/mVyPIbSmTmwvF7g+6WZtHtT2wnk866som6dEGF/9mj0ur1330ZdJs2gji60JKnp1ZWoReH0ffag== 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=qIO2pz8SSFB/DqOGIEluWFpeZwUChfykH1VCWRmQdK4=; b=Lp7E+MA8Usx4/zQpdzDrrg/5IhTDootwzuefuTjhxFUk9c0fOj5EsM0e0JoAdEEovfGXxnNII+8ld7ommv30tUhmhTd22R3lyCswFnhXHk7smOhVmFfdxENBL0dbgoH0R+g/MbErIAKOG91scBtRdfm6Kdg2sqlrgqWGmJpvZek= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:56 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:56 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 10/18] common: board_r: Drop initr_pci wrapper Date: Mon, 23 Nov 2020 15:16:43 +0200 Message-Id: <20201123131651.33032-11-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 83c7f84a-c877-4801-f6dc-08d88fb230f6 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: To5UWU4JLzP2T1N3SPq7g0/ECAjkMNWi54th2gLFInK71FboWnb+O6HvzxH4TBoQC9+TRbBDw2Y3opOi3EebEZ1IOzhEzuorPcVEyVgZlleio9GiGQrr0BvyNzUjntMJQIVOIe2fYwmb+HMPDzAV3gt+yfUl43NkRMOnSCCSGUV3X65mp23yVJNr3NetGFu2Z+9nY6D8zJdVPR4HgukMt05DAJGEoZeeVAmCT0AYJJUSn52QaQU4Z55P4RptGnlw6qNRrYYIVvSL9GXDY0JIFtkdinApbwqQ1+0JHhv02AvMEnaQUiP0xhIYQjvIxK2cBMG/cKIeNC2JBJ5yycRgkg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fpTCRAttasB7e4hRinlba7a0rOOKqMWnNXwUc5CDtkYJlK0BIUNXO3J73DVVhNLjtOe+tI/QZCr5DVajnM1ISUyrSOsZtb9PfAwaLwbcGSgMw++EDLTcLF9C7cga2azSmja5rR3RjXEX5kO8CZ4EtQ/tyVLmglfWTdl+AzfTq+3BQcSE0w4LtP1E/BlgIOK4M0U9yeKungDgxdsWzcsxoszICf6Ko+NS5tu+QOrZG7wE3VilrA/3++/2vyR1ob61o1urBiPj0kLrlbg/TdmHVhM3L9EyzQxqfgvnOHWY2jHOohiafVAZt2J6Sz7n/3Ie2T02PXjiOJhIlfWwK3d/qRJgndZKWy4ZlEZ2UF6u99Ujz22PqbmLp+kgdaNz8Vz2fVroX2ZLqnn9gItcWGKq4FRcP4jwed5pjOJikqOU+MR7DKXMt2xr2n8syaCCq+JhUeOpxrDfKhMZCXDuoye23E6eCCaKBA+kiDQbettfj5iSsSMDLRL68olHDxCBqkqmf5/JhlcwbhBtxFJaUE5izVdvsWYEBAwR8VmiSdkIdyvpm25nTDgkubu3BHrxtFz5mRLxnLKzuKoBwnZaR9tkOanea9XuKDoCh+BWYeghBPYwHMnfOSKYG0L/cNMueNLpwt9ivWJyvEO6wR4OMEI+AvxekARC0Bo366/AH3bPaYleLY3UvBdM1kty1JHkyc7ZJ66WwSRqf0F2Qxzuejyhkzp+I0gdTZe9pUVVtBioKj7zaR87R5dffC0yyJDNWpVoLB9DSdOgMVEGYt/DPDn9kP8q48NXYI+4NjJVi6DKyftOSjBsIP0xwiYGSXZIZU55a+Epzyix1eUUI7R4Ffmchisdmo03aMrJAYe+10T2ibe5PI9Js7tut2196PiSutDBeQ6Kfy3P79tnpPyRa57d1Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83c7f84a-c877-4801-f6dc-08d88fb230f6 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:56.3206 (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: qM0VP1fmKXe8fyVlwtzCiVllEXBYMKO/jOe7o5C4Hiy9HCXYsWY4XmlD+Tj7CtVU+ubrmozIYuNMdxv5lsKojKmmaALcOxKGH/iO7O9y4ew= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404789 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=Eo+dqgAL; 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 4Cfnvs5Qd1z9sX2 for ; Tue, 24 Nov 2020 00:25:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 146F482638; Mon, 23 Nov 2020 14:20: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="Eo+dqgAL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E7B7825DC; Mon, 23 Nov 2020 14:18:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20603.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::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 88CAD825E1 for ; Mon, 23 Nov 2020 14:18:14 +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=c0/voSZYNl6iVjqPcGKtQVJcCcwJL/vZ5G2p7Xu1Z1GZ+881NVBibu8nOvTk5kv9I8WyG9MYF8RLElVknckcKDf9fBiq+BfmUU6DOLT5pMR/GKqD+v+0XE60wFHZRKZNe38oS168Djf/N795AMYj4eNWUZ6Wq4lb2KE1M6y5N8oPBqUBcXbqau6BgFfOghZMEylW1xPfbowb3BuJgKZL4Bftc+2sNJ5cgwSvQ3k8L5YmT6zHNDpzlMe7GlRPsHyijf7+IfzVFHJ5JGJwUxNY2jh3oRMufeQISr8vhjgFuZTLfrBQAiuumWIHpblHnKEMT4qvSVnRQBDgBCy62Z8w3w== 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=j3uz3TiiOVyPC2OL67b4HdLScJONXXWUzRMPPdDu7/Q=; b=aYqsvduK58Wdv4SFu+dzEIroJ4Z2Hip82BRxPXfHUaaesa4Cfn+M0l7hPZ8dsYsdgHM6T7jwwPEeXtEG7+lZVnG4drrqZij9yrK8nWu+kp1azZftNcjB/2hd93Atzgb5BtPS7WKmKLyEp6QV7aOruLow7xAta3mah+I7Nk8sGgnP6P3t6sEdtIZDOS2Q2tB5E6TLlXaFPdjO+xChZlOgFqiKRAdVFN+4cKv2woDufrE89n6tUdGfO6bbLiGSNxveebT4F1t65ZYvAUmnEah1KDTE02jIyEJcB2H0Qc4f5OVL5/63loR+6IwXpHSoKcJKjnNNHeizUOtz51BSjSSpIQ== 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=j3uz3TiiOVyPC2OL67b4HdLScJONXXWUzRMPPdDu7/Q=; b=Eo+dqgALksIb1RgYpbVIm1eqVZXWc4A8ASaoYu1YgMuPlLlsP+hFPLlifm5xiP5fuK50LYwTp/ZxEM15UVGw5kgwr9cXGbaYij5br0oIcIct7Sn4KaDec0/wA6pximWYCMPeFYbn3QbsNJrF3fANIoUN0r/c6y6TzuN6I6fdYNc= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:57 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:57 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 11/18] common: board_r: Drop initr_noncached wrapper Date: Mon, 23 Nov 2020 15:16:44 +0200 Message-Id: <20201123131651.33032-12-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0ce3f62-7052-408e-87c1-08d88fb23190 X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: rFU8ZbBVGZQjjnujCvcR8BnFh8oqLvwOQQExf5cvS/SjIUz205bqJSwJQNbrtcsXaHhRfcsErqnmYoQQu0W0spjkgREpehpvMhjXYELDOUH4yqX3xdrwGgChA28yCZlpHsNhAwFPQEGB2rsems5RWrqTRC2qnaoVFJuJxtg6A8XTPVMD77WW2qDuUrly0zBrfFM69X+K+J0JGhGst4EhA94n/njjvQQnsooNO8JZ4zzkOEt4T6w4R23U0bJoYqDHW64HcPuoZ0aVoxOGg3NmXdkuEjUCqAyKbExXD8o0lCfjDaqls9gyE+JE+jFehBoPk3gS+L2rFieCKU0WDrjjPg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 0Af1B6YJhQyxZ8jClrcKuuHGJpFkXbbzKhpVpySQavcJkh4f6MoP2Qu6gALLe4YJxVZx4k6OLoWY3vdix5qDZ0nTEM250J0HBpQzK+1Amy7ylDZFTBY1KneRCQA0RJNbIF3jhvrK/NKpCbUikiqdG3SlCVzv/9jFGMZRtM2F076DsAmNpnIlX6itmguwV76mqX1rVkwSOIDKTgNC+ObNDYlixgfcat9h89K24B/rv3wkaGxIAFfnHCI4+YPDjDTA5TwITgFwOYS5906C/ITSB8JINmRCrm4cv3w/m4leL6W8ZUmcmh9Vg74NdhonCXLVAE9ui4he/1I4pr3OuAiHXSxkR3co7ki0/NMmSqFK28Opg/V6MLPEmeirV6tFkVBBZKdddcuDuhPuQWBzc4cUoNHxoJnO5EW07ViwS23vbRgVxU/WSzcOZxPVW1PV7Pbr9kvsRksXjnfWNbqq0grmktl7PrJaHPXHxUlA5AyVGVPSsRgbKrNiPemDjklYhI+dpENYVb3o6f4QGNoZkfxX4J+yYTubPTBI1rCfguKdupo+f2O7cb+tGZlhMz0Rtvw2GPcKFbtxWB7ziveuXlxxf58hGOTUhiOmfV6lCdzQ23hV0ChKGfV9xQndgrr2B7i3BPhGzRtrrlBdmFNpaFNqpXbGXjayK0YP7gJZLu8he4XGvnHKyBpCUj3whiYvE47NED+g/XkuYfYBG//isa8RcrwprCWL+A9CCai1o2JSjNAuoCE8lq7VskAKlHYHvodxZs6+eakOdeO2CUv1moeHDYaTG6Kz6FAjsfv7SDYq+Mdvq94aliqqSg04DeheuD+vu/mK6NOWGQaSgy7xtrQUNZrIskPt6aC1YJQXIkaAKX3D0WHAePp5Vou8FvOzSRFBe0C9KD/dkOpgT+Nxg1wriA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0ce3f62-7052-408e-87c1-08d88fb23190 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:57.3370 (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: D7f2tYau++3MfrfipvPJSDSQb5NRUS+c9XkM2NkLV+fyc8HbuY5dvngqv4vih7WkNX6VbXYlIuvwq3gBaT39Gq+ZoIo7u+M8zkxhPUZJ+/c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404774 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=XV4YSlkn; 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 4Cfnmz4Vnrz9sWy for ; Tue, 24 Nov 2020 00:19:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C9BE825C1; Mon, 23 Nov 2020 14:18:29 +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="XV4YSlkn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9F428825D4; Mon, 23 Nov 2020 14:18:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 8F6A3821F7 for ; Mon, 23 Nov 2020 14:18:02 +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=RfFNKEx8twITwGoE7103WK+7ZM1TBkix8rBo6eu76Nnm48WcdIBomiiTwZMzWfdRpU5SERZ0zKkKkJbHa6gpyvqkZID1EdAdoDOTsb5eZYMdmmAMtKX1WBfPQ7ij7DjA4snLx+7QNy0vk9MlcTMIKr8aOdHZowU8CoFB+6jG7cqKF3Vi7xy45hok92ecWeh+lceje4l7ETfaUhXwLzhW7tTuEGbZt5XOU6BU6eiJidjajWe9L/6GBOF6+akZ075hcxuU4AZC9g6GP6iCNBClMtHZozaZr8o59jJkF0NEt2y8f8c6T9QeJdnbIemIfR4n+DY8uGf8LJuNO8YphOYLjw== 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=aRHDzvXXJAkrVwWqcNHiwcOoRPFYcdeZjeyt6fnvz/k=; b=GOW7taFeF6D8NGxULZzWJefuWY/XXlcenwtf8V9l3iU3GQgsVhfcb+vOiHSwtHnQrmnah6dVntp9oRhQ7I3wBeQd753jYAqe9RrpE/0YypmHLxV41V3GvNBmpgQqAkjPLFfovuv0HJ9+KBGbf/dJ5uJu0znAlYUjYMAE1PWi0uwKNVarBLul9PmVHWEUbaEvNamNOO11VvrTt/3NJ7Ix3/5hM9n4938rNjU02OElKsC5S6s+WQZkT5rPZPKqvik1kn9AkC7IAeerRyu+AKqznlmVGf2QSler1qRTLUKkr5Tr+XM5DFqLIwAdhIaDq1rkR6YmTI2m5o6I3QLZlInQKQ== 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=aRHDzvXXJAkrVwWqcNHiwcOoRPFYcdeZjeyt6fnvz/k=; b=XV4YSlknXLaStuEKNU/WWRuuldSokUTk8NDpZVeqf8W/RExEmCLLC3WqoD9Kix00zQ2mkAE4EBnC3QvVQ3iYADsk5+RvFenVDZ9ijns9QD9OIATZPICxKaJnRo5SoRfRNJcN1m0ru1MQwo87CZ06pJcAPeB8Rr6Sh/PigvAU47g= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17: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; Mon, 23 Nov 2020 13:17:58 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 12/18] common: board_r: Drop initr_xen wrapper Date: Mon, 23 Nov 2020 15:16:45 +0200 Message-Id: <20201123131651.33032-13-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf64be17-6da9-4c40-84d0-08d88fb2322e X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: bRsz5TkJX0pMD8ZKlBtkpdlOkh1rWtL39/WwUAGmrQmkrMilYArjsvXObi/KM8+QDWSWbRbMyYAx43OIISz9Sq4u7lgHJPzuclz7qrJowfJDT+XU8PI0QQOOZeRU+74rQTgNznhgpmmH78zyvgEi4fbEvoUYOKrn1rqqHpiACJc4XyOYF7oe8nSf7hEe407zRtNYvyTnVMbJbz22+yIS2KNG5Orj1jxEsEAFKunBBoivt7gBBjQ1HEUhZoA5d2cVL+ze9gRzoxvW7tIHOBe7V8/TjtIOrONpGLHfwFvxqHWcQ61awCZrITeXkudqcVFJl5gFalm8xcwt4pb1R7sd3w== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1wwFUpue+gG330SOj8BM5xrDivo1kn0zqKySWwYFcNld/ur4zyF5VTIFNlNU7xEKxf7ckTgf+0QWGou7Rsl6xLn1R+HBTNMnbyPi5zOhWy3IJlxBjZIJsdksxM+bimoNLBalNDZTWa5p2UxKzr7GzpHNS2aH/2tHVqiasn2/VCUS/VD/y1Uyu+DXvDaJBdY9nHl2DI7oWaFkmt3foYqvOPTl2K6GbHzR4W2X2r/JBjB4dSH73U122lgpVhQE8nGzPIjC0hBEw7w9PlKNXMczzZaTDNKFGQCgYtgKeuxCpHosIDDUNOiLl2KtmNncxaTBvohEsig9glowBBCL62g5NSHhnIz5moRGB8hdxwgbkqxO90vBAVv/lEr5JIxsEzlwkcq8tADR83Gwguu8uyhA1sLy5JIhlzejbi9dFzJKYwUimxT4mZoapwaOmxPVGES0Bm2PuqZuvWZ38JjIfCeNbE47aBHN1BSeveFaH36PWgWh1Qm+xpnKhx5xtnjnlmTISjuV9e70dcYRokJbeZJ6f/HdX6rjW0uW5fDjDdCBCUr5zpurRuJImdxYbTpq9hrrX53F++D0PZ5HqM5dQcEohIv9I39T7dz/0LLzL+nkFNWpI4fY+ETHcyRMKT6BJmfi0Sh++8TgpvX4/s/oPsoh4La0tZ18VdGJKY+Xq+GUAK6PyDijzQMhrIB/f1wdD0ggx2MaU0fznn7+M5PiXxHIHdrzFvSL1bDEJ6QDU6cxkp4fcapdLJ7lYoetR2DbrwMD1VjnEzN6FVl1obHWDm2eQdJsIN/D9HUW5OpZxP0AXSUDu3X/j2XvtyeFl5Vc+Ivvsh6WQHUrmdNxdVpZ2JOEF682P1cRX1L4L7AmpeVtIfY/3bXgn8VmwtrY2wnbekCdWffRBZUF/B6rroCmxo59xQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf64be17-6da9-4c40-84d0-08d88fb2322e X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:58.3614 (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: cVFu53JAr5QFcw7zd7Pr2XcgkArTGEBy4btsyAOAoXD7lGysNLtF41dEbBGiJZYyIAhFGmhlwtOhUVsQJai+YGncNwlm1xO/Zyx4rUY8rSI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - none 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 Mon Nov 23 13:16: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: 1404773 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=QFiB8rlN; 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 4Cfnms4ccJz9sWy for ; Tue, 24 Nov 2020 00:19:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C82EC825DF; Mon, 23 Nov 2020 14:18:20 +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="QFiB8rlN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A358B825C6; Mon, 23 Nov 2020 14:18:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 EE5EE8242B for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kMJbgup4/5UWzyVMaA8q/vjntlfhU0tQaDbNe5NXFsiH7zl8oNZrSnRKzre6+3g2zrZFtOH0FWGlASCvh4e+1rm3vS8ysGt80CJAcy39d57ttaZhphegwz1P+GDtlEiHTPmelWy3oCN9MCoseCsBST6bVZ3TiwavspkP0ANeHIccDhr+KQ4Wbommjg2pK6WoV6yZE6RhMjlTeM9QKnWtyhD2hAHdSjzazFR8Z60FVn24yEKTIvYS33C8KdmTr9TktBdsTsfas0hK8EKPB4ZPgHOzwmztqmNF5ZZVsfDJZa606VZjapF5nBOUZHLbjeh+pBDwh4S2vUSXUJrOXcg/1Q== 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=FAuvRKRDmvpoGLnWfVZNyWKUGONJl/BhrSUk7BhaMdk=; b=b/EcesneYwbnYDfOIJk6h0+SLlLDrDB0PxY+LSzeR7pxkZDi2EUBV60TqFTzY5EmzjM4H/Ku12rHmIpg0bfOSIntLgpIz1MSKF+pHf6q4RzRwE0oulAPUD41J3gjSO6cSpPccf0aNcd0KFC0ewE/4ualSk+hw9BEU1F4+HbTCsDqHLHoChbEgg6cLkexzauEE87RWgK9F0P7DQ67jHS2DOXukGFbGYMY+ICmBIL8yk93Hl+dCRwShYNHDQ0yYrwR1uDFX0wKP2TiTmlx78ssB9vZ7OonSZeONCQWg0BXgR4Qz4uWRV0m9N3MOycYpQ8Uvr+45p4EmrulK1l7KBLATw== 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=FAuvRKRDmvpoGLnWfVZNyWKUGONJl/BhrSUk7BhaMdk=; b=QFiB8rlN/XGMy5HkH7TykuZNoOqSzHp1ft4efMzqCObd8bLbgQ7ujazavckJs1SGOYdOnXRdVtOwR5VYZNnjzVOvg6/l03ZOUwm9LkX4AfBOpRxixOrSjgfHrAcRvCCmguSR4GBFjreTOcRE2nKV5xpLda/tXxlM2feqKeJstVo= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:59 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:59 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 13/18] common: board_r: Drop initr_jumptable wrapper Date: Mon, 23 Nov 2020 15:16:46 +0200 Message-Id: <20201123131651.33032-14-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 358baee0-3adc-4ba5-8653-08d88fb232ca X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: nOOO/xzBkVE021AJzlCLhReLnzFoW6ICf/Uc3PagzSI9BPhLQJZDwda1IHgsVj3OMTVsTjerehP+DLSSKlDr3xXzLVmFs/tmTHWetrgk8K+D2kA40lpqTCMvYD4TT+kgDJHMzmbwVA1aGh+KVdWiJg+ofQ5hXVDMtZ0/2ThFdhgZUqCEl1qKymL3TIvOKyIfs4MKvIpxlGUi0U347viXrKA1OBFaoHJIUNaLuiDGeD2iO3vWVPt39ba2xrUgpEtfaOgf0Jc+eFeTELRF7qh2WkiYPmWrnxMmLLfm7k3r3Plo9E2iHGrasKNMBEa9uQfxpJGp9DErPkTLyu4bLSuK9g== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: NQaKdhDEBeL/NT1lb8aK7l6CiFyV8XUsOisflWkfvsOBBsFMw3RVB7sRlRqKYZsCPnfCdqNTXyCF2/SzbU+vYPU5DwhvHd3EgSVIgE6+/sFQrFNLEqebwd8n2kyKZlbi/+f4ohhBEQkX+5IPpKU3RvSsIQc9EEI0jbD33jpYE1Yg6Ksp8hLnes8xG8NTrYt6EbiA6IKdPPY4X+4nA6jaJu+T61S/nx3I/9q17IHQVhXibVU2jmkC4xZWFHPomuu5M5poE8rRCwHxZAkafii/EHXWF3NxXQQgEQL7h5Bm3UplU9cqnTpf4HujyFsGmZ16nW7H1S2hG2BZ/baVbgd4/KHfviRFCQJSXhbYFAdOXwt0kMvsMWWxhIMPq+x6JYhd/YGR7eekrta9QDnEp1GZ0LhARX+lyIB8wUYfItfM5a6OX0BnKW4Wrm4RxZMuDXqWFHFFUFjFhigCKfnZLuhlu53KQjrxSYl2OQgeUZnzgD2SZjhoBoXUFvjy/fs1Ga5YSdqF6qLA3+0e1STnE2MByYUyeWh8kaMSfLqHJhrjpq3pAa+7sYyndOCQQvwgZ5XVj9LLKtl6lTYSTHHDxHbG2dvhFq0eWqac7qWjz5sLHtJ7z9xQTplGIRPEC0omdhdIyr2duPqi2Tti1GFBU+N3AMRWMgZIbf9V/x3UyAvnz1MRe7YrzYRP1rHPo937fT/RKjYQ4rysi554p823xno7r7GUxknF2k6FZ12ZpXD61Kst/4+mgsHKqOIBJccYQN5D1kcwtD1u35Hyi+IWtj3unSKpqrWj2YnpoW9SPvf+8uaQTkE8HGO0V7BX8UOH+RUV3S3YPyMBiKsuvmQ5O9koCMSZhUk9Tzu9H3UPpvY4CfsA11WrRr771B893lHXB9D0dGbNw18XcQhC3AePqQg8MA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 358baee0-3adc-4ba5-8653-08d88fb232ca X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:59.3558 (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: 9ckNxr75wzTyshz25T2HVzh5c+ebwHIK09lhG5klyIFc4mewO8Ic972UHAIT0SIvNSRsDSrJKzIFTh/gPfAfGxyEd1wRus8SP5qoKTzUXZI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404788 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=cLfOzJ31; 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 4CfnvD6d2hzB3yl for ; Tue, 24 Nov 2020 00:24:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B887082602; Mon, 23 Nov 2020 14:20: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="cLfOzJ31"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8B44825D9; Mon, 23 Nov 2020 14:18:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::60f]) (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 77E7B825D8 for ; Mon, 23 Nov 2020 14:18:14 +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=Gw+H2izEny66v3UpJW2ut7f7YIfnj/IU32MejgaB13y79D8mkWzD6qYHMzy/zrtjQjDLxvvSethlg5POUp6wpAQqXEGUJnMZQiblx6iLC2Xuno5jpbwO6ADYJ+FpUMfgulHiNcqYjDEWMwrf642yAazgycuXJreqQ1tIcwdBVQmjWS2fN2Ip9zH7U7mvYLQ1PseJINMVvrGy/8L/BaNCAnRRateL9yRrbQ1i56fSoDfebRBhMPoIwDNKvtnm8xWyhgGsnRduw0Jf54LCEyFgkr+5sGyN9ZlzgTyDlqZIJ0hLH7DzM6Hfg4lHAS+kEDNmmbv/fRQx7PjCaUb6MKAgQg== 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=RbBrIl6QNYEl7h1lraCBsNEXC9afZp9yGLd3XFB6WHg=; b=PgMMjQ/M9NNKVHdupawVLuhoYigKSrlIiPB6RIBRocex28g7ho9gYIvvq6LaFcgfU1JS40ARl51fI5GIkLCBCrRSIilbGKeyI9pUflPiPzaUMYQZGl05tjjZB92Vs1B3azX+68Gu6DrGhyDDOz6m1u1QRryTydvZhwNNpE/RzMdciSwdaeOscjL5TYxAevduXaQFylNRa5MG43btMIJNop7pV+YvrrbFnpmJj2enxllApJPFsLn1CeQS4de2SfLIMgkjRJLa10EBv0BjSQ5oDxx5eZC7CoAWjH59oe1ZCz0cu9yqsmd86iwJ9iJ1Clmbj9357dyexKstgBFD4nqyug== 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=RbBrIl6QNYEl7h1lraCBsNEXC9afZp9yGLd3XFB6WHg=; b=cLfOzJ316SGP0ykEgpmCo0TNsridZtt/5lkL+jtLC+jdtDHZyTlMNmuZWBYHI+l5+2m+4Df5E9JdA9dge5O95Ccx+KCBtE3Iw28cvIVetXUHPaZS/+hVt7XzJq6Sc09LcAP15CzqIeA1mSSimqVXiZZhbW6GsKLcjhiFt//OaWQ= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:18: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; Mon, 23 Nov 2020 13:18:00 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 14/18] common: board_r: Drop initr_api wrapper Date: Mon, 23 Nov 2020 15:16:47 +0200 Message-Id: <20201123131651.33032-15-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8b5274c-2e59-4c9e-bc5d-08d88fb23360 X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: c8BpIy25U0a6Ia7VbdpRjPofUNPd0CbbMxqp7G0hSS/sQ/dpjfypzOe3efMXU33iC0BpY4WxnKRLDNcPjU8ESAQCfhAk1FS9EarYO+fUZDxPwUCAQH7oX6kzBZXf20315OhiY8tL/1asryquO3ROUgRO6V50aguv8y1mPgwX7ZOKSqao3qsR9mi2hl6uiDc+Gz/qRXprwFN1rG9XedlrX0FcUJFp3f3Lr8WVBBGHGk+1zaHpRXgpKCF4l0OgptSqe6SDU0fTUrzC32f7zJeN0ubkZIXZKecZqRfP0RZYsPPGyllafvnIstDSMaZVThw4trNHZa+L1YT++mNpCdfqHA== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ieJ8t62i5uQ2hycvZWTNbhoIt1oIceM9roGi+Q4iprn7AWMn0qbPaIxoOxFunnm7Ma1GHWAjiswS7ISHeWiO8zFSjlfsr/P7df+5JNazv5VB1sSQb57J6Hd6Pf2tw/TNOGJfF1NJoVBonHprweP6V4aFruCxWmkldjlKMthM8ogwyGodBu6uX/qQTcrm90vY6SvDt0chteEevgjYDEzjLRangWALbwccZ7U6L8MUBP9lyWdSFxVJM8d3mUAwS5Gx4TxziS97ImTYRTs1+VhNVo0PTp5Buv1so9HmMfoxx/Gbb611ggoVTBe6LMIAK+jD63z87YlCgcxXoCFXR1mPO2RvfWlsSXKjL6GPhIXomzqb1bNAK0ng5AeBEGDuURjglzmmJkKyXd+IzulzicNy733FBjpturvZA6c42rPt7783k0cT2YdB5udzsdNNWxccq0Q30DIfRmAhNhyAS2U+LMN5VIDcPQxGjE5l+q8g8pUO36moL/74YnvCfia9jNd6M/3PbEI1l0VOKeLQ+H6wqEKKkCLZd7ig/VoZjCI/PMPd3Kwr9/vCrNTCIj1+ffV6sIF1+5GEarW/D/MO7ltYFFKLhNfZyFWBlKqQDixtC78EP4gX8ZIfiL+LeNdDgEqRLddBcH7L3BqvFRnQCzeOjvJpo4gGmcZ2vmKptdQnqFWmKKgJ0QpsgHBtVnahOswv7ZROtwoCR6Sjxuyo7qR3aLUzEUCS9zvoqUiqv1/UjcJiulWRgvOiftcIlH6KP0R+qX8c0VTyIly0SoHt967zgOqQovf5J8emOMJILlUUkLjXPJcPN67xTY2+ECdi7GjlXsJaxe04FhA64yRTpuZabjEEAttW6r8a0d7DJC9ijBHVAhqUM8vM6AuuD2MjsdL63mSqhuCgETnbV6QvqsH4/w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8b5274c-2e59-4c9e-bc5d-08d88fb23360 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:18:00.3322 (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: 7Bug6gdaJpVga1ItJsbkdZSAl05s6GIgBxktkEx8KqW/mchy7IPZ1KpteuQf+Vuf3r29efxiiYZ85OUiTN5Gz1ZJNI+MEWK6MoxGhTuPHT4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404780 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=EdpmfMSa; 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 4CfnqT0XGZzB3tb for ; Tue, 24 Nov 2020 00:21:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78D4C825F0; Mon, 23 Nov 2020 14:19:15 +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="EdpmfMSa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B8906825A6; Mon, 23 Nov 2020 14:18:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 4103D825A1 for ; Mon, 23 Nov 2020 14:18: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=esdc/RJ9/xHy+VHw1fP60KhINgvobavC2rMvHuXL5YjjfzhNE11iROmvU+lxO/xpjUVFpTrufU3bZ0BbJ2rVD47fzd8KSRfFHeDm0WeTIJLkhHll4lB8MO3ZFZKPdXAo1HAZa4lniBmJ0FliPi0tCamyxHe4jC9JbMbtIGL0vN+ufs9F498MdXEEk8wNzGWqKD4frYcGQ5RrR19inJtj2t2MVD77VFoYrK6DELJG4g11X7h3R9sbpoRDO02wIodNNQCIWd/TxlVy3BfdUYXV1r7NpXm2AE7zJv+zKaHMhkdFrovuapjQidgsun7IhrmZhpRLhSqeT5urhS59Orp7Pg== 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=Ha+I0/nCVDV4+lVcys5jqlHHuoA6mUrVSO1xHSJoBYg=; b=a3nIPa+oKYfS2bklJma9PWR1obA14gEEQctqamQ+CukbijdurFvDuhYC0xXFWRH0NJJlhMJwfGDKW7/DHIi2LqcqzfYuQsanmL92PrmqUy/9J/MOAf410Cu9vAMkiTalPrjX8HViAmNmG/tiNxUtM3LmO0MAs9YdgQo27ckSvqifPrTltvBRYv5eTu1CPjlV07Vkai/rQ4DfpB9c50EdVqJPsyfgy6Yv8Mwu7ADEdEHF8+iPcjK4jCmqsFv8TUTPJKlUl3RD1hoD0gGCuVerzvqDPmFI43GqgZJfoZW6GlFNjHeJZTkwdlwV01L+BVaQUpmSByeBTrQhgHXnD7E1kA== 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=Ha+I0/nCVDV4+lVcys5jqlHHuoA6mUrVSO1xHSJoBYg=; b=EdpmfMSardDTY+P0wrgvID+SwsnuxqlrxFaROVIWSkf0HGWZlPf+SP3C+DZ8xX4uAKm2VrrM69nUYu/6EgopJHsk9RFNL4WbY5PecYkMKfREzaqL47rP01i6ddpI6WR3HjKoH98ixHe/9YDFTo54WWsv4JZXObJVl5yYmAR6hS0= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:18: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; Mon, 23 Nov 2020 13:18:01 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 15/18] common: board_r: Drop initr_bbmii wrapper Date: Mon, 23 Nov 2020 15:16:48 +0200 Message-Id: <20201123131651.33032-16-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:18:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1528569c-0c56-43c6-dca3-08d88fb233f7 X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: FNlxeVmdlXxc61t1qGQgPwdfZ5eUsntzwLXUimmwecqNGbkXKiPXrt9yzuhAph303b9ufMgcu3fnrbaZkRUL5nKWcWFgh2T421Bn6Rq7Lt2WhC1zQCghfDUMxR+dxelgLOKTKEUaOthemiOOrA/VDffL6KeEtavJ1q6+hCCdogQMN39NDIo12YMCZgywI5POXpGCErtMwsXAiNitS4SZ48g9vVjHzh9acnQcITw48EPIer4KudLX75fLh4YBSPeFHKhJhL1tXrXGa0mLncbOa42mwdgzSvJo0HcYteDMgs28wPLqzB0i0PnUM8cXhqI2OaEZQqpfDOgqdxtt8O1XRQ== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: bxLZnydHQLN72mDaYyWIMvdrgIcNeM2jPop8RmXyL9Bs5GFfpjGsOkqFhwfwEW9KmMRLakTayNLXuilZr8//EwsVszDqNOBDdE5CPDIAytB14KNzpyDtJmTwtqOzz0trkrrFLxFDxTD2lxN/s+bYH5xh1VYiO3ciCASHNSo/Or+Cj8Ryr7bF30GDNVSxtlMjORJot2SB/HaeXq4tJ+byiKzFY+7WR5Ij8cxquR3aDRnhTU0UsZikOPuZJc16+W/qXreBp18DH1zRDDprSVirniNHQPDXLNEHZxygu5q9Tl14dzVjBTHLeWfXf3zsJtlK2GcRv5/dLny7G5CemvYUIhOwPMuCFYE2dlg3CvveB3bklozs7ElH0aBIyjUkebquOfAqYGt+3+lznhZmteNRwsEHaSyULY7Ls5ytNOgF6AG7hpUqWOUB5G+jMIVXxPCBF2XW0m3Z1mhpDBy/FUbi6Gu0PHHylhdwdGqeAQYY//dsjYsh7hbYlkqlIpVvua23dL0iwXDqsCe3A98zWTf1iO0NXrI8bO83mQc8C+G3lfNf2M900gpaL8meNDb+A48rYspPjeTx0k2Dy+457w0/jY1BjECsMeUBVjcagrkHNPK6qmrdPR2j3jWWz0K+bsuvToIb0qPAWKxlkuBDmuHkz57wjQc5G8loPPkPCU5c8tQZryJEfgYhxm1012lRZnsQcHwCUNX5eFRQihHZjHJ0NMqhWCw2bwBJ/YhlC5NRqgvpKNEJb16ehXhj5skGlSygZvu4nw+zBmmecE430pK3jCpR7AhAGBLZwffl5BzW49huWjCzOgaggHLU+Y0OHhNP65/4VWn1eeatzATsAu/GV8g+2BtHn+Tj5ZgdW0gHUrJYzodmu8Z3mqvUPtiStqeBeHsegYUaHfXSn540Kd4YgQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1528569c-0c56-43c6-dca3-08d88fb233f7 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:18:01.3626 (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: JuxN6/97ffWii7NGKVGQ5W4ZCEzf83BEhrUC8rct5ASC6X/sWcjI7mO89Fkf0AovzH7q1BiH2owh0hguSgoeebG0/3oz5kdUdbSg53pAzn0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - add reviewed-by tag 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 Mon Nov 23 13:16: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: 1404777 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=U/kCkM13; 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 4CfnpY68JCzB3tF for ; Tue, 24 Nov 2020 00:20:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D711E825E1; Mon, 23 Nov 2020 14:19:04 +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="U/kCkM13"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 54355825C1; Mon, 23 Nov 2020 14:18:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 0D33B825A5 for ; Mon, 23 Nov 2020 14:18:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XhBxYp7aOl4a0zVWryyY8JkrohorHh5CcDFzx6nSuEcGWJBb5KLlQXnJs/7ewctcAxHaspWPIhXMBylTGhzQhgQlQuiMb5ToIb6Pf/ZNjqx7TIt1G3y2kVW4kl+2jNMkUlIAbh0GzzYNwzz5e2Nfwl371gk6NT/qucRjHeCjc0ZFOmPtUVE+YHW+IHnGGvyGF/bIKHcNmJgBK83iw0Td+3k4i1XvyOLmJTbsPCvGsJ5hXU+vNqdvxPoyVz3Cb2VniWUGGn5F9LmKlca2dvE4Rrn2zQlYORuLF9F481VLihcIirvS3mqcLU3zaL1i+ndTBUFUHgwseoNrD64P6CaIyg== 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=wTbnRYVdATTZW2n/NCoAJFTB8ISGXTiJRxeRGCw6y8Y=; b=NDv+aZ2n52eagPDyJ4ecmxkfI4360fQ+nqPsRhSMxGRA3isqYifmCE7PZtciCYpJSgajHXR+lj7YANK0jeYK71ZN9GqotsJ8zq0zyp/3bTjxzlvtQQdfQzEUi6Mxnmu5/2kvDwXUopuCDUswt+kGhpzUuRtxmNDNieOjYutiJM/+iAL3JmqnhDaiFD+umr8lKKkrflYK81aMtotDTv2NyLZzygBgj81Wm2QGxg6A0dkFECJtotVXx1VjM9sfK6eWew+EJ2f3L6phdYHXIfqBofYjS0bEhbSTf0mAfKKmjYTA9AYJ9LF5EGA8fWlf27i3EntZuXSmPPfj61+4yptZ7A== 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=wTbnRYVdATTZW2n/NCoAJFTB8ISGXTiJRxeRGCw6y8Y=; b=U/kCkM13s3sncekSxou9/cKbeDSljv/F2+xdyTyiZ1kVVya083xUvQTxIfjHEPrUr2r3BnMPF5bneOW35W6kf1AcyJOzlb8ZOA4L6PzJT4DDiEwBwMVkcL6Fg01f8rZIGd7NbAdRVp4HhDwLtFcUObi6BhmDAKEzU7N9xzsaTks= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:18: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; Mon, 23 Nov 2020 13:18:02 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 16/18] common: board_r: Drop arch-specific ifdefs around initr_trap Date: Mon, 23 Nov 2020 15:16:49 +0200 Message-Id: <20201123131651.33032-17-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:18:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 221df866-e8fd-468e-1f77-08d88fb23491 X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: W7l2HnX/1c3ojvL/W4Ktq7rTrMFAxXn4QMtF/3toOiUYe7Sbqc/8GY9cQQvoi21ilia+f+EDILX5j7zQfdGekRzFG5pLQ+s5oi3usTB0To8tscaqQyNIkpy6tYXCoc0TAQ5+vMva2uMZVOQQeqMgO36mcARBDOi+L2EC8U3t4HFkv7RdDj59CXs1V7O7o/jXSzTretjmQWP+uYtcX/pkvty26Dm59+4ECOo0o2z2Vcm2PTThjDsSxxwK71Zmb02G6EsJX7+OQ0DhzYPf4DxRJLGthVKCpr/Tex3LnvPr4Z+TYXCcUbpwJz11mAyGFM1KqjU724Ffb7EHL6737zcjPw== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: mbMA89OWcgxcPnDj5RtUhkxheUyLQ2Jhfqin8wIsGhpNXKfQpYW/mgbikr+343doud2rlGsbcUCwOJ7nxjI1GQcFUFLUYUL3K5NwTlM6HtTgno5YxqVLRr3/NPwgCWUBGJx0e8RpZvzOrFJvlOZG4u0bLJcLJsnf2lRfpX+pFDcTbQOmviu0+JnqZQiQp/PfNnl3bWySPCQPqs/GYXP/bkxQNVONZAQIvzbjBm/70CtjBs4b8Uh5fuzOz39sW160/IiwtsvehbYIige6XxbZb+RYTTTVOX3wuh/DUTY/vYXDlwQm7DqWDWUdVaUnARE1a6LMjvyKHwzjsgfc0RMWoU8TkVoB+uBHWNMG85FQhv8reUCtjl2pwj6x9bJdM6NzAQp6OiId3UzyrnqHu2ImOZi6EEBlJRUm1hrrgGWAfrfEbPXhmQG7yULXQfsCYq7a8KnAER61+IdYD0hyP9tyxVH04MC0EMccWI1qDX1hpDixX89346bZohkwFSycoDt4e5ghs/QjH53VCErbwmxIa9jB2E7eBux9MPQnCp1/+i+x9Yc/Xo1BSFGX2xGxsSlL6cOGZ0EkwZFBUcMdHAVygEocIqPPfNJhoY088qbYEmtlLP4vqNRS9AVr/fnhHgKUyqNB+Ha2Q/rImzQJHtU3QJddLl65wGNgoctYeetaybg7gaYsTkNdAbNGlqDXfQ7lXQjRd9FDZsUzsNIg+YCfRF9+0yJBCof1Wg4aIP3uHu9d+bydkaA3jLW3b7OZild9EL57uj02E19IcI6qrkPmsoQDPosusqcGz5KOEQGpMreT0wIr4UkWA13b3YCoPR/cE5hYYxUQLXCGcsGfafjiiSMXHXLoMUFhmcf5kWJEqKWNbZPBF/7ZA9zxbfVFT0XvwS6yPxBNlpVN8Zaro+cpTw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 221df866-e8fd-468e-1f77-08d88fb23491 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:18:02.3330 (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: 8q0arZhPHMh+bqXYd5nNuonalFZVBDesqy/d0CkWeuc4oMOUuv0IZr00t17oHvB2UBbTzoBxJ+sB3QRP3SERmAYYSR3WcVExE9vNSim3a0Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - none 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 Mon Nov 23 13:16:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404784 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=heuMquNn; 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 4CfnsP4PrqzB3vR for ; Tue, 24 Nov 2020 00:23:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 298128261E; Mon, 23 Nov 2020 14:19:45 +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="heuMquNn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 26686825D0; Mon, 23 Nov 2020 14:18:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 D1715825AE for ; Mon, 23 Nov 2020 14:18:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AX/h/UvSpAa7axyqempMgYpZrh13pVHWnRQor4j2DBMCohsACu2HQbP6CtYISwaQcBadu4txV0aIb9pAEqG1N3rJJEwkuuW+uxfn+6riPNt/y3jy6W1w7DGC8p5r8qYY2uv2ww3/el2N5eLSUKWkH9wng0YYAVPiJmlpORDyEGLB18N4JoHPVkhkUlAficcxfbi4fuDdUuBxgIDZxcPSkbRAbgm/0z4qX7WLqyB1WwZj1NEvvzye3toJU9ImQOimMx4gOekn809FZAc3F5OGhBdNi2yqdXK62sALNT7AkGEHfYooAXDwYTF9tV/y33T87BGuKiHMMzzAgXImJVVxiA== 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=ahP3y8A6Rfm31C3IKYjpkfr8/+bDRPPrkZW43y/zLLc=; b=hZad3BM+sStBx99gnG/BHgOjakpT0XtnFQc314RRmKlidswtxE9OGai0b9HIVm9wHakNGo63RxOYa5a+5WUQh7BXFJ9r+/ExLsDhOXwgMpxltCuPRJQN28JdAGEAuxqMmZykSNsX86su3S5uBmcd0ipiXoJY0BuEqA3nGoPzIotdtfbA8bVmCT7YR4DJlQWWnipTHte1REFaB9EgC19AV1TlAqmyCObUvrAbh9WH324mt9VCSiTDbW42kO+PuCFM4+/68+C+vf2vTYNAURp8/kMcQ3JvSgvttQYZtLE6RgytqmLpgs8jp2HUCjxUqemIMxpgkqiHabaDawIQAFCXyg== 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=ahP3y8A6Rfm31C3IKYjpkfr8/+bDRPPrkZW43y/zLLc=; b=heuMquNn5n3Fw40ueBKzuJPj0B7hTJ3AyMbqUWiEahArDmA4RgHzcxuVbSxtGSXnBhIsIRNFCTyVko3siukW3qJS9j/UnB/A2KWm8QJ/NILDuwQ/GAhA+OYYfN1bjgUcCx+pmFXBrwBg2wexTjDGenw/l4yEGDgvv+nqksprBGM= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:18: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; Mon, 23 Nov 2020 13:18:04 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 17/18] spl: Kconfig: Add SPL dependency to CONFIG_HANDOFF Date: Mon, 23 Nov 2020 15:16:50 +0200 Message-Id: <20201123131651.33032-18-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:18:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95b4ba5b-27b0-4400-4cdd-08d88fb2359c X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: VigTkFVdCwD6s2dvPEEEl7uSOcikLDYqq1qbP8/7aPc4MdA76NabkcMa2lyr+09pmtbXh0CorwMiDp/Jr7OWmxWYpv9jDPrH8LY7ETg71Z745oZbD3vENXmrx57dEwW5g5rEGc/ADLb+t1WcOec/YmavZKd6y0f4AmpyJSL6LzLddgbVgFMb48ecsgHzIIPEwqjTAO+ZT1ugu4MEYTfCYD05iizQn50+uKGbHceM+ZRk2ARmixYfQxJtLzRWVdt4L+wwel+fg4d+zmIEbMqkRZ5nE8qBzShdDOQqS9B/Aa0RontVVRl6HYCDiq4zjaHhFDM3WAcS1DAhs3vNnO31eA== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 70OL4scUxuKf6qK537p+WOFcP6uo0maJxmIT80K5qKm9djC8Ay0Xo3GP9HrSM3WAb18MWHzYopNg3OAO6CPKbTkPGPkIyF99s9By8vjX6ijT8n0pXUk4ANam37nRPy1TnZjLnUx8hvmLfsrDgEW/sLmO3XudRAYfSV7eCCWpJy83Ywcqh0JJXWXd7BBJy7hCriOjJKkbx92dH2JIyONcROvfIkOj9PLTgC3hyzsuJweOib92MG0sWL40mlpXuz+lHKxKJfWTiRkf0uhSzWA4seVbbAgWSVO5gU7OEqgKmJJ5Mop+coZGyRr1PIp+/32dAx62HTlHVZqPcY+EjBmh2xo+EAxs/YB/sNL6pER8llLi4won4atWtn4sczx0tflDXLFlZRmMb3OMlXuSpFURB2Z6iBRfWHMukeYn21jAG+Wv6+DXVhZ2gcItu2pW7fK7LVLX2tr5XG3uRXn5K6Uzn1ePd52CIRa3T+gbbLJ1pG73EwcOCcGfh5B+m7zbujD670BYD8tozRlVlJLhPQPgWnEbm5tz4tkK5SNRP7UaYHXYNgQAKkIv0IhAEjO+NmAwOxeYqHc62krCx0exBpEXRJkEeCQYZ0sgkjRU3u2XZQt51tq+Pf7vedU3yfzmt0JcpLGs3q+5+qV9FB5wXE5eh/ugvY+/hAs13j7lRkeIsiCKEJPGwYwBs674v8djCChk6M9rp/Y15p7UEi9a7o0r6YYUORDtLoqTwnRYGMh5/QiQXNuu5/KKkxzhxwjuvvxiDs6MLbJlGlnL6fn1cT1n5/1pPZAnfYNVYIz+BA77gxcvaNeDSIx9CzNutVo7xXyZ/s6AeUgmL3vTcFAbF7zx5pG+bzGjQWiRJMAjf6tIfBj2mTuPj/uvsxp28ElFh+/iCTVbe8U7eGeOQCIyvxLhVQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95b4ba5b-27b0-4400-4cdd-08d88fb2359c X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:18:04.2079 (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: Tj+EZVi5ZO+V2CJaqzyZgVPoiw4HaDsKzkDdzGszH1z+VvL3ncguI5cCAXqNzCJUn9aSU8EtY1JBDwL4Cjcot+Lo5J1pBH2Qm36HdhX1Fwg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - none 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 Mon Nov 23 13:16: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: 1404785 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=d6ABdlDp; 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 4Cfnss63xdzB3vb for ; Tue, 24 Nov 2020 00:23:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5C9282626; Mon, 23 Nov 2020 14:19:47 +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="d6ABdlDp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75A65825DC; Mon, 23 Nov 2020 14:18: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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (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 C95D5825CA for ; Mon, 23 Nov 2020 14:18: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=emHcQ8V/RDLxPPpo2UOA07Gg2owXkA2bLa+nhgS5peK4db9K6lpAizbNaBzNV0o7iA2AYPhlY03YZIMbhHbL0H3QqGVJScIo+eK/AEOzorU5P/kQhs+tY362f7FHEBg/KwW9DvTXmGD9/hcc+CLHOpYdlpPAD9lwSXt577mJ/UlnhcC5k4w//Rtn3zBaIz819BDQqtGlQAeArpOWG2loOwkmL9rP2aotlaN7AVP21yqaXulMw6gSoIO3JEoZ9zSBlCh5viyFELwJ6kX0wAhRsPtzpN+8CQwxNazG16Le8ChFkG6jgFVqnuSBwv45q65ckyEzngKq1yTaRIzbv7uLfQ== 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=0JHWiqiFn0vKl+wfztJd25nIkz06eyzCtW3jqqisZRQ=; b=RnwY97RJyazYoUX+CP1vNi8UOPt24f+vWAypWGxjOhz+JEWAHbJKOJtYbJXxWQQyTVqdB4SpeNpiaqyVy4pJFxznNEZIPIcn3W+mPjQ0Bmh6iYp8PMQvJCoMi0KXzYr0l9E7omV8Qq0Ngwn8HSPGGcPx++V6Gdzp2EGjAr/dJrOVqalBJuATAhyRLiAmR2GV4mFENgqak/GU3Sb38nHkcdSqSU/7gtNhZMglDdZAqiQbS425dEJtG9lMIT9bbPoG56JX6LrkGN05affAgYABjgGZbyYYyUc14p/sAtiFSnDX7ldtztJE5vVSXoIXn31XSsU5/SnyhJX+ch92HrJS/w== 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=0JHWiqiFn0vKl+wfztJd25nIkz06eyzCtW3jqqisZRQ=; b=d6ABdlDp5e+RSaiOOolkGkED7T+osx48TEAkl9nrLMKwN1fJZqoEj3elb4h3/E0sy1U3bkLcAQ//MIOXJJjKuiKTwuuz4jARXqQ9sOjthf2f9cr8qCdBz40l0Hk+nomygxBpHOueCU7M8TkNWSYbJh4uRgaGxAKKYZ+bR5/gjZI= 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 MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:18: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; Mon, 23 Nov 2020 13:18:05 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Mon, 23 Nov 2020 15:16:51 +0200 Message-Id: <20201123131651.33032-19-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:18:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc6419c8-0771-4c31-80ea-08d88fb2364d X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: 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: dcID2MUDb5HWo1IdVgUHkv4wQoDZIjtW3sAB+Mh+XZKz/9msDlX8TqV43gzQGunM9NRzaQeKmM/eidlv+P4Nt/t94Z1ghLNgwsRTgWIc95iozUlEXOcIpz0DUtYsWDg1mfYTtGkRmpt++8l1cvW2PkY/bj58c8/lmp0UeSRzylYeC3qwIoZ9UWh1DAAYRFsJ4ql9d8iNWpas8Bk1qzvuVITw+sN5QtcE31qw68hTBX4UlUv9dsrNhG3pR1AHXChEdT7FB4T41uuALOQ/ZFUzgFVQhy7NQQCVYU2hualLGIVqBD2NAhzhJYFsE6gYQWC5BeLXcdJKb1IBK8IH3J+IWw== 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)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(4744005)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: SpQ3SP5MARXwjmYY1dVOdWkHvzjfUC7MUWQGIPAPQXQOxHjwbv7Wb8wk/kZmreprr+N3tb6/p2OjMfjD0TAgTDNYR/Po23mXjdefXe49fYw1SQKBxm1VV6k17aaw+m4M22WffgxiuIRC3x4PRpvgyYx1LtSvFLsnSCQsZhT5+lHzYtIWUwJ8MRBNAz4vjEckMjdhIZ3MT3O1uvDQgGpLXDK5NppHT9A+J/Sw0H4BFmuGQSK83MN9OCzpdyV7svhzooPQf1j9K1bUy7NCGMUlOYvXYuMOPhoLyjVRPkaNFjZfoZTx6QUc5RV2jVJQwMUd89tsgMkFZM+FjvtKH+qUb82f6c32tQH+kAgi/LvBwFQYUsG6bDeZYz3aaYyCX5bfRznnFBIgnSGXgc/cP5wRddilF/eh9ocyD47kzDkCf9msdb40wFseUqHvYQK+CxQFXRKEV3OG1ylHCfzov5fecDRHSzUl7smNIxhfwGIKhetxfh3Dt63coN3N+fnZ8qsVkqxdARWjgYMOgU1JjJJkVWRvTQEHitzRWb4CKdMLDwo/8kHFL2/NujojbumDsTSwzUsWxRnhxhBrAuVIbZ3OGp0dg2Vt/HQjCFAyFuTkieEu2/dXEnyS9uePbITo/vDjNicdu2scC1Q7TyRJo+a6iFoW9iB0DkwgdAxnxl6NFHEGipOS0nP2w7Vk7pLZ7D8fSkbSwM48F8gCBQykIYRt8wzOHiek8fabp3mXuTnj5uZvvbyRvJWrpgS8qXTVmOhu17BZRlrLm6eMTWxmrp2eVzSFqqBKc4HSgXjjC2o3O1eo8swQI+7CHl9zPirhDr+QPk3BmcdkrhuzPKCXZ7pnl7PRAkabpchC1lzqymZ+X495LUsEMxZToJsXzKt9bnUBlUd3L3Pto8iesZwKDRaPqw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc6419c8-0771-4c31-80ea-08d88fb2364d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:18:05.3653 (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: 1LoeyNj9lCBwhywu7U8uPhArM7xRF/64BsgW6qMy717YsJtfXrrsfsXCshg4EUbv3OORxqdK/G0DkSYAM8HxTWzEucfsCx5FMYrSuO/5XyM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 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 --- v3 updates: - none 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) /**