From patchwork Sat Nov 28 08:43:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407476 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=DX/SAIsw; 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 4CjlRs5tc2z9sRR for ; Sat, 28 Nov 2020 19:44:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31BAC826FE; Sat, 28 Nov 2020 09:44:42 +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="DX/SAIsw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7D17826F1; Sat, 28 Nov 2020 09:44:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 D2AE2826F1 for ; Sat, 28 Nov 2020 09:44: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RMb5Q/QJNjfo13yflo/l/ZZEoy2bpIPv8jmtvY1aDKtZXp+QxmRTVtFso9KdjBTbJfub3xBowI2tMtmFMlZYakIynR+etKTg+ILQ2ELOGPyTPuVYgZlGWufXOVD+fkhlTIz6S1zZqcF2QJ8R5FAmy1Ug7DaUVZbTiNHNUIPBvHQs1UJ/+0Ozgm3yRycqkhIZsfNvaYaLIV4dClAEWj92TPfgLWYulcVZz3X61GJz/HABMRFdorYV04LukLGKvbE9ksYiDuZHzyvHliJc97NYcwTXsmeGoSXe8tnCRZ43kGlBqk0k/oXkIZ/GoqFvpaL9tYRnF30IiYJucZzfalKNCQ== 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=UgzYVnMPoxGBvldbm/Eq0iubzddApddMXqEP9aeENJ4=; b=Y6PlgLRxHp2xKN4C3MkzXHbvYTm/rW3Sd7G8h/mf4zUBV9JiOxiVpkP2sYi3OsHE+dpTJBhibJd/qz0qXgToPgOvjQ3QhaRmg2Q8VkpCk2AYJOFyD8q4HSFrWD0utJv1QZ8Kg1g8G7mZhS2xlf90IN/u9ZmD2hV0WAbeXWLfD7Aj3IdsISywzMYc2kyRjSc7o8DokZJHerCZ2mNDYYL4RKokoRhqwvwNahrtPTD22ZFUlwexxQbfRa8WbSjF8BseVkvS035VD6VEiar0xHHgZdwMPJC1bJlCWJaoJTeU9HRjZ2L+yFLipBBpfYZhSSTqyfBK5FjfEbAUiOx85x+ccA== 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=UgzYVnMPoxGBvldbm/Eq0iubzddApddMXqEP9aeENJ4=; b=DX/SAIswwmqJeupGgBOqqvBJOz3lXWd8rhD5f8V+ME3HTU0Og8In8Twhxj7U4R2l1vDyW/rapeTVgG4ykfR91dG6NrSCyb++KBdCH2QUCCmLouWiW8JdV9d7qkfyy65/0c+y5dYrLXJu/9rGb061n5/1lz+NZKJii8uLVBcXuBY= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:21 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:21 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 01/18] common: Kconfig: Introduce CONFIG_CONSOLE_RECORD_INIT_F Date: Sat, 28 Nov 2020 10:43:03 +0200 Message-Id: <20201128084320.10164-2-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40ab5c76-a94c-47da-fc09-08d89379cd08 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: BLfhPEuzc75D4cAcW3oouA+WoEOKmR6X5rkAy9h6OUSxVu55PZzRw5HrGcq/tomDMB4aLX42cIYhMOE/3sHSPAXYUA7/UZM/nyCrGgzP4dqQrx+H6r6nk2bBzcfWWFupupmSpliQlhVZo4Xntnhp/cFrpc4rine2TjvGoR7fjrodX97E1uTWwXiZSwKNs+mmbrZDXsjYZl0kekkklTNp9vfJYAoHFu78oyrpSjoG4Qp3Y3FOKuB15fT4QkIos6thJP7vImzxf3/WT+1b84Mjh5T9D3eo2/EOJuOoTh3sA4k0yQXtx0PBPRYL7B2nzUDjrNM918tK+YHRGTaaSeVvzw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: j1K3HFdTriw1iujK0AL7yyWyF5sLgq1Lk97x7GVzIsEV8kadqVLK4tYIVDwQtuxznDg/5GUyNQjf0vlUcgJgYKc4lwdT+UvPUC3oIS2OPxksEHFfTxoE5sExL5bHh2NkLmaP0PbOzBLjMrMJZtqAJNoACtGJYen3R1gmHRYcZ8/W2YYfZa5NLfStJBAb3oMd3m/4r/1QpLrAlmU+uBzMb3izGt+HHTY41/538tUXEyOR/DQHIv0C/gAAH2LolUss16kubiorpwwpr7+OmAnUYXYnnI+DZ2NQ+BJhQupGDGihyywVhdGPnHtpXqm+eVPAPcl2vqHfQ46HAA3dDjnmnjH0eWYsIIfnMoibi/voJ1wOtfDKgx1e+wBYZbVUGD4FLENdr1W1drlFbjp8MBMj9EoEr93qeneeq6FNtRgYOfkTkm2HKhMfSw57AKcJGB54Ajb5Sh+vBR4zO8R7gLL06mgy4oPErUE4Xh0ViSk/f726Jw0fQoicrvlAAeTSwiQT1X44FcC5F6FWxcxDxeTFCxXVslT2T0s749KDOHrIV0m8rwdtIhCAYO1qh+t1Wdc/es2Szd6e6gET7FZg/1IVRAJiJuQZOQsTc1lnuYXFtpvUuF4uXhFmFkSNvkKtt7AXCS5j1adqQFDsed9FRabXq6Oi2CoWJy6k1t14SE9+rhnfyW+8bmn1sS20aoL1K3OR0m6evyBhRNiNC3pOazkg8U14lSkCtMcAkilVpoNlYhV/LDUP+Qxqt248M2ivuOp2gvu46MGkeQmfxYaqCG3+VekXWpz7Xlk6jdgIbz1ScwGPbV/4s69DbzDnLCDr+Vi2G/s6q2QjFSTYRbZaDWn6MYQ21hXPKZ9pdY69z8CAG8BRKZUmaBRuLfCa8l0DFBj1itv0QmZ5Zn42kbGGvieagtRbEpmOt5eMf4jMwp1OWKLdpK9I6/9Kcr/qJIoYoQ4HkzBAX4KrxlXsz83a/YjqUoQ8TtBUVVyNXZRTmsnFfJ8= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40ab5c76-a94c-47da-fc09-08d89379cd08 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:21.4728 (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: TqNPpvznyR0BvVjC20sebMUx6/6SLv3agOxFGY6DYwitEwQ+PSiv2KLOOXcApKbnfzWgEpHF0A4bjh+0w3WJ4Np40ErsU5g3hHlquhGc8w8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - add reviewed-by tag 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 Sat Nov 28 08:43:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407477 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=XFJeShtF; 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 4CjlS314vTz9s1l for ; Sat, 28 Nov 2020 19:45:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D81782729; Sat, 28 Nov 2020 09:44: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="XFJeShtF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B6F282713; Sat, 28 Nov 2020 09:44: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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 B98B0826F5 for ; Sat, 28 Nov 2020 09:44:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IIOts8tgHl7l4RLSsvMCyR5SpkzY9ATRk+jMbN75sOoz6YpsJQHItVsINmkEJ24oqvbwtgLgqKBMKkrJZbDPCPhFq9WwsE/tDK4sI45rPIOo5cO4FdRahDcEc29+yoNsVcLvTka+Gz8HUj8ipO/EMCfwEaeqLfoQOjXzY/QrWU7JjC9zyWy7p87RuVrGy1lP+DL1xYFGaIqajBAnqKwShZb/eAh7t6Rz6eygFgm2KFjm8F7tDU2rhBnr2PXvZhLJZ9QhOgwCokqmFfsBOSHWBNmFOAa+g22Pgz7z6ZGYq2SgRE2XpVDykA9XgBtKvO+ADP9z0OHCNqVLVJetDuUlog== 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=W2ibj3t+d3P9n0m+dbOa4qLcC/IymzerhmLDklGzGmE=; b=c2fOb1aZk8KTxFDj+KCtyXvo/2IWxRfov3GIAA9FsWm6g13whLvrkBXvdSb8zaMVX2OAwU+zVHAEhSxFUl/M3Ib2jCH+4W5dXqFXLh4S4tRY1RBfSKnXgwRdjH7QaLyLoV/Caw/Qz2lEl9oVT6eVb9JSc6EggbtvCi3MVIXVNeeVLm5InPMh0a/rMEHwRtDdhmi/lh9UbysjXvrjw1ffOWy8vlJsY86hcB8uZL0AyDtlxfvELNGOlEw1ee3G2PlnZCx1yConaxnLe2rkbGD8z6sd7ofhIW5m8wiqqkUxfuPNMM4b0xwO2kJmqYBYJsH/hpwipKU7NOdBx/c3LraHXg== 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=W2ibj3t+d3P9n0m+dbOa4qLcC/IymzerhmLDklGzGmE=; b=XFJeShtFblCMf7FlZWY80GnFQMD5kfOQQwK4xd7azZvH+JqoxduvvEV4mMlOTN5D6wMwiOtyAn3BlN2XUcgxKoM02HLhPapfW+2kcwHpN3Gy/8Bnwv+FWlREaU+w/qFB1mXt8L/l97puPCIkPKAM5pcMASWSbFByMEtdrbJ0CR8= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:23 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:23 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 02/18] common: board_f: Drop initf_console_record wrapper Date: Sat, 28 Nov 2020 10:43:04 +0200 Message-Id: <20201128084320.10164-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60c56622-1c1d-45da-9a5a-08d89379ce0d X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: k4iH7KcowrJslBVsqd1Vpc3efJuD3VBWK7OQQMjm7tcjg4BTm3EAM3TmsQFEdQKNtHG229ZHVK4qdZxLqW2Ger9eZYqFNItIqbY7z24/jB0QkS2AOP95WrB4iRfZvlkJ+INq1mjGswww6BfTUeos67qY/QpXgmKk9x+8bvlQCUBKPiMRMmErxrfi7D/XqCL0m/6lWMVi0jUHtAycE/GDBKdmjebf+hdkKfhhMuoHKqAiWGMyBCx/EMWIaV3BCYHxx3lix21xi6ug/5LcIAQanjufLWz4+Iz5UMrsASJcudoebpN7WgOJwUi9FZetDJK4 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6a9oX8npinLPhA9ffAEiWwB9jDsQlxZbuysrUlz0hMQG0FoY5DYmpAX9qHQcOJBrDBWSmJarA0Do3lQNzGll0Z4PjTBArgNrs+d9FXbyEZpG9riKUn+QD0K4bn91xjbkNy5sNJvMzDi7A7mmq4j1G9SvCQQzL+OBEzbDkbB2mQ9AJk00TFW7TvtZ1Ei9BSIfQ2qw/Q0bMThPZ+XpRpDPlhfI8jfuGb6oBxyZr6VjqTBnJ20A8Semw2RsVb9A2VE/6m7x8rbpj1fq9FC671UDfGtpDd1keuRxXP0xb27MX9O/BU4tAsng0z+Qrrp0QXtXx7Ucc1Bl/ht+yPCacER5ga62Y6hVQw4qXhB3Y3KnAs3+Hj+BQgbHeO2D325h13HwWIOHViByOnp+vNMBPMG/Xe3ZTTj7h8qyKR76ZiemxRMATGMA1vf8KeLKVCMBg/nRJGII3HXy9Vex801PI1kQh1i1RxwMMiYDz1uOI90XB34AfvfuEj6cO4kKDK6oaUnoqqFqciU9ISWSkFvHJRretZROERAmPSWI5xea+kgSObOQAl8hq5QII3Ieel1BrjFKtB4QSJJOuH2iz9xVSZYj7P308xbCOaXqdSEjyiq2yCn9IeiO8qZ6j/zoDuC0Kv3JJ2jEjM8CLVy0uGONFln8bKzHVBCX+7LhDA5o1gAKWlMOJhlbdL4b1AmHVWr1f+aVDzRR4E9TVyIzR0LTygK8ZSbjxRzPfh9om7eUU/mOBrAs5i0Qu8j8E6roRXyQn8KXokG9D14xpuubb+71EbZwhDXAnIG9SNFz67CkVXBfDZUIZ5nIKdPnUsRyKMQd8zsmkfV+ImGMdeTPDZo00c/pSS9cyM1F7G1CuqNo8gopAGxXk/kcn6JfjYu7ozBQXzSpUq58pY7Tqdg5DBdoExZ1UitiG2tFJmDY+dNyTbISOxaIHrZuz8OT0CWB+xT+WBkVg0/s1xx4bdcvfWAotv8r6oMPvUK+v6lpFOslPGRk++c= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60c56622-1c1d-45da-9a5a-08d89379ce0d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:23.2757 (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: 0RkaUG7MnzGCiDp5AdtvWlwgw6oMteMjBTD66h+FUicyujheE8RTLL2k6qyNvwA94FO2nbzBg/oR3ODgXPRP5616JUvccicLGmCwD89IdRA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - add reviewed-by tag 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 Sat Nov 28 08:43:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407478 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=VzUvBMk5; 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 4CjlSG4F9zz9s1l for ; Sat, 28 Nov 2020 19:45:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDD4382717; Sat, 28 Nov 2020 09:44:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="VzUvBMk5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D58B826F9; Sat, 28 Nov 2020 09:44: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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 85C33826F9 for ; Sat, 28 Nov 2020 09:44: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K6EtxUg+t6PIJLG5nNuPt8cZBy5qKfVTX4BKqeZ5qQeljj3z48ewyXYIHao2lK7ZC2D6qp2z7IQAqOp7V4parVerHjTvK1X701tNZv2EkBjnmzbZSrZLMD0flYGNHOJspoRj3lwXnADZpCa5vvTj8acYXLnz1VdLcEpLCOqbmk99edQDd4vaBIpEyJrYOjWjTOzegtc9wY39tbDxmEjKKH1/bQVzJf9ORulfHOENO1RZAnFEZyECpGRnI+CZ574Raq4S8WhzOrny4d/55Kqo2cIRb08P3tnTvUAn6xp3j4RCMsV282JuyDv3QJJppYCbJBSFz24a0eVGVd+hQRk/MA== 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=NuYBWx23QUb0ejO8VOf0XCRGd0n66sPeUbHxT+1ZUk8=; b=HW56P7Cd8mgX7DA1Ghf1YPtAvF9VvijKX5oU3dkUlPfn466fGt+B/J7woNsQgyrstPFrs2nghJzNPBAWB/y7dIsbbcaAAAe7R+FZtFXXlgPzIUMilo7I7fzpPdZopk9UJdU4p0p/fkmgaRBifO16e0sw7ZFEH3hhmtNwajclXiwWz7/wYcUj37SQ92NkVrM3d6jzriC1U3ljtu0ytSd4utBKvEEvicmtYByrZryjaxyjx2RcU6ZoLdvii6lIimksk3cZWiP89NbUkwTfVUZiT50wIfyNLdFnvxApsAiUfqkIyMBiduzSwvm8A2l7q6NeS2hbbzoVCraNiEMhVUpV1A== 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=NuYBWx23QUb0ejO8VOf0XCRGd0n66sPeUbHxT+1ZUk8=; b=VzUvBMk58A+tJZcw0v9OpEn2BroOJpd3TddhldUZGVeIXPOPTXmKuzxglRg2giSA6ZaaftknQbZMYSQP8Fa5Iguz36/izWEeA+S3MJDa/0pxFC0tFWEv5w7dq3IFC7Fj5VEEWePdKiAU/M1odsQ2byzdWrL7eKW5m17T9KjXqVk= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:25 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:25 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 03/18] common: board_f: Use IS_ENABLED(CONFIG_TIMER_EARLY) in initf_dm Date: Sat, 28 Nov 2020 10:43:05 +0200 Message-Id: <20201128084320.10164-4-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: afb526d6-2ac8-441b-408c-08d89379cee3 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: lBotHa3X1PpKQ5FMbNcnqwtMMWlmqnfuTOYczxx7UVrzgKf5TmJU2eAHcJVTiOpBWn88REsnnGNevmoe1CYbbIsnRIBDP+rg0oZdKdMvZbz+AMdrJao9+vhCBCEpPF/F6qMDz0bTlDefTbwOrcGwf45wKHqFjItFmR7TpCsQLr/9SbJmHbBBfKgqBk4fuo4ZhYg0siWqNEuHUvDAPfXUqUao/KBmgAZeUeo0J/5H3NsEn/N3chwM8aLRy2+5bR6tnUytEaoyJUroP8enq035dDQnZDJZFz8x/7VpP8vdpMt+VaINvlrD91yYw3Kyiw0weUXmtmsqy8Oqx/O3PG1zLw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(4744005)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: b/wG0ifZxWlbBaQzrw7U7YxgP8dUPsNcaA4cLyI731rZJMPVvG7hwosGEyOER7DGpboNYbFJN40S60ioFZROhAHGs87o9zy3Ms4lgg5VXZw7tRTszckbGmfi4mP6loiwXYYzelpCzWcwDZ128x2yqyX7d4pv/iQvSKZPTqoA0hQKTUbzwBLrwFUUKj5SBGDT8CdjE3oSfEOpJPVqkssxejLGFUwekR23NLqXzC2xpprJQhKfvM3TcBYlCyhFiI20Ki/sANN5iqOVJTBVVDD9KFeuE+2vRCRRLYDqjWLLra+jABdUtW3cIdkM+Z8qRedOYnw6QMG3E5LC2sAv+dmKJPa9Od5wJSghnXQ23BB8K+lV/BhFeczlvUeMavnB0icnyTIiRae85LkgMEEJUsobuBerUMxIY1UBweD1qbQ8PHEMI+yfsXo1Mi6Mte41IQvCfrxQeZLn4lxC3+/SRHKGLGxs6unyrCRgK5d21oHPl95fAKF5CydkXkFVR964vRiZZl1xPIyLY3RSdfOLZuGD8wtSnpzsHicmhFamsIZRHJ2OwAnPYEiOG6AZ/mA4aGXjWO9wB0LRykRXWXGpRLyu9boSYxFxcjz1a3odGv17sKxKlH3/stLDKztsaiFyVkKweedP76W1ilh+nD0ouIX6Ihr2sElltb/ySicH7mMoRAR0NUhGeUMcKaw7Wq4heQmoPZ3EMnOH9SsI0lxfdkkGFQCM5BVq5cfK3eCSz261ZidT2JXC80oErTYe6hAA8iZquKK/bsArFlv+JfUdyfNCAwFyoH9GmX0Tl4vpF6/P1XWyGPJRTewHbFEEOcFqzLmUD0reYVyL65bzHcsQbwfLJ1uyN6PLjrE7s+uXVPSp4WS0lqmtAgqG3E/Ln7x4kiAtOvWLiEYvcxGXy3hYXY8pNiOds6uwG5Yq3cDr8iJf+XjQYI962KD1FOQgYS1HTAmHtgoG+BE7N23OEGp3bijqYX1MGdxkMRFj9oBBxJlGfUA= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: afb526d6-2ac8-441b-408c-08d89379cee3 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:25.2575 (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: nI/ZEJ7AhlAwt3mS4ZzaiC5Wa7Zn/YBGKUTw4LoBv3GbtyEKEGpsEzz2KLd7UKVFrsrT42AI1BwSoAEGI3b8POOz6ZRB3FHKrLIlFbxFOTI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407479 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=c/aVqrbY; 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 4CjlSW09cvz9s1l for ; Sat, 28 Nov 2020 19:45:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F9068270B; Sat, 28 Nov 2020 09:44:58 +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="c/aVqrbY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2CE8E82719; Sat, 28 Nov 2020 09:44: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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 4CAFC82701 for ; Sat, 28 Nov 2020 09:44:30 +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=EaTJgiire0LGRHTLvEVyBwUdzaxWsw1bPch7d2RFvNKV25CBBZPyuzNn9G4Gj/OdnJEtyZFg6v8xZxaII3a5YwwHcM2dH3wG4uZ5zhxQRqf3fC8HubOun3ib7KX7+RE7+9f2ov8wa2HJlTMEoXi86C4gaVcyoRPtORzv5muCZIV1t1xGIfgFfBLi3wKyoX+Y9omJjDOnOWAhJu8Dtg+HVFjfAT/UhQqty9FUlJodcIkuUtHXNyq2LkoZAr0jon9toSFiF4n1tbi9J2ThD049GGqFdaq4u0LwrLLQ+G+quBAcI2IqRsIcyhJTzQEHw3VPg1/hDB1B5vlJvOyAM/LKhg== 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=0k3RT726VR/iBAr++0kk7JcDeVMkv8jJ8FKzyASpVhA=; b=W5Kox3D7EsTiO7zzoNb7v0lPplxeNeCWvv8fFHn6S0OBEHJZT2JmDr1MpiHjaSMtBl/2ohJo0szA2H/P1REa3iNnGz9UnJFBCdIXjiAVW8j4PWOPx5Z+cyEa2i1d4ZFWa8tFO8BbpMhVFeUdw41ARrz9tRg4/033TauD4JHzEOVAJ9vIP7T7OiG6HZUiXTxlgBVvumVyiX7GXpX/87L4V9Gen9PFYTcV6QeuZPfamAwYX5HFvqXgmdfaE3dSHHJcXnsH3zRJxFWfIJmY3Qzw3LEgeCH9jVnKHveMLTYTqzwNmjhAxN17P978Glpa5Sf2IASaNgRwJClbX2lei5j/nw== 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=0k3RT726VR/iBAr++0kk7JcDeVMkv8jJ8FKzyASpVhA=; b=c/aVqrbYObzFJeNwf/hng6qR8jZFcpgqFOcOGlxbek6gfhWUUQ1123dKYWHtIAqeaZ/lIUIb6MnVlCXVo+ifaF3IwWwbREB/5nv645Rts73TLfzE7v2fIRirrtZjiz/fwL2pgSFbXx+4QxuI21NFroSyojI4TRkyfXdMKDNH6R8= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:26 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:26 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 04/18] common: board_f: Move setup_machine code to setup_bdinfo Date: Sat, 28 Nov 2020 10:43:06 +0200 Message-Id: <20201128084320.10164-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93e5322d-0a98-4929-d006-08d89379cfff X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: VNk5o9ElMVBnxlVWiA47lJzBbvXm96yTzqh8vMJ1Nwxvv9FNe5S7ReXT2bfHSmSI59B3d1hB3BghCgcjM5mf9WC8Y/EMxQJ+K3jHexsMdpiwpzexaT0tFq2X8HElyK3MdRm1cgbcxISrvm/mX0ybKGuJTCrvchRtD5ql7grr8hJPqvQooyQ1vwfbAlmwwFNPTMZT/L8UgXdjaGR6lpDIZtZBoDYxPmvbTYidYh6Z4QZlBKEkRO7FkwTKuec93B9WZ8nG36txh6II95czbGkttA1YHyhrdvz53NiuLawJCRXsehqVxiWhvSWwYZjOSAcXa35dANz+lRTaVcYQE0Otug== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HSxc9VfBtteHlvVpUdF40pDF82guZWP3pSzkh38hINJWFpVGPQkj1t6KEDvj5mverK6mV+rKeNcpzUHz07Qw93ro7FTwu2GnMA3hBuHCeZELv5m6iWYS39ncCXy1BQ19wEYkrXUkUEDUGf3IZJRvZSXqT1OnlYsSbMT51Rdo/glxTJLZz1JwhSV+i5tSMg7PqTMAhJBHYUqdsopO1Ig92XN2kWAbaQCbNedzKzjaeRkGu+f1Yt4fB3VKjQqmxX9r2XLPkaWskd0CI3TywC9UgziPLA+c7+RGInd1St/NsL/3Lt/QfdaL4ZyFyrZDL1jzRZfs2Hv46SGNavFpcYdP/H4WoG1fHK0AB+BaWrwpo4ScznZx6MJvcLLghgBJDNkxSs4cnzH07251qlfSEijlDjOg01s3SS5PK8rBp1fJjj55u94xWLv3VkSIPQLEjoiRYVa/GzzrJ/8MOVADlxHjI5H3l2xY2W8qU/6ZfguMgn0FCH3I2WzOtiL82kTgHDKFMIE08ZPyk15av5FNexu2Js8fl0NNoQKA+XgtZmoeU/pItE/2sZ5H3Hlbd6+7GWXRYGP3kvrjJ4rSgJnXSLhmhqBEnt5w7yDh6mk7YY4EljT6K+57oBNSEYsYDdMFh2e02YDTognLab3G90BS7kyhLQszcyug7fePN8JIKAS6z4SFnI0MFNjeyfQ/KCveYn9SLN/nFXzANYOqAPs8QuprnaWFCuQcPwF1NUi0ghjfe0qVODJFp1cUISOp30jSicMDSkrah4r2Nb1y02NzIBdlWcIVqYYGrpTxST3MBubyaYWcYhMFjl+JdcoGsGfqZOM+10biRqUl1eUcyLDxFN5UcFYD8eujMeFi12D94TwIZOzANGlQyqWrEWVMe6gs/azG9l/sXoS7gW/PWjbd+X6DJ+Xv++MJVUF3iF6yl5R+iqSBpnhQzaZG1JevIWBdmri4D0IE9zAxBo7eaYr70rqt/QyMbrLejdCX2XkvIg/u11E= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93e5322d-0a98-4929-d006-08d89379cfff X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:26.5458 (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: af3VklK5GJhf6TvJMdnIhZi1sMYRzV28ufUJsmH2qComZwv7IOPSjoI3YRkzdPEYUfqTYf20xZCTMg1HqibMh7c/sKJkUEGLWev3k0UmvKM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407481 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=YtIelaiL; 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 4CjlT21cztz9s1l for ; Sat, 28 Nov 2020 19:45:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1715D8273B; Sat, 28 Nov 2020 09:45:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="YtIelaiL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E860282717; Sat, 28 Nov 2020 09:44: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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 28806826FE for ; Sat, 28 Nov 2020 09:44:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UmX4MqQV950t2D8UzQrFy4eWcKbZRsERulbg7z+SCfkEUg+JjcqwJT9ZsnMjwmSSFUpu/kxAAFFjUs0e9TuD3DIBd5ifDBoJ2oKYOjhoTcRsunOwb1bBVp65ueSZSRoR9dSDd2ACOAvG6xLMiawxZ3OSvQ8AIgf2KJewHaWo8iYlW4Boq9dx3HMPV2GYqQMD2nux+iMX8eXmD8QRHSBTkrYUSMfc8eOjCWoE+xJN9QVnVheJykNPZdu4AMsS8DNcKlVdZdBi6YsFQztXDOdOqmbMFuPN20VP7j43ZeSFKTvrimQsZ4Mw9Vbu2Lm/YPIdyBqaa3U+mAvx6sYky6I3nw== 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=VRE0TZCeggeRtu+cksREMeB2E42wqTbokUqwpzHeoOo=; b=anKdjA++VoQy2VofyaXOF1eu6XU8KAGdC9yrXYveXYWzNoI48gdLNPzHXv7dxwLlRj6mt6MFEj0lTiyYK6Q05/DMMrdTa47fHqTfvViwqRoC+igFagSh+jvatKsaSZX7kZF1lizVaIDscTB7/62W7jEy9VgU2r4zzz0/615Bo22schAhwfUhvB5ALWSSW4sTh0nzwTyW9kkGfCOb7LEi3/+2OAuu2lI+3XoobhyaPhqgYMnn7V7ZWk+8Mr+DfIiXrYkyIi9Cpqc1pULEF9QFx96u8bdi5KQ7S9To/b8ipSuUpxK0kodGSOi+mmXV7pT/Nx/Q2HCTl94L2YCdVQKKmA== 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=VRE0TZCeggeRtu+cksREMeB2E42wqTbokUqwpzHeoOo=; b=YtIelaiLtWTSqhmF16ZYiCDROI23BflM7XYprDcMMIiDUX9yAzY8CzsI5ii1EZSfbGwyLnrY7v+P1oVp60am2xFQh8gyccz3kIAIBnrD6vq3K/OKuFk3wcZYfbe6h3sdDmpH29NPrdWDmrn7dRWLJWtgZhlH56co3NJ9ZqihFnI= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:27 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:27 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 05/18] common: board_f: Use IS_ENABLED(CONFIG_OF_EMBED) in reserve_fdt, reloc_fdt Date: Sat, 28 Nov 2020 10:43:07 +0200 Message-Id: <20201128084320.10164-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4786432e-5c0b-405d-e090-08d89379d0b7 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: ewqG28Wk82mxQVBjWTYJTrA3YPqxeA+b+FLU1nQGTxS/LP7TWqMPcHfUh3AyZF8E4nCupON3cFpAUco3xyl56i9XBpD7yaO+kQ1bQ24FjRkBEA7M4K2nMJ5M0SqwOn2BfrUhL9+ck54AXRlHy322gFHe7EJ36kwSnDzhf0YIrnuwZTWMUghwBQXmpXFJhDfsWI9XlhI4/CODSZ8qMlIXYbi+FE09EJ/hJyCcNd7sh9hhC2dboezcKzTbREB+MbPlS2Ga7DfGjjiAzXsM440ZFIfMkriFDTttwxvTuLeoKDxHzAxTtueLkQruN89K9VWz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9lPEZ5caXcZfaHKUkxsjFkXBCeRrbdVyE1xpvlNog/JKNzaWs81gpgsMfYPwqxWCMJH8W4NmSUdObk6HbltnJqvRQvGhGcn8d7T39a38aO7GKK9KuNekL+4EEFlJ0WA2wGQ2hDkFtSQZWD6ZDdsnbTxwbwiD1cOEg1pdjPJSe+qR1ZWvXXUIUuXfVAD61QYpMYSK6pAaNU1qib2nfs2jGZBTjWGcBlIJIrkVnjt7qVkCBx0qp2iW5XnsMEkX4cQs7EIFZbae2GxodexY0uf92bm3cOTABhzhzF9zjZnHq1wMiQNy2F6goOiy66MbaMkMQ26OsjmT0889ANQQhyr9t4AcREEsrQOyZuK/v3Doizum0fFROs/76U/O8/9Q0WeLpN5XGAHaCBwg+bNsAWlu7p9paR4c5iKAwhrI+bpYrQ5Y4id/kG2V1hJkOp84lwh+Mu2KZXz8m1o8EJ6n/FpZA3Y+N2Ljqxt08eGyDX+3wataWhM/S/qZ5jqmNuzrwah7Kp5ClGdy9DQ2hpyTffRQom74AIU9m984qdRWkN6Tj1x9R5zo4shPQiykwPQW0Ce8vFSaq6OTls5zLGFfK/QJeErL9/1OkLTsmZJcq5X12CVu91qHIvFAvhR4g953h5/FjK4G5axm0YtFnpDlXXPYLFXodQcgQeiavaMM8II0hlbfSiiKlUHfK6RRkvc7rPF9Ie/dYFjfnuIltgWL7SaPLbkgwuKxci6V92WTD1PbE/iNfEqc6NksuQnRmXSrjrEbbp7U6ZNUNMlshztU6KdxpVPBdbdUaAfuid7dpMPzNeD8esnWmX0aWd2BV7kFfZ0IIos4OCzP5dqNU7sDudsAvhve5DKPDA4SG23eR2BKgck1DLt575YXDJr484eASSey0EbOx7qvXMsnbkA8pgaKDXuUJWxm0hrYcaRsVn7Xxgm65bVe3gZHVZlFIWGF738zTimjQfZoAJMaJ0l+Cc5zi075GRZ6TFYDY6yRBY9fSJ/U2Q2qoa/U97Cnv4nwUo1K X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4786432e-5c0b-405d-e090-08d89379d0b7 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:27.6561 (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: wc+2lwmjB25anExXJ6eiXiO75g7SJV+j4QP7lv0wYmMlxDYg3Uy9fQQiGSO4RFDTxwiWAN+ybBkJ1Almxsa6TaO11eQa/rqxZOnXf07LGiw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407480 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=hduiVtfG; 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 4CjlSm2d2Gz9s1l for ; Sat, 28 Nov 2020 19:45:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 46BC78271A; Sat, 28 Nov 2020 09:45:06 +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="hduiVtfG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4109E826FE; Sat, 28 Nov 2020 09:44: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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 24141826E2 for ; Sat, 28 Nov 2020 09:44:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D6w8Ph7sYEcbcDYOzTZJlJ4AHY8/ncFpcpa2jXg5JXBJ4R6hl71uYKRajsQalJ1ayXwg6YHJqXKSkG25czuffwjLauEz/pFPrDKqK8yUB+JiHwfYszNdKjq/m0eUKMAfORdWsS0NzNpEUvL+/QMVkht2LJnQsFycQIe7Y5MfaGU6o3bzqpvntnkSGdBbDghTxIp5KJZkAslIB7VUwu59pjlxCxA5GTnfZ310pdsd63htTq5FYuw52C+j8Rszxq1y9UexFiTV+/sBBmJys2DCm2IQJM8eybveCB8nVTm5MNbYIjJnlRNbwJZxrhYaTqvoiaGG2aMtTrNfORZcjDp48Q== 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=wy9+cMoPGK9zEqpfBjYnhC7MTx0Pr1n7HHQmolZBLQQ=; b=Yse8OKwi51KSrrOFfTIYYROe9vl67XWA9NTuQkMetQj3Pr6vWlNxkf4tV9Il6srOWl1JJs1AP8dagblwhnCmZ0DpQYbyCMLaMpxsmSUWWkAY/98z+Yy5rlPn5eEQ3SFW4RelFu+2yVmMI/ViPpacPxavr6RoPiw2YBI2IaVxGXbmmSaMQcGrCjofyulK2QuS6icQzkhMWapT/kCrc9FRuI5w2t7LyHLWSNd5iOYBDEAPcTNKKKapwRFSLvquyQX6qFYN/m6Ygzx1jPrqfIqbJCv2hBdYH4X9Vi77rAs5SP2ZASU7KgbTVuBdyIMXBgRPmWSEJaEFOKvYqDw9rh6Dvg== 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=wy9+cMoPGK9zEqpfBjYnhC7MTx0Pr1n7HHQmolZBLQQ=; b=hduiVtfGAmyhvyWGc5daC37wxxe/oih2j/pDiHpt+sgLLn79LARnGlr6JtLjsSdEl+FDCckn0wZeDE/9qHzvpL2WMIGVcEujgjNrAJfLBoXxcjflsuIxxaD1WceVrdQL3ZNkKK+RdvzKs/E/zep6u5RzMlUNc7tjv3nDc0vaRgA= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:29 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:29 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 06/18] common: board_r: Drop initr_console_record wrapper Date: Sat, 28 Nov 2020 10:43:08 +0200 Message-Id: <20201128084320.10164-7-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5bffcd5-982f-4e86-fc8e-08d89379d184 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: 9rQv42ooMHW7VVyElllBpvc/5xfmPK/e0NQ0R3uZdjM66lZ3Ouobh73VZYiqOAaESQNmTTd+DrbAI87/bG9LxkvoBo0nq5Gp5eIPc8ANrvw0gpzcwF+905MBFTwrxchkCPDjM+WfjLPZX0fFEiqRhqim8jGL6BB1MoDWxveFoHAfUt5FAdH3hlT5wbkAuL/2RrDFm7Y6dsR/MoTxN52YyXuQw6YIyF5ldxBg6AMmHPuB59yEtzwSXFZNomKKe0SJGxTadxLBXB8bSwOS2d53cpZxIQ+D+PZGkr2ScvvG8ekHZ9qSJEDaZyLoAmfhgaESfxnbwAXsI1Vk3G1UWzJ+Xg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: nKjGMyde60dcBIy+DpY2yxitpHxvQrg+5rhet3Zo3s+RMXIrLwmz4P4HuGDIdzd6WvHdcDCgz/0yiOnaFg8FL4OzAPZKhxLdmZ7+HO7q9q+Oez7jwt/x3UUyfvvdlogTVmxD81QBlBr25tycXlYpGukpmCEJnnu08+EnbihqlRr/+cUF4BlR2aGmJyaxn2r58wGAbPU65qZhc4ughYvqPwZbg6plUCJfUt3Eb9hF8HMqp2H8/RsrY+z9VWHUF7S2cYvon/D0Zzj+VMGwDjIf7xEf5NX9xFL5G6+6zbCcDIpj+W3NB03UnJAvA/jwrawFGs/zT4BGlItkk9sgIGKQAVLe9c1P2js/enhoZhNdsL3O/V+OE00fIYpxod/F9OdINxaZ4Htn/7Z9oG3SMFZuGmM9Aq4ywI0on45V+nugRgICzER4gKHtJ8leiqWRXB8QA72EH2s/QPOGdkCOnLMHkwbDH5yTz2VV73nwrdRpEPgGrU8/3Q8W3UCT+HlyKjCIbKVjUM5JMTKKviktbNuO5ECNtD6NTmPeZ3yNNRVn9dkSsZFv67J26jZ+m5voFNYXPDV51E6xmwCFoB19PIDtKM4h1KqbjPa3VAL4cxIfeZ2CAvUYNlTKIw/WU58bDTVdM6g2a73Yj+QDm6E5FqdhiP8YQR2VVRArc39xwq5Jz9jhNUHHCOZlXXIQb1XcTrDNR5ZwE9NYccZ6ckKrLCIDIduhAQqOgMamLm6EEceUmK5jiJDK/h/r1tZsbWfSw0IkKYF7bBNFCjy4SdAVK+bSxm7G2OwUgy3QsPv49cjzzNjUKGIoB9BGhRrN0sfldIY8dHHN1Nz8S+mxxnBW++Xgk3HP74w7ruAMrzHyzaNng20R6ycfAiuBj4gO1wEGPebWtJR9l0nbF2vbQ14moNBBt34BMgzi7p/eUoTXwUObLSSf4VDsjXVBcl1MInSzyPeLzTu/vCyyuk6qA8JGSdvdDaCzcLF1WzY4xq3zlp6Bn7/OfQDjQf1FaV2giyiyRQXp X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5bffcd5-982f-4e86-fc8e-08d89379d184 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:29.6669 (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: 5gsKOJDoc5eoMEzazsMsQ4zLXbHkoE/3NIkCK44mDdQ0p5O5FjGyZnHEUqIklBlekPyQgsqu2Lq64XGoaxAUrJV5EHSZ5j0RnQmPmm2O7so= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407483 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=LIlONmyX; 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 4CjlTY5QSvz9s1l for ; Sat, 28 Nov 2020 19:46:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2237D8274A; Sat, 28 Nov 2020 09:45:19 +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="LIlONmyX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9AC2F826FE; Sat, 28 Nov 2020 09:44:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 E2E8E826F1 for ; Sat, 28 Nov 2020 09:44:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGK6Xsvqjo6IJqKB1k3xtCSLNefsL846fitoH041tN+WtDvVQfYei2KCF0VjagPcrJ+P6D1FrNLQL7ZoFL/LeCgCPzJml+NiNBi6FF2Tetj7r6EJSF5Dp7uT+RXyIgV+oPEkBFUEp3/WTneENOWgYwjmsi27+Hyr+Xkdl7pyVhOBH7asNN9Gprw/fgQJvzL7E+ckTFuETBk57jUR26JiryoMcJswLHyK+UnBsQ3KUloFRSTbDoqCcQT6Hr9jpbSgzrLBhjlasctPCRFQ/IKh44v4p+LyS0yTM7m5FsNUwX4QYXEts4MEO2PDhEsdN2K3W3rhCRnnHVj9yTiX+aw16w== 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=nLWWx4acMT7Ju74cXIaYOtsZ/yWq+wBTX+SC+mWlWgE=; b=I9Fc6gAF/7deki01ZMqswigPGDVKiTCt4M/e0bf+DQbRGT10lbZKeTkJtrgLTssd/VHdwG1LuIc6cimLuzC1+950bt0vCZZgkaJ/AENTgJvsQoxss4HQWLrFSuXO6/M7VuCOxWx1ZfWxSnT7elFKosyEGVa8Un+A9GeDQ1XbAVSGyVO58p4KsgSPMd+AYjTugI76BIPVXnTuaOyzrbTKLJKXmaSkhBVcdYpRRpWn1duHeUNwq71ALp627q4br67ZHwz06U6zBdZMneSSaP0x0kcswkoXPdZdsgG65hUtgihmarK1ryvVdKiwXzGiA7u3aXLPYr2K57po6Ml4PEyaqQ== 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=nLWWx4acMT7Ju74cXIaYOtsZ/yWq+wBTX+SC+mWlWgE=; b=LIlONmyXrGntcI2d7W574pEMGWrXsAw3vKTDFoujRL2N3EEt25Cd49sARuzzIooyNfhVrtB3aIPDY4El/0U0OA8K4lZooOfT4Vu4adp+1qSnXCxpXXodC0acVZwAQFfZkKdk8s1Jks4MkwKaqQE7enYMf4XegKALsiygoB6ZySA= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:31 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:31 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 07/18] common: board_r: Drop initr_secondary_cpu wrapper Date: Sat, 28 Nov 2020 10:43:09 +0200 Message-Id: <20201128084320.10164-8-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed711cc7-112e-4bbd-16f3-08d89379d2a1 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: hfHJd+EUWB7Qnp5HyOwBrnKWXJpwKSOZMDi8G6Eh/JrLNsk62z+ud/AVv7LhVS3O4RD8wuSWSesqKZCNkIISmscaQmOdPxgc53BxqbGu1tLi+ch6tC4JVHB8xxW/JtGYMElGrBoq6P7oK1UbgKrWAUJq/DKlds45L50nT4qCrxoYIwyJs9LAJnKu1EtNuxkTv7e3DM/U6j8AJhCPNAk1o5J91hvOyxl9h/AtfqImIYVGR1ywMk6RYUZ0gdMsE/C1Kz72rXhZS1m6CBzO6KgQydncDGQxTmbAOB2KWbDXvdzW8vGrf9Ek1KCWCcrRHTnknRa2dVWZJ2dzZhh7h00bqA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: bUlKjHkuGDQ0UkTpPiL0tPboercBqlAIrT8aYlUX2g6HVLa60ogoi8eXE/waxEm22GIPwA4Yzd7FveYt74jxBRGcvh0B7cYqfuGlVCC7Ml9+GK8Rp6LJrngbWYP1XeTO7zRPbL+8Apzw2IZjr+4zhM1rdzp6hsbVkKYOsPPqwuHxIPdcL/DDFfM8Po+l9k9kjLuCFUvymuCsdEkbzsn8yHzuhpKMyQwUyLbjzI+c9DKmgzgceGiFJnmPh36e4RBNuDkCebF8flEDCitlK7ALhu+gMSld7sgEtgGaCdc95F0r8Rk6Rv0kRSNWREBtatVFHkCK2n1Hbqkz2/uxnAEJB8tbTm12sYGuFzI4YR350hgYRfGi2UDnl+hkusMwoHFf2jaEn1djM5MmfhawVxlBP1umdjTgNn6+/QyrANdp6erttuwFqE0YtmeN0iGyVeBd6+JHMc2P2njdlfLMNDfSg+DgK8BGcoYaAfXvJQ2f48Z6ULTfGpLCBB8m/TmxAAQDuOLw0JAhb/GBtP6seZTgjrgeMHEV5ZKgxtfTC+LpyyHeGj9RkteJAYR3mQOaTSeB4alI5Dws20B6rqUHwFIOQyxK4HiuvsiXS5WWfPtqjj+A/zgMJcquGO2Nn01zSqfwqHXE6omYSKeTdshJWw9Ph6/GgG6uh/E66MYRcU1+r8vyAUj2X7wyjqj0ahPK3uceH3QIJqsKyBGjr8fCf2b8FnO4q5fwRdftltFKH/i8T8lUuS6beqbOQDsEWrogdGGHRZmXsxCanAzimWmwzGo0w0OKIe3NGrKMjn/qJfseuCaLKSi242/2PmW7WWbdYd1V12BruQhnV1vl49s03yz705XG9ErPhuP7/fonEtjKhDpDYE0v4aYV4NmVfeZiUlVaEhFaXK9uR4K7DidQj4q2pzXWU2fXceg7ZAqc6lZ5kxpfRfs/EHPPvEJMAkWoha384lEQpyPsrlrc65d+q8X3wBpEYjTiGwukJX+wAbwvKSGBuXRd1JzGQwTvxlt0U9WA X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed711cc7-112e-4bbd-16f3-08d89379d2a1 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:31.4419 (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: n2YI2khsHO3b2VXRJS9QP3MnNG4xQQGFlKgsw35NaWJtPFM3gi91m5DymZ7xm1HIaxOyZyAKVJRezAXJeQHQ0VG5qcxuk3yMqCo3PvdVRxY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - add reviewed-by tag 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 Sat Nov 28 08:43:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407484 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=PJnXmfky; 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 4CjlTp57fdz9s1l for ; Sat, 28 Nov 2020 19:46:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 12D598275B; Sat, 28 Nov 2020 09:45:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="PJnXmfky"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 56DA282709; Sat, 28 Nov 2020 09:44:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 CD49C8270E for ; Sat, 28 Nov 2020 09:44:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AVZlONFn6c5zueP/Yeqltm4Msi7o9PydUqIsNRjza5R0NnYKR48zNlURNnoDACb5nJy47muDhsodk135R8xVGPkzOSA90j7U9gAtFpv5Rje181XwP3rTkkJ5EVf7cMXsS4zCdw7tUzn1VkncWKodwIEUlnEff25rdS9LgjHF6NAMIA6pFFYDOQOpN0dXubA5UevjmnpSfHm6zeaiviuYjnAFABgsFo5eJAyRxVpg1xOGOKkyWDDuCbKwppVYk/OhnBKUiBJRYTRDJqjaQnFeDTBx62kSFUxVjuVQTs7+sFHrRSAbVmLSyqn8Us9T6CbF3hytZJfC7z2K/FcYobAOvg== 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=K++jH5uV7B1GS99e9LUiy+qV/TWbAGnWqJApgRzGOos=; b=Nm0O6t1cm7vePLm+o1WCJLcZEQZDv1rsxYe4gTE62m9HTF2UDosDEmMmUubNWXdJbZLlnO4hIIUE4CvIuV1A29j5dvld1VOPM5Uv2+lEeNSTauTEvRbxXhXPz5dD66Ic0ReXHBQOOGgx0vu53W31l/ATTYwwBrIpZHHmCtP+cxysPMLz84p0u8BFpuRUnV2q1v6AVtZG+QVqe7q5lkXzktTQ2uxY9+b/efjRYp7pb17FXG0CeI3qkEQPQ9BBNAD69oDODihwYW9uMTuosxUvY0onAQ5O1vZFcdc8IB2QC3IvVA0CDohmqJmYLKxNExDD412ukemW8aRjCylhKP1Ufw== 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=K++jH5uV7B1GS99e9LUiy+qV/TWbAGnWqJApgRzGOos=; b=PJnXmfkyaw45Z6v7vnyXhimRyXikp14BmU+RcQl1C0jWSs+cX/JAAUBrMN07R+VbWbayL1LI3lrDTm4medtSK5aXnySoWKC64F+rURiz3HZjZXLiTVDCOwv7lkNqdwauffgVcY/asXIl8/h2McK6yyW3xyoyUNiA/Yq8QkorYdM= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:33 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:33 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 08/18] common: board_r: Drop initr_post_backlog wrapper Date: Sat, 28 Nov 2020 10:43:10 +0200 Message-Id: <20201128084320.10164-9-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a369a5b4-d027-4abd-801a-08d89379d3b4 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: wbyLk7UWR+ZLF9mRa8b9lnFp7h4g01K9fZBzxFLuDx7USbDHcdky9HKXHwvc+9vpoEw8hFkvBkSI2Wwh1uAXv9ysRBoqX5YBU9ehmKI+xyqcREFOr7NHiAVJZCtNqvvseEEbkWWr4GGHH++2bhJ5VnnWGryFDA6ba+0x7livh5Dit3KCaBmorlK5efVNE5XOOibZrKHXiO8+Z9wrJ+bPYVUZjL/+C8VtUv944tQ3/lGc5LzPQ18T9mHnGsOA7kb4Lo9M1Frw3WW2kwzKylVWOCCMZg+6mR/jzDlASlmqDPDQQPUhmNakfKRehsonkhdB X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: KMFUoUHgYC6yhV2oIPFXjqwu5NJh/JGJe0p7Qg+al9Obp9ZGiucieheswK8Cp36Z6as9NkicwFFSl1CL3fhgkPUg6aXZH5Q6VkfnuPwnYCGS3cNbudiVnBczV7oMN+jmUWL6RY6eQBivfTKNWfWqdJ3Xpour+0W0JGSQ7G0HqltFbsLHgaKsR78DXGXVW+h/Q04BG/ikvBF6z9bHOCXEueq4YpUB42hkBB44CUiCSZL9ph/lWj7q/SCfMWPCzg+Gk6d0sBoml47s++cA7Jx7pj3LdKtQoRkzGk23bksFGTrzFL8nXDCYxxAlLS1EjH7IRlQk+WGssX6HvCrjBBmYHVXSrMwF/WKcnuHC1jK2Sm+azYniXp1j1+/eWrzVu5COy0AcZVti6NNX17YTMuSooqXahf0Wn2Sf5/ABizqAsq/G+aF3wURA3Q1uCjOzSLjh32uEOAJit0rcJFNSTizk05NJWm4Hiphf6qIPSrDAINW/6aqABeM9+1rabHWORFnjj9HeoZbM0Ts00pTUwhYX+meZxJREGWicvdFiiwNhE0icyy5JIgbQSt16aKzPsu4hYMXAXWIUaH1HdDVliV05AojaxIMSFFhT5WlJJhj5IJgYRtL/YmussBzz8/mNgtJpT4GAyUyaEQNYj0/3EU8grGLYyX50i+79DFch6HIa/5FM1sMJhANzwLJmpFdUbGnM853DyTVdMJ7seNtiS74MhZIjZgNGpc/hQNsP3LzkqW5KixTWSXbpY/Mdg668OLbLpEZrEm6QXPOkucwxhWPxX+XmoM1FIA4d+WhWc40oa5zjqymE4olIueJ4eIE3QlIf0glT5Y0KJ7PsjNaReII04akeCd7fBhKrCHph5CQTwd+/dn4pKqjncND66edODVQkcZpmhQCNPrJly/zo8Dna8aK+qxjCLPOCDkCJRM0NoiDpX4/2t5PufwJnd2gs3X5hVR5UUbDek4hgEkoFtZQLOALagu9JXoqszZX0z7MCZ84umLBfcWLv+f3GNHXA5kDf X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a369a5b4-d027-4abd-801a-08d89379d3b4 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:32.8910 (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: O3uGma0bGTlaWfhIwZDbqAx1Bp8PCtKUrGYy9A/wklfNXJw1X2NhvtgVoVUQF8b2c9l9FMs4Fe51/hIZhhOJs9IhF248JVvgogiGs3ssiZs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407482 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=A/rLd1gk; 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 4CjlTJ1ml8z9s1l for ; Sat, 28 Nov 2020 19:46:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ADF6C8272C; Sat, 28 Nov 2020 09:45: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=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="A/rLd1gk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2F2C826F9; Sat, 28 Nov 2020 09:44:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::631]) (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 0022B82715 for ; Sat, 28 Nov 2020 09:44:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iD6bONnyEjG++tcxMlqr8lrtPl97TP8WRGSWV4i/qabLlSa0d+JXIUR6XzRXnT8dh8VZ7BOGEQphoZquhnI1Do/5ngDLb4NjdDx81vFhWoaTajT3cSobmQSPCpAaqgTvOSvFCSHxTpAC0rtyBYbVgcfjAXMRQdkbMqcOkkbdZndXsNyHY5XV436WvthlLHJcwVlRCz4HrJHm/AuBf+aDarQS7ivUID1fcFT5fB6X8iJFAz6eyrfmp6JcSuLuBoqsRwiVA4Qz2WaBGLD9GkncvbOF9Za0h2LjxmnAywSlF6aRhR4kOKU+wwJb961UAWbu3WZf4uVgRauElFmFi70MvQ== 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=/l1H9zl29OAZtxUKLDnLGI4NkWU41WSpHcQpn5z0Rfs=; b=RSg01Cxt9ZOGe8IzfE1HmVXV9pnZAOZCiw55g89a2TJhcpYVKc8Ip5H2vxJF/bxQ288pyVbz9VjUU2P8kmO1b+zT02k6f9enYcqMUHxSSMip6OR3RXbaGhdAp/TnKMMG7L3+y0gSZNyKth14WOlU0oI8EDuJXEEoe7AY7ZiF7AIu/NkCfCdzkqXaUOGmZWfMU/7OTGu5DAqmfJzVzNwxw3/2T/lGkNsw1UZhJ/TBvQSKOXrBHUfNbwVt/DMeJ3YafhQ0uTbzaiDo8yt6Tp3m64qetbgEnX8rZ5pS+J4YCmL+pn2OnwN9+nxSL9bL/7sqgyu3Lyn5Xb8CgNTecyMIyQ== 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=/l1H9zl29OAZtxUKLDnLGI4NkWU41WSpHcQpn5z0Rfs=; b=A/rLd1gkOps1SuQMOPAKH2XigOIHjsqBcM0/sd0/SrNTDA3zIrUT6DMedWXmBVU8XUxMAXO2AdYPiohcv00rey1Tr4o3+dhwHbc0Kje0Olo6Te6CZ3+FpDb8fgn+nKvr7Hh0wiuZ4ApNEf6HZD8WnS5vS0liXWUm33Hd6xWw+FU= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:34 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:34 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 09/18] common: board_r: Drop initr_pci_ep wrapper Date: Sat, 28 Nov 2020 10:43:11 +0200 Message-Id: <20201128084320.10164-10-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab8a9b47-16c0-4483-9a14-08d89379d49c X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: vEjrimkInr3SKcRxnrefONvY0I+zA3qg2E/1ssVlRsWR+DKBh8DjCa0Y6yXzDhxpupm9yY5hRXxHehnuji2//j5Y4iHL2NT/Pjg0SueRDVGa28UaDF5VHWMy71EFVFX19jP996DrxrSJy5xpyT9AG96y/23aYB8L0EXuZ6e7fOknKJi7UsCikwduKh5Zzq7erjLgbkHjPHFFwgPgK7y+uE+e5xd0+bSCFzvYg1PpnmXLF46YCiSBIwFKhGJZbZ/em/BBEAvIvhpypOmiBWnqtl9kcL3g3BGoJjAZqaZGC0bM0Ket/jYr1+H01hD+3RnAI1kIPQt1cHUC3FRx4w0IVw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xhsZa6Ori70ZREDo7ui6TlO5CP71yy3ppPh5tehLmBBPwWozSEOF5SmHHUm5d3l5MwLbrBEegzwlvPILQ1jOdURYKhYbaTAzlW4HZwqeQMU8vwxxgbvRHcQ+VUNuwBnzNTDvS+BBlL5Alz+u+keMs6wrN5/mDFhTa1RRPyP9kXFhCGN/IIQSWc4ivTfH8LvYlybVlbXBQczUbcrY7Z/CPXJilcFjlLDSwvll1Eq8P35WgfCjY9QvJubIjvk/CZpqaNbIsS1POrzY3gB3vIqMYU7MskZc9sM41ZO7HGlLh9Has9FO9enn8UsIXHyTT4Q+r85EexPZZXjWhR41ARq6AECYdGWO+xX67pxpoQvLzO3qxca2gJw7QUrN/a1EEQlCahx2wbrNeYrzHv/ou2PPRcbu+1MWRc1syffy+oQM2NV8R8sQ6/xjL2tR1FKuiTsO4+bPumCNIAyG0TGp/SijxOEIUt1Z39qEFd2o8/blyEYMy5thRo9KqimHV6AGvVwB0QYX3mdy8P5RmFrYkf0D7Khyj/BAzkga8h15Bb7tNYMckUU6hVPU2/YTidoTLswmFw8OiVA9XXtnA24UGOAz77ndFubzAbeVHrQmUj8fLnJm58RQTXT2rQwfE64VRENi5vhhBsywzVgFPI/6qtk8LKl6yq+Xg2W0d+//IX09BTGXHF3KGn6Nourwvm2LbGunmLXaKDZ1gpRCGkQ/WapOTYdUGSrU8JtIGwkqq5opvcpJNUqFAJ8t0AzUCJ/f5vXIVn6Md25KHXmP1o7OV3NHzlzIBoAkbnnOxg5m9zCtoZXg51Xjtura/Fng7i3mtaoFcPLTbxKiK86ksCTSWhiw+VpfME5zUiQbW82pF+XZr9bR1s53ct3Bn4lZW/3tzjLRpytgRI3usxXRWhtTORNb5NmceM/UDURsLABeBteqHHa88izY6/olFbogEb9kRs/g3SoSFCOCwfajee4eyZ32YE5j0luiWc3vvim6e0jIKyTffk8rBBdaLTsuWJ9763zH X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab8a9b47-16c0-4483-9a14-08d89379d49c X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:34.1773 (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: vh0cnAYJNZQjI/VsInOYph+ibqr9NjIdlqjCS4p3EQoZXmMvI67Uur1Nu8kwsK9B0Nv6l8tN7z6m4fycWc/6MdfkQfL64LbQ834UBWCbEKI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407485 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=dSLwRNHB; 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 4CjlV33RRSz9s1l for ; Sat, 28 Nov 2020 19:46:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DE2E826F9; Sat, 28 Nov 2020 09:45:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="dSLwRNHB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27FF582729; Sat, 28 Nov 2020 09:44:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 1F185826E2 for ; Sat, 28 Nov 2020 09:44:38 +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=OXcOIr90M6TDdv/wKuOOlY2w8jnlB8rmN2RRuwLWa4/GMg3lvjLENhwZZlYOSU2rNY9AoNiZyafaghl57nGvlHvYmpvCXpWACGArlGr7nNCVDQetJhdyTMkmWhE6ijSYnkMe6rn0UEDhL8+SKj4nDOYoMliNGbZsMiqKGdoOdc3TJEZuSRc8mkY0GZ50jrcrP3b0bw8tBtAcNyN9tMIA9i82dYr0rz6+z+keq0q9ypHVACqJkDOeTHp3oMum5RpWzEYeXWjfRU3GnsdNsdrcKwudcuiXGTxAUr3CLZujcS8k/zfDP90VKkPHACbOx3cKYnh1BZmSfVsB0M3JoSkj3g== 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=lzuTfFxqaC3ZBlYyVU+dZcgxBskEeLptG+CLKP31fTg=; b=MP3puiTpXfWUVqMkWJKbSASWd+HvFTFwv6MdxNwFU7/Siuu+xXY1jdwadhTsP8nxmwpr0t7WP1NSR47u9GU9yFa79vfzlMdO1qzLXf8l1z/wM1f+xTauQZjE1yOSXgywFTTfEUiEQylk028wxEqebo0BG85H59himR/A4/EKMVFc7SL51DkJqh1f2BPFCJcudcQSsV+yqDbcVDf/B1SuQpQbrEEEIh5+JEu1QYWj7DI46my1tqX0XPe//vo7r7eluYu8x+ntD44W9nZmqIO1/zoaaGxHZEmoyhcc/U5coOXsuk3PRCxCA3b+udvCOE2hXAk+wcV8vkPLZgPQZwFWzg== 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=lzuTfFxqaC3ZBlYyVU+dZcgxBskEeLptG+CLKP31fTg=; b=dSLwRNHBIIgY0r9Ldh2EypN4ASJqdjJi91VwGZREkOCbsGORbMLPKEiUIlLdGGeGXRV1bV8rFxmJ1vZut8xxd4rmTDQ/yxc625zWjh3AydCDxGf+nP/A+3MGxHyFrpqPZGe3uusIrBovDGT5dHJNPegjbItbRh+bbqvIyLJWkdI= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:36 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:36 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 10/18] common: board_r: Drop initr_pci wrapper Date: Sat, 28 Nov 2020 10:43:12 +0200 Message-Id: <20201128084320.10164-11-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c066b369-41f1-48e8-4739-08d89379d589 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: hb1Q7urNNgDuEEUaceo7r5lD8LbXD0iSmuBiZnlYaBeK2z5OcWHPDG5sIgRPOO86PwW5SNnJ4n0ozJh3TUp/EP1ezk1r/yvQLD7y1z1z8pWTGRcDZI9q4fYHUFU4J227jucsQ7IRLYAQ26p5vjrZWvcHjRBHftuwPplaKqwDcgF6GrDys+c5Pphd22fRxZ7mLRb2pSa1GF/rqI1aPaSYwTKd6I2Jwaho3zUxZUoKH5wVtPFMRYDLC7xwQmOPOAI9yLT/3vx1HLyiHT1SiStk5m1Vi9CnNQTdSD4x5CTbZhjs7/PDjKmL9n+QVu2pxmzwgg+ETiLKnQ0833I0kGlHlg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: f5kZgRBd0l0Z7axWUEc7b8MYmW+c5XBkq1AyDylwbP4a9ZL6JycqtYFEFkOYJwj9SGoqPfupgkJP2Wb16czfg+B4+sItuiVpFtebvUcW1yeqf61zBsTqIzSZ4A8aeJasRJKkODbIB+j6wG9lfEJmFzk2LHLhcur/L2McMZseERJRFCYjXaUP+bP0fGmxmFmp9urkLU1FGdoABZcFgFtpbDRK2TklDqHA5k0DZ1bWxSF1aNwoL893ORYCpGNLxismNdkXq/TCoD4c7cVkFXYQmMe3leKH8h3IgBex8ylaobxh0+wHDE4CCNcDtDBjWjqLl915zhv/YSM6AtFj+SufKO7BGNQHKo4LDoNtPsx4zemcW0A7nxE12KgzZR/jg6Cn5WJje/6ci1q2DLopIO8NPhmyUCMI4aRIuoFZfANECK2SD3gKH/eJCrcF7D36/CwIAgdP9KaSX9j8Y3h9qk6GgcBb0PvcG+WPm0SlCZsw+M2teEtneK1e34yoh7PwLF4sQpUmDHhrZr/Fi8AOKNcvQ+A4ItYK9QdIhpJKTjEtPO+tOBHs5315HhIrA0YmTbKyzk5LBHA2b6cMHnGID9JQECwm0XKvlawca9Zc+z5RH/8+ZuQFjetimj/AvO0vDSDrA5CtojavLStXjssFoApkTzd5xGWxCy62NYWZUf7JNsyFYhYf9VuAR1egZrAD6wHpmvmTyJRXD8/n2LManQMeqPdhd4GtQgE78ohocO/dZ7V5ZchRIgKUHtiiXtHNHTsf68rgF2YohTyFOcGKzMl5uyL6eSIm4ryHbddHP8FRacZnzab5bg/srZ9LPiM9lfGs9C76sdFAQoCSlVEm5rU+55XbvlIQ7OTbH8M3tGDyXAfSSSOuHQoyjqOLwRqggyirJBplZolZkkSY1QQZ6dtF5p+tcDPEVFLrp+ehIATLnZbh2Qp3yzkYvdhuOO8LPuwVTxqU9Mb71q1iPIqqrh5wVRoWoyZSrd54mVmm8s/7/sIkxY85SWaNIeb6bszCupRZ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c066b369-41f1-48e8-4739-08d89379d589 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:36.0192 (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: wC3iZBa+Q5zZNzQKeM8r5aWVTmS04bW8M3W83GqGGA+FjfsCnfG0YLak3K090vdzBepDrrHElHMezGI/gSCfrl+zYl43ScaOeKftufIiMJw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407486 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=SUOQVNa8; 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 4CjlVH22qLz9s1l for ; Sat, 28 Nov 2020 19:47:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 688908271D; Sat, 28 Nov 2020 09:45:55 +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="SUOQVNa8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 666EA8271D; Sat, 28 Nov 2020 09:44:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 F229682701 for ; Sat, 28 Nov 2020 09:44:38 +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=jfzce/+ibP0TYJ1KG4vQ3iUKjn5Bbyv4EW7FScyKlm2vPhA2DB8sju6susIEhMvonQPV3/32rLrEfLHvPC2lEcynfPdHvaWFMC0NU4nh6URM5u1MpOMW2zTqibI/2WHNJZEGtdiZKZb0AcmBQJFxPJq7Qk3LwIAaS0UGeYyvAs95XjOJjsxTKt/+32i4KtE0AxLdaNp9M3mhLYYJLTuxTTEGoDcI4d+QmyllUb2czHNJcHwOrtqDx22PQex0iSR2gIlSlYDCE0t4Vb8A9fTmatz9WtI51UHHFrUfTBU4238kepjBzSBnrv9NPOcx6xVZ/lmnjnTb72A2prT/60vCZQ== 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=OOVL7w9VaaEpEq7DKNnjzFv6JSgoN2LtrF3Gd75g+qk=; b=HUVFzxMSXsQ6vMbf7lNlOGOtqnJvwz2u0HX6EHbGIuzqd2QyrqF9ALZ4tRFP/aVJcq0GPFZBrFQQdmqPRmWl+l4RxnHsdZ2wc6pyI2BtqgVY08QS339nbCzRkYl+Sk8U3Rr05rFIGIVKPHPJrQ/qR+eUrK7LHtZSM4Hpgld/sOvk36bDY11058vb0JOvm27tvJZEXz5P3kyOS+59RU9NHfKLYdyAEha3P1xo2jRF8PBEm9hcfNrvQEQ3l1bBn33fp7dUbbPhHO/uXwVvLy7FRtX2S2IDo6B/FJW9Pqxu4raG0CciKiS01IXq4vW1BbS8x+dAtCM/NXl26FpeILxA5g== 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=OOVL7w9VaaEpEq7DKNnjzFv6JSgoN2LtrF3Gd75g+qk=; b=SUOQVNa8+K+UMv3dZZMQcsNibIn890WaE/wI6NoUoYUY/hppBYH6n/6yXmWCwMvPfklXCzXXLBC7GEGnb8XOaBR7LZPKYvmAlqZDHcOSwwpHkNUMcWxQKnyhtOX/4nSoA+5/FN2/KrXGgTvAR1alrWcuOpDolAmhZpgPplso5XM= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:37 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:37 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 11/18] common: board_r: Drop initr_noncached wrapper Date: Sat, 28 Nov 2020 10:43:13 +0200 Message-Id: <20201128084320.10164-12-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc1d083a-944f-4768-b383-08d89379d6ac X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: Bkx2D4YgSJvx+dmtPDnEo2GP6Nwpq1l/BgucGqZL9l1iGCie3rUyDc58RRSJhpMXVqQOSvuaGJ5NIQNmyiJoZL0XOxzqxOivhciLQLOHAGFslTL/OiJWyjku23Xqw+dZsEIndfwSqFPbBXVsYdcCjfD85yl7/XBL7JqpEEnze0Ip0kSjqpq/JZGFwvUG4vaYh8PsG2QQPkfXgqy2A7eQAMkkQUg4CfzirPG1SkLilo5mlcjIDpiI2XlMtqs5yfNyJm8ZRFNayuH1uLcES1grLFr229g9WpBCOPWzTLyuoqmcOSLtUTSGPH6QtlPtSTytaVQ0ElwyPIRoRdb04vjhfw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: y8sLOFVh+Ei3kqTE55T6Erf7zl2HQZ//laXolB5QGB/YRghhN/K27yS5ww2v9+PlBLhzGr00awQDQbUH5OeJLpO8Ga3EFtgqoozh7X/RIQRaZIoncq1WVfpYMhZc0yDcbP0E0v+fmj2A+0YF8c2mrM33gYur3eJoS9oiESPrcqusYTBdABUhYV86bcLXSG1DLPPPdrjD1raRD4/LhRyFXHPTymtLCFsZUt/Zmlz56eagBJBvh8VSlsXHYT2915SxADCFTR8PCwXdubxZN4faN9X8WR7/MrCEM/Bl53TlkLmnwNQMEcgnRund8oFix9A3rnku449KsvWb88bygxR07YfI6cx6CEwuvays6hbjkuyDqQAw86jGkqccmXrUQcWo+Zo1xgYQ/TjH+Qh2y1C0YlMIEjC5f1o+3zdIo9U3Mrj4SjePbmnvdBY7xpi6oUhoKKd0csphk4/gSpca3U/YK6ZB7Zcf3yaZ40GfcqjewPa1CLZipD365L7GLch8VF7j78jMPCwMqOVT00N7+WW5YxBagYsRtHWGnGFBzLVLiYkPTtNSewnPdqi1GKkoS0VAN9TRaufCLBViHJ0eE8sSgILQy76Is/K9i86m3fQVG5WymJ6MLuQhDKydDl0i3GVex5RMcoH7yxUuWZEv3+NMkzGcNlP+QH3Fcxg42dbKUCZK6RbxMgNcHNn2Kos2XadadeJRsx1zj4b8aptHa30Gcgn+VmcPp+rL8BkyITYxsluTUZvNkQg9HtQtbRqjDISY7evPtB/waTN5ZcfFhpTOI3sx9yQznxUteMH9+pgREyejFd+VQjcz28xrlk3QOdT8v/LulZJMI2lUC6h4k/w6KR8VcogBvaNI8C22Ldu2LSPB4iAeBqvmcl6nFraWTUdMlNy9cEh8hutCC6xnRtZpL3GbFIdGPhXZVw6RnnuDVDyBfV/QVfWgjOxh0IA6eEcK2rfgbpqaeCgqz5OATYR9MGZT3YczM6vuqx3hnvmUt7R5QkIBecfGFmFnePOZdSt3 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc1d083a-944f-4768-b383-08d89379d6ac X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:37.6442 (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: TN2ippaZUiZHICUdRHgSYTsIT45SFBA6zpCLaKgKlbXFlmqLFlsCqpDc3XSdN+KvdxbHjscOueaVzC2WP4s42AubO9WWHwDmeORg7mEIeW8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407490 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=HFIHiIUT; 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 4CjlW76mlyz9s1l for ; Sat, 28 Nov 2020 19:47:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 884958275D; Sat, 28 Nov 2020 09:46: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=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="HFIHiIUT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8DD9082724; Sat, 28 Nov 2020 09:44:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 DB469826F1 for ; Sat, 28 Nov 2020 09:44:39 +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=iHsRQ2Cd2m3ozRCvPMroYvcYFHmwv6n9Qr7ixvIPMGsN5eOGw6r4mG41ueM7ezNIodFyJ/Nu3co0OVc3UvEG9setxFei3pIYGRCFZ2VaXJTzS7t3oPIacxjjvuXYU81/Qd/XFd5PbaQyCaLRwqUja7Zv31MmEhT8h7KdDO+oPcfGVcDgjCwyDGnIDsnAhAdIC9i/1QioXkLapDkfhjO/4Eyq11j3IOxO2R2j+3syjjXP2JCJHcpZb7AU6UrluuUtz+/29jMGaXeHYMKYDJRIMjZTb/BlUNXy0Uo9Me+ROzUmckMnNk2S80frFeT6I+zO/fBnUfCZuj4waIV460oK2w== 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=0GFPqllZ38+eQMAAu510UciyFfqSh5CEbOfLfGp3k3U=; b=dUHRYtdIl9Qj0S59XEgGu6xETo3VbjWVmZq2niPWX6XieAjV37v4rkl4EykzwJ8OFHhi/ZIfdRJql3QoT0/GhuHIamAJLp/4N1IpcqgqY+UT+w9b1NaznfkejEfR2cvv/euE4BP3i56k6XHqCnn9u/a5EThesDsjV8d5U0j45Iu+z21Hte0hDgn3rzRkNWjfwi8d0fIehKHtGF+kc/0ccpYk23j/85usT3z8U21GE3OunR3vMJIMaO4MLLs6aHeN5o6sdJueKdTN1WRieeRW0jXoeiyrlnfT24VSytM1w83KzcrDHf63pmx5n9cRK6gTjhXmyCefSFTG32yWtz5Mng== 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=0GFPqllZ38+eQMAAu510UciyFfqSh5CEbOfLfGp3k3U=; b=HFIHiIUTrWlYL7Zv2LJwbbwEABJJ3QYxeC812HLgEuBcFqxtctiRwE6kpsbHt/dCU3y/EXrE41UIaOVsrbopeSTlfMBYqBp44ybRnSIKrZz6CmS+495M3t1vh41zuP87r8eQx95EFSZfqdgmkC/XbsuW9OIIwitu0UhbLGUYyJ8= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:39 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:39 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 12/18] common: board_r: Drop initr_xen wrapper Date: Sat, 28 Nov 2020 10:43:14 +0200 Message-Id: <20201128084320.10164-13-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab7e6ada-4f3b-44ad-0036-08d89379d76d X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: 5c3Hljud//k98krbB9v6odL3ei31d4+by5vXTHeVWwIHBoELsOe0BIsTaKb7oOQCfivX+RrlCcY5KxShuZdlum2vu2WjOpyfUUrQhSRG045dKVpAcx9bYsrY62aqHqKkMedCL0RXwnvBmKTFD+i2j0y8XTMEnLXryJ+mvBqIfwYUAtyLgS3ynr6okTDyPEJChsPETxesHwnJ48OBnf9ZYfWUPm1hEAmPq38R+HsCZ+F5l09P5mfHcC0OWKZYlVrPbDnbE0g3wQ1s+FNqQPqh1tgqCcNEQDOqtpzcP264G0uV+dX8n3W9wJUEUXBweTRoJq5yBt/9ts9nF0PlsjfOGw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: yuPnaKQ9mxqlG6UeMPdgYoBJ5W3wN3VPdtClt7q+plCZ68qdH2W8VonxdUgWlXS+Ye9IjvRJr6VwmbeLzmzgzfN+e1PXd2kP2pY7byXv71d4zET18NfFYvS2BL5K1KwvHUO/C9Hm5nFKB+4ENjkds1Dx6GNlkjk7xe43gNlptdPxfdE6rq1As814Ru0P0rJIDjx/K8UfGvgx3SyQyPOIvxBmSgz5x6/mntNlfbMzjNB/AMZ2HE4Z3TtQgrHwYGlEei0HLnDvO6/f2gbXlKjhwDv4Ly9UIIHKwabgA5D27ibczikQzDfmzqLNpZTsK0F2lBJ3Iu+ObdsB3pBtOm80U/6Rf1VL0ph+siy4VUB7OwVAcpqpCfIUtbQkPyLESYdzTe1Ay3WYGQ3z+opvttfv1XvtdxViVz1nAoYjc/9EZsGMzEwb487sKcVcM19mKtjlyA6NUZQ3sJB5QRxzamFXb0iDheYE+T9+5XkTTDuRFSioSbPHlr+fQUfvQxc9ORFy1tPoPsyMsh34c9ra8d1PkE+9vB5y4FEGtmCwA2K0fTH1ZBWWrM9vgrr/bw6Jdo1Mby1tgaoGGB40q9BjGobpztS2ShiXZh7L2grYap8Cwm8NkXl/pqxoj3JJ96pS08XkMu+WMN+u3ag7hJasQhl7noJeLjy0RO8BA3NakUx0S5ryVRaRZH01AVrwTSZHX/05BvGnQgdx3Xhen4OCvofK18PHsOQydYnZ0t1/XhrvldSvv4pwM+ekeBjvi1XK92zC6dnCy8VKmSgUn2n8xVLetRVh5aO+Fi4YvBu/o6WK0VyQEin8JvpTRdP2ovqz0io2YhwWDVE3IgYIlNDwJMz74dszJ5i5G9qfeTZXNcNdXp7lKol2sCEYzVhBrMavd7H5SppAUmaipeGPRfyct7BdxcHRsQ8dSj6J1wrk1iXexftX4BhXMoXUEP8cERwibKACfNULjqNBONVKPeivErWxHboIRjuOiIvpoM2MxtYuoL+B4MCqyMYZhayMOnGoWI0N X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab7e6ada-4f3b-44ad-0036-08d89379d76d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:38.8995 (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: qaax3zxih0TToum2tU4TFRdB1w0+ntWVQd4QYP43Z6mZfIaMalCYQv7fynfSDUrVYPT03kjj28AXrHM8ZuQgJvbiaM/7nIGvmNv1cShyftQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407491 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=WMnbPQLj; 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 4CjlWK4TbVz9s1l for ; Sat, 28 Nov 2020 19:47:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1D2F8277D; Sat, 28 Nov 2020 09:46: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=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="WMnbPQLj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EAD7B82719; Sat, 28 Nov 2020 09:44: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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::60d]) (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 6CB1082713 for ; Sat, 28 Nov 2020 09:44:42 +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=Y0PxN6YWsRRka0wyWMct7/tFz/3DYEKnE7CF2XBxFs3Ye9ETuYKh1XDbQB84pXOY5QwV9rLygc/Zkkt1+OMVjs9Gn4R+SdRDH8Xd2NI0tTnsw7eOl9JOGkkNSniqGCU5yn9DG4/WEUPpoKxtTPRNOXwU7FCLFbawc7c/g2LQ8VPHGJHLlIzjd0SShMxMjQ9ZivuhTemCmCd4R5rMTtlwDWwCALMsFnuwnMjbgBdD9+EF+zMRPBNvDGCgaT/qRyivC3TaUuEKcwLWDA9kOAghD8LpD4m1BqDcKm7mJjXx2loZLFphZ3/xuYxMQZCz0XM1kOe0inRlznPN5xWqlpAvHw== 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=Q0agyWStUtr8rZgkcEoBJ39lZc+4sPKqV4LlM452lQY=; b=kx9N7XmVLEQONbrtAXHgFnujb4AYmfDEJeE+iJqLDlAmDCxfEa51sXUTtIdVKJJz4t4p/pHgUwIa9BTvX+tzq0k98AZ1z66/rPECYvGK/9WaiRebRREHf9Wu46QsRudaHDjjr7PlghLkdgxE0zzQ+7Dhoh7zJr5CrY08rI7qkbjcyQhFhwNMU7T+nMO0l1KrMnXjVEco1d7FlN0/9kfEkFgAD5BMWVPr7LfLvxEXsJLSVZKqllXCtrp6aE/97VMJTXHT/9Q3VK6Z8CkfCiq2+HTq1qJ+za588PH0gn3r9IQDHDMdAL9IslR7qXRm3P+XaINg/nQqcrfWgmfTA9L9IA== 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=Q0agyWStUtr8rZgkcEoBJ39lZc+4sPKqV4LlM452lQY=; b=WMnbPQLjiFDOpVfRnYn1eaTBjinETa165RlGH+f3iX8X5Emp0vfo3PL5ZltDe4C5CnRjmw08qJeuuKZdeHq6cgWDpnysBWmTixLy7bm8g7YF5ONjYmqXfjeYJKx2u9W7YJMiMXG8PbYES0+xs3msXudShQnFaaK/cLVsZDPvvzg= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:40 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:40 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 13/18] common: board_r: Drop initr_jumptable wrapper Date: Sat, 28 Nov 2020 10:43:15 +0200 Message-Id: <20201128084320.10164-14-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5bc6b8ca-1cd9-4056-8280-08d89379d852 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: cLjlUh4P8JmtRnF4I3suRy9f7yrbfJIrpge4NBYP3HX7L0qINsjx8SJU1GgXZeA0/YkxRe129MEdsrWm3/9nFIVdcuF/WCJle6Tv9JCMIgdmXaFHrJ7GGjGa6feFmQT0CIpRQOwz/kkGW0c4ubQVTyNPNGvlaAUecQzcokO3/thUntbbbwsTU8+f40AXO+7TjUsbC8Iqe7G7BpeDLt8M/T12qT5THum3h7vp+YEC7mFtb3lz33+LKZnNuTvobX5wM6pLOkPksItK2ob+2paNw1eimJa3N94mws89SdE0wof7OFj/lr3jEl2dcOSZQig1ylAEMpqnfdZLMBO7XoyFsw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Tiqf/1pv8sNismzSz994fZgZtDW11G6kEod3YlSwgsoL9FCT+spCWQ+1Z2YxpQk5nJFlS3uESE8Y3s9iPgNKqtxnBdQEyxdu1knjLsDTUw2v8PRz4V992SXrgaSt3up7/utJodGue59ufYrVhdjijJ+5T09C4MI3t137BuujIXwtEPJq0M6EMjFywS1Oy8M1G+T0EakXNBBRjC4T53yE5rpRQ/fx24ofezVBirGByTxVdKGBUtEIyQrk2Fucg+xrI1Z3R1Gw4zBOnWvX3/pw0NejmUKfNbCJSIEYOq7tjtmXMYNZxUvBR8FK+S4gt1BGxelxotebqle4xTxlq37gOw1o4s7AIhtYMxCmgy7RQa3dYDnRGo7gLmjhxJpkWDPnduJdwnZBlN78YOZHpQ2V4J202JDEGsb9SanucDu1Ag9GFTUd2/UVe2IBaX5CZkgT3R0nEAH/WalWWdkns87wYOlm/cZSw0soIHSaGcebGGmxdEylLMbyvy9oMF7tc2oyoPpNIo9n27oUl1W3n18mE3xeGB0gN0eaTR3F+5JDyKP1zcQbYYQF3IXPgNGVUpnpSyvXg9j5McrA6GgLTvj/RMvWJqfKOb40Sqqh2YTQ8QSAnGroASGOfW9jZjMA9d62HKdUmLVYEHEZAdhM4mMAsUCyC4sVFzBHe+oW//I1Su5L32oU77DURUz8jwSmOD8xYGziTqzcQRex6GaozTmdDzC/yTVBZniz+Mh/KUHXYoIDF7PEbHv1WHXVfEhGvqE9gGSKudahIt917NXdcBEB1MXstFnzgRuhygVd7lSckXbzjngxEeOBUeihfWSMK6msZic6eXkNR+1hy6wRahmws21WFbKY9TwaH+Asfm45jwnRBjRgHkNCMFb+29xLW9HMWhODmXkcZwaqZ+IljVNVFSmvXdsAWcIX66QPuqGjZoC4KIomF3L0Yuw7uySsxmueWK8fYMZw1CaPpaeZIy0mrgHsWtNsWLoZs8WbKQ8Fi0S5ZNRSMz0XDvVoCGCAQRA7 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bc6b8ca-1cd9-4056-8280-08d89379d852 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:40.4326 (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: e7f4+0zBbgdITJ8U1GvhOPmf9pFBatrNPjOXZDKgSbOSgSh5SGom8Wadfyu5td17eq3Xe9Zd5DPMnqzS76xfNst3xjnRTzZNBZAoTsCf/Ok= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407487 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=MDUOc2EK; 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 4CjlVX54Qpz9s1l for ; Sat, 28 Nov 2020 19:47:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3AD168276E; Sat, 28 Nov 2020 09:45:58 +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="MDUOc2EK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B3DDF8271A; Sat, 28 Nov 2020 09:44: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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::60d]) (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 465C982719 for ; Sat, 28 Nov 2020 09:44:43 +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=GxNIp3rl2yO1j83NwNNlvyspMVlRFH/62BI+CQxA5k9wZSR1mNA3fzwJt7rUn/yNAnuHpCWb8SY4FdkxeYQ0+U8Zw+TajnGXj+Ul/ltXJfdxXrAFencnOmT6y9h2BY9cJaNhipR8cwf84doDMrHrN2NvTvH/bcc1CEa0btlrzo3tSnjErP09p5erYSTQmBwBI+uCIPCvqWRfqX2Cd4Zocvqog9Mum+1HMBzp1XCxAAAoeaTk8EA7dyIPOWpkhsiFn54EjWBjo3lCJL2eTX8ZSd1ydvZTEwh+gGtjQ9jI6Mlmiz8wUU6siZJU4cq6+aacqdtIlF3kfIYU2g5ii79sxg== 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=Nfp7qnj6DLUcPGWNlux84/Kb4DpWkjHCV9wPhfO/qHg=; b=VJ6kEtwMr9hKErovbMuTAw2ny78ORTO0J/Fg5cx/3PmViQPn7SIciXC7pYN0WSUFrOVQFbGchUp77SPCfVXCQdzstHyGwUlfmILeQhjzsU0lknO5ZLj/9tVCeXLG7YlSt+PrCYG+4gPdK7YOXzIdVBPoT54MPXlagJFgjVVUUjP/Jxnf/JGKWY2nGHuEgsj1VauJ0fpnZnYsicKm5yOyIC+ciQH64yUtRPGt7j+FDsNna1EWnDNGQ1fneq2P/1Q4vm4xSuIBJIvnQRd4WVUGeo7exVpVZHRF/GaHe13l5OnsjPhCojszbGVgOVpewSE/1EbwY++Dow+/xJetI17VPw== 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=Nfp7qnj6DLUcPGWNlux84/Kb4DpWkjHCV9wPhfO/qHg=; b=MDUOc2EKPdp5jeUGELK8TpuWQGFpbePTXt4hvYs005dIZJBv8/K3BwaiqNNnCbPCSUgkrRpYYhmTZ7q7EgH85B3uGUfRjYcnYS6zrQPT+buK9yURI9se2dNnmoSxQJSym0u/TjOwokL8igh4+qU1WCmJo1ZguGd0nRUEIDLtx1I= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:41 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:41 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 14/18] common: board_r: Drop initr_api wrapper Date: Sat, 28 Nov 2020 10:43:16 +0200 Message-Id: <20201128084320.10164-15-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff74bb7b-e123-4c76-51c7-08d89379d90d X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: 4jx3r3Byk0Hy0dgyFhELc34Hp3fXmj5xmkHQ481eLC9cGikvRySBdAMzXTufaI5TJ/GGuMPd6iU+PSJw+PZJj/99RZOa0pXj+PAFxQp9YhCKXBIkmX+nrmFmKjYMCtSEogkNsLAp+dxxDJyjKKVHm0SxAZutzFmKr+OcF1Fjb7w4H8uQX2VKSZwISHIiZ/Szk7z/u8oZaLhmB1Qku5BsLqZjHLWMBrAxD550Mld/ox524z3RkRgw/FQMtbmfNKIgbi/0LMAPksbBu91tqqhIc5JA2zt0/pJCHU7p626lLNsMSGS5kUs3xwSQYqNIEVVLVQCrmL87FmnVpgxarvqcgQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6X+Q+yvrl05Pqf2/qLQGEijrvL1NKP84OHFWgDP+VcyvvvivwvABanCrPvgFsuXPwXDFzBniRoWTsDR4axxFhMt4Nud0GveBJUelcxrYSO6tu0/mU9fuEtcY/3WjEBFI/gyMbo9X21g/eRMC8iCJyQmb7d2idHCw7q+DzTI8zVi0GZcl0Vwop1qRTsj54eMuFKUq+ISsvRkb25QzI+zGvjyqqldOujw6YfAdeoTH2DabOX4cS3u+o6TEiK/YF/mgTRkxZDcjGd3BtQAiI4cJfrXPbrxHPnN4meZ7UVqpJLTa+p1rFZ0lhR3i7A7uXHP1yDDrx3grOPzSzw35kCxblUVBK+4cBVmSUZVV/Qi0IIXIGkePYxeUoYzxwRjRGQoSyalDlUwI8LWOsC2H6Ceg7UppFUVGZt/XLjGGFGjmzpMJqZWB0IySC+4OQrkxrYVxUV01z5J/+D4G0aipNDCxps3Y37YgNMecYFsqDEJXo7a49gd1h5n4V1lkJvV9cKQmUm/xkhz68kz61Ina8PXohhFzOUALBKPfQSCY8Ev+lVvoGbIuitNs3TAfEz7vwxh1TenOwUnCpenrtsEFrjRX8u4AImxZKIPnWzaMRSJmxFowNE0uhq41FxaaUmXklbxxyQeTBvK1BrIv7T9PHaEBou+cmxfavZ07/atjbdH9WaWljaIsDk4hsWLfvpa9NHiZMsrqcqiRHDJlPSVExeX7b5rKaKl2uOPHN9TWcoeLhGE0g9fmw7/AKUgIHxMnrz8eSRTA4A/H7vicxA2PkuMACWEk/Dl31+rVeMmceYSwa5CdlaBP7IiNua34Ci9/Qk8HZUR39u8QjZKaSeSvGOeeLBF4KZXdEhhQoG+9On6femYCMoBPeGyqbUa1lXPYOUZ6x53hHzM6j6s4sPdhk5L47q5js/HrJ4Zc+tsAfGitssfI+hT/DyX26QV2lvpzW1xVxYYlm01vfr6Ed4s27w7CJG6IChnUgimBiDqRFtopfnRB8KYDQGV6G8GpSzhqhUyp X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff74bb7b-e123-4c76-51c7-08d89379d90d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:41.6348 (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: NLJbrelscWYmxFByPyujMoJmIzJuPwSD+ferJEITEouP12pSrbw2RE2ozFnlXsY6uHkVYHSjBJwxZLmefhXBg76/zTg2sAVrowpe727onXM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407488 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=VlXaMCaz; 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 4CjlVl30Qsz9sRR for ; Sat, 28 Nov 2020 19:47:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D305082775; Sat, 28 Nov 2020 09:46:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="VlXaMCaz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B62782713; Sat, 28 Nov 2020 09:44:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::60d]) (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 8641082701 for ; Sat, 28 Nov 2020 09:44:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JzuBG/K/zg5E8+qg0ODHZdpRzwiKY675lM+QuCUYlKBiVSZIxjU12NuPIObfmCnIxXRi1QulIYPXBqSkutXF0ALF2iPbKwIRPMGFcnWLntoexbfgtuDUna+rkp8QvWJ4X6f5FYfC/CoMsKc6OtuTA4A/N/PRySwhloTpmTUVgI6JPmNdvFU4TiH4ByuxljCo8YNqFIJfQhf52+5OAPiYC2qgpBf/3D6pZ1owMNArr8SDkVZzICKMfL3ydhzvzZ2mbMM2qpYA94o1rBR+eVJqswZu6d8Ch+shv2ssmHwxnzwz4Y2LwZQO0Y8bkUYqFqu3eIhr2C1eVb183bWqwaRtjA== 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=4AgUiBu1APvTpQMSEA9rj+cGyKEbDAHHJQdkJTAOeK4=; b=K1vcfq7363LOSpddD+F1M042HeO1sgWhBety5csQ4aIebcgPkFml8C8EEmVeqfD1URHVarMGsH7z956VUgqmOxz9vlaBYXmgZSCVpIS0CWyJVzbRpZWZAkPRxKcLRvEfpZ8gjGlUsqn/ENYQtHhZ4Unzad1FoysPf81ndKtonRpJEzzcHFZltLNAsX7BrQ3GrS9sHW5jOdtCs8GkQJOhr1DCso40a5ZIzFVi+hEvlBYnpHRGdSERU2JQkSqYOj8ncBmX1MxCQhgtHQOcdiayw8sVjzgPQyslY3CiG1PwbAf9ThMWlYNNuoaZBOxTquhLxX27SLrnKWMcSUbQDl0LNw== 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=4AgUiBu1APvTpQMSEA9rj+cGyKEbDAHHJQdkJTAOeK4=; b=VlXaMCazF4Cn5DCD7mvLwhBnd4NjvxfpiXrnEIU1yjEgiLbYy9udJHBMTErYJCs0LtjX5mNmuCjTcQuPZ8Trx2ofmg5YDmCpfLvvQTfiAf4t5ouBLP5Gxri/kkxmtAMd124n0CcnvR6kLvYanJP/GpHaR6jWY3foCWHPlJv/nAw= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:43 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:43 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 15/18] common: board_r: Drop initr_bbmii wrapper Date: Sat, 28 Nov 2020 10:43:17 +0200 Message-Id: <20201128084320.10164-16-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7538015f-09a1-46d5-1193-08d89379d9e9 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: qXpMan+uSjzoIaYZTRbsgJr/BHY5+eJW/3UJLUY0O8g+OdptkM6amvFrl2D4hw9NvH+EnZ+RfomfcdQp644LsVysQ3xRFGq6WAF4XTmWbPHG0d/bpj5Naz8Z4tIwuAK/1RLhE2+4Ktu/evYiZxcZYJDBmMTatf6tfnbNJVnmMcg3GV9978TU0O1nndrHcH6rg0Wya0nLQiEDxufY2BB3feDp36ck47fNwP28K6yxw3CkxYknUBFsZxj0dQgvGT1OQHnh8EQveUgy9hWzW1N/SuBMf9XzOEfkiiM46xVIHtDwRhT4/GpoPKA5nHUfRAwW+2ZMtCsRILRJ7ZGpLtDlXw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: TxF3YPGaBVWOqINf4uDgAqjh75IHLcVFc8SLOYeYr/FQReeMM/Mwqifh6m30t97pqCTBsk4ty4VpjexcVGjYvXlGI1Wp8GDgmEcZZKlhsjEz/7mu5dbbuR3zRwJdT29wRbi1kOLEoSXVbd0EAQbr18d7RZNCtudi9zik/eT+77J2P/EbpYrYmg4Yyd67CJiQjb0br7vLikw2hKvSa8c/r4PtXfyBjVDjv1yBvLWHyfn/Em5SALo2Hp7H80hS3U9/GiXEVURLSxQ8HD8lno9dCN4YYnyaSjIpIs38MGsIbm704NAbioJViNCDZIPP/am6TJA6gQJQElvvHM8btCzboXyPnM9/oRpZZQgOgdgPhERLFlLGfn+Z/BUWxV456RAtnjDfRGOVeg761q5W8H4tztfB9Hh5jK/p2d5JX0S1PloXCLS88X4h9zebRzy9FtJNZT5bcIz2A8kXOXV7eETE/jCbfKkwpcNtBgtoeYhjRd8NTXz6S9UXnp7TLGbxKsb/XhbF/3x6Y2tkaFcXwT22KG2ZiWtMGRJMGO7D7bT0vXnK3yxZzrRyEvgttpq/7AcvXIJj6tnE0/3jKUo2yxBiDie/APvzI/8tROnGdIlY/uPk9ZPa5w6zRc73vWLUeuz1y/AikYaVGrdH8pqtMNpfR+loodDwdag5RnbP1EJs9X6OKQvAVDqX5wrb+m6v1gWocuJEvzbsC7AnRNrciyAvwjsCsXImPB9HA6kjjjjkc59lCNjcjgd/c7xjvjc3JCd4bdG2pUoUgl1lSbiU4Wg2WB81DugTU/eWepM5oiFGLep8z35Dqm3DL3ZPjIvm1y8KJJrpnbdfF26MnxmQ7n0rW/88k+YAv2OtCltQieIiGlYzdwThjLLUQmWABt2cOfJP0hI+JQBOv3Yv0MU8L4QZ4jJHQl9XYBhp7KmL/1cYhWgrQ/8nkfjM5bVwO7tTqHb0O9f6ImTfkd+kuhOXbc0MtVxKpsEpIthBbntDEUZj0ab6btMsN1RGW+p6lX7fWRKQ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7538015f-09a1-46d5-1193-08d89379d9e9 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:43.0830 (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: L83a12IvHohH8s65zgGL8SVCZJ4Pu3jl7B9shSwGaorPcAnyDI43D4Pof/L602bqh40EeyByIHHmyK44zEcl7GpvNs96BsxUyFki2bg7shU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407492 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=iTPky0zF; 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 4CjlWX4cxbz9s1l for ; Sat, 28 Nov 2020 19:48:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CDD0882779; Sat, 28 Nov 2020 09:46:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="iTPky0zF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E64A182722; Sat, 28 Nov 2020 09:44:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::60d]) (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 72BB98270E for ; Sat, 28 Nov 2020 09:44: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RrqiG3tqD/QpRzjiRk+glCxTF3HK1xqn0k6R4IHSEMnvuHYq59bn0ZGv3uFvmavHzLNba4Ti8vea17oP/GNhbwTTQe7p7V7CnYhf8+UcOmffOPYCK/plv+0RcxPoXh+jKOB/9a1jRhEOmLqal0oHp4GY7ynhZwHIzllZf+XXFm2xJM9LVxhPHMj3x6jcuOQ+4eV8ZFn3DELjVF9ZktAVCqmjyNoU7lkj8JS4/N0vBUkGo9/Ngf0q1eLZvUoXJ9VvjuE+NLP9FIQz/xWnRsR0Tex/c2hBWJU79HN7U8wZ79JyYQfnSijtqs5Td+FYbYHoqsU+MPn/ply/1N/SuVD/Tg== 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=O122OkEguvMKIYXCWep1DrJ/9NzY5fhxizGdh2NUf+c=; b=bZ5k1Ywj+laTQSokHY5u1xxet3wy+Gf01H7zoXbBBXnqanGHHylUg6kJ4IBxnpP6XwRplpcF60BdsOH+ZnGuWUa4nGfHINVEggouI+aR+Djy4T1EKtF5MCwjDyZHrlprfb9RXmed2gnkzPG0TgRZ9pIugzgufzy/2fzZTIPLNmos8wYdr5uiqcOMnC+4fq1JSZVpX9prDTYnEb7rhL01DTvWS6XK1UL22zYr+ol6VtkGim/Qs0F1eTkrLT3y+rjjZtIw8l1X9Y945LFh16L3rHABGwgn4ZBtw9aIDSy5POIOWWtL9BZz+3NT9UxOg/yEtmHXGbC3ki0s/hR+9wGXgw== 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=O122OkEguvMKIYXCWep1DrJ/9NzY5fhxizGdh2NUf+c=; b=iTPky0zF0U7FDz4uCuxfSQHToJTgQ/ccpQUTB8adf+KxHltFIp0O1vLP7ZKlLt2ncLZ9OJ7P9T4SMRVJ+Jq8xXVKAT7KBZHu+S1D52FL89rB0Gr6ebYLEW2Ktgr+WcREtzUDAuaXsXlthVbwDH59tv+xptsK8MGy4hgDh0zMbkE= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:44 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:44 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 16/18] common: board_r: Drop arch-specific ifdefs around initr_trap Date: Sat, 28 Nov 2020 10:43:18 +0200 Message-Id: <20201128084320.10164-17-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ac29e1e-f4d0-4c8b-e5fe-08d89379da98 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6XcNvX+gcD+2uujK3wQ2uPddto4GLiAS8f8em1rMhz04QIJYAUBYnJKmDTERzyYrJWF8J4QaUbvdYPQ97H6zHv1YrLtD8U6BkXRu/SElnnrHl7jo2uuUWjobfYZ30RCr3cTJMXBfvKY49+sFAgjAUVtX881yXsDViyYrYdZ+ZQh64hW0P3zyPKleNrb525b6NK1j1lb0k4JtdV0LQY+qj0Lu7vW2SOw3RP9MB2v/VIgfbOFHNBxhJWGhoKFv0/bx65svkjb9yRrpaAfQhUqD7j+McHCYiyqyABYue5VeXwSHzx9XLTx9lpD3S8HGoktZvAfZD55uwPBqCGWyFnuWvQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: AuOq8JWFyHS6B2K6/hZpIbVeFeVNLudFNRlXKgpvIEcPYdYFmEEQAJXPi+GYbkkB+R+Rj5QaepuUADnwLBly9rZg/QDrtkqqBgpU8OcncTFk5RtG7E+4+PU2xz+RVY1WE2bKTF2lU4ELHu+m+TiMM8WKaC5Re7KMIdC2+rq3ZpOZWvgAc7wfAC2Ap9ldqCez+Sdh3HC3CL7CTI5a2kgk63R1S9tOZAUP790FL+dH/CFxLE9s7KcH1R2kMSN6MaLlcbkOT8bAX6LuavE8DtF7Rj6ZVk0hA1B9WOWVYdE38YoP/ZmdVLxvG97k5rQfJktJ8fjc1z4PhSFp317Hv2kF1RnM0hOsAte3Zwnu0HLmI4/86Qzwajac7pgq9qBQxzxgF7nha6eqlmxAVj6kNGw1VQELRX79bYm+sBW1Y+J8zNEPrDrdBHshMj6NQFcaW5a87eoKcED/jIMmkB1/2qNMiGN9o8n6mIWrFIpT/L2i7CjGYZdGMzoYYREWA3bhqbRq9YWY9zzBv1c56B2sa1qzpYx3oHpDe344LfaabsFklet3RJOBPgHoS+OVRNwpEHDxr6DecLCp8UsEjf+9e1CHWCswxXgKwED11VN9kPqod/BdzEtjNFUxnAe5OFt01wq8pfnCqlPWMuJ0g1Cam4V7d3mRkYd/223Rzd2ipDhH6ZpWQk13YOST3Y/Sbw7wP+FL4J5oPBHbDwggSMi5VkGxZN+dadrqN28iSeOtSUo4fULTFoC6LaQ1g5vHHL2W0q9kIcCEmK6J5+M+zZU4hP7gm9ORVLnTOSg7GF40VXimRkBy52wur1W8V16zWkMM5tr1lsWmpPMj4CTMp+afSGN6D6zzAFP9aJNhrZdPXHxsK2rFqG5ucdX9v/LIT48/YygsqaaYS3YKbWdZngzTA++KBZub4lhwTDJ/SnsAcXdD9WMfKCCKDJqdtb2/mXnNkuWA+p9+IUqXetrQqfPMXJQjuIugh8YOM/WUUG3z596oem5jJERxmHRrqc9B5EXMmXdU X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ac29e1e-f4d0-4c8b-e5fe-08d89379da98 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:44.2433 (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: 8WDyHTFT8pq6Ok3S11BWxrhiSCns6o3LQh6xA6ufXMs6Kqd+hH4z/2E+rg1htlY3JamjmhsLJmaiixlUuxuA/JBV6+xv9g6iNd8xD1M5JI4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 Reviewed-by: Daniel Schwierzeck --- v4 updates: - Drop trap_init declaration from init.h and make arch-specific implementations static for mips and m68k (on powerpc trap_init is an asm routine) v3 updates: - none v2 updates: - add reviewed-by tag arch/m68k/lib/traps.c | 9 ++++++++- arch/mips/lib/traps.c | 9 ++++++++- arch/powerpc/lib/Makefile | 1 + arch/powerpc/lib/traps.c | 19 +++++++++++++++++++ common/board_r.c | 16 ++-------------- include/init.h | 10 +++++++++- 6 files changed, 47 insertions(+), 17 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..0c2c1a9965 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -40,7 +40,7 @@ void exc_handler(struct pt_regs *fp) { for(;;); } -void trap_init(ulong value) { +static void trap_init(ulong value) { unsigned long *vec = (ulong *)value; int i; @@ -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..540ea48e32 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -99,7 +99,7 @@ static void set_handler(unsigned long offset, void *addr, unsigned long size) flush_cache(ebase + offset, size); } -void trap_init(ulong reloc_addr) +static void trap_init(ulong reloc_addr) { unsigned long ebase = gd->irq_sp; @@ -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..288e377632 --- /dev/null +++ b/arch/powerpc/lib/traps.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2003 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +void trap_init(unsigned long reloc_addr); + +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..980be27993 100644 --- a/include/init.h +++ b/include/init.h @@ -300,7 +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); -void trap_init(unsigned long reloc_addr); +/** + * 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); /** * main_loop() - Enter the main loop of U-Boot From patchwork Sat Nov 28 08:43:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407489 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=J6w7l83t; 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 4CjlVx5HBlz9sRR for ; Sat, 28 Nov 2020 19:47:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2084D8273B; Sat, 28 Nov 2020 09:46: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="J6w7l83t"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21B258272B; Sat, 28 Nov 2020 09:44:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 BDC1B8272C for ; Sat, 28 Nov 2020 09:44: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=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GHV6eNS3KidKkt+/A597z15P7YvfkUqLM4XFaR12m3TzxbFC7Q4UbacmViqkXBAOYoeKCm2lLTX30H8gIICGHkjefNTbAm9xfrMdt2GZ1bX1ZHupcxxQshciOvHjQnuSy0yxgaQRlprNzztftJAEKpImN+Zs+iItkGAMPg3hTjmSeqyk66fI2+ViHyBSIWwKicAvVnPIEUa+AsB9YjTtw76kIxbu7pObgtW6NgauBQ1gci4Lb+dryC2/yr+xJpINRFfdq46Ux3dU1D4RMuNCa62hChIlPyQaU91TOAEiGlJGpj3gxdpZii+oR3VtByza60a4D2ULaGWJV+wGWSXsiA== 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=sW23CHFlQTYFRD+3skiJ2xW7v0ZCcxAax8jdmrcuc3Q=; b=nCFaEwojI+EkOUksJnAPeLGFBCYicFI6LHxqf0/XG+U1dAB8hyorpdklLhMVzuUkmCxhg0K3dzUA56OqsiSDdenQ1FN9KTCobkvQWbPQvKMLxKxcxj3LpcPwoS9ibHuJmagAlvNHBhW3w8oIr4miDvWuZzO0asMpe0tatz1VKofFDhcTZFUhWIm+VNqK03tJpM1xBOW3kh046lIUnel3O9rI6BS2xnlceJgKdH7SlyAbmCK5SINu/MKo6JzOM/e67IMefIUkM77IWAY5f+onL4gPhUu2DDFb0Z5utCWzTu0s2WtGwpNABIZs+8dJrilr85M4QrJGNpsup/NW1xjGGQ== 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=sW23CHFlQTYFRD+3skiJ2xW7v0ZCcxAax8jdmrcuc3Q=; b=J6w7l83t0HTo6PZ55frbVSqCIqqI3nWUPa5EZWeKWEBs7vvrlaKMHZ/IDxqR8v/lZHPFHtVFNtfL4fULHJCt2HPJEo0l72CyQMkK8O4Tgvh2Kto2bYxK4TO6gW/jrcQ/fHqnXU7/s/YGgoSvti9jMD3Rci4kp4CvGvaMJMhKVTI= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:45 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:45 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 17/18] spl: Kconfig: Add SPL dependency to CONFIG_HANDOFF Date: Sat, 28 Nov 2020 10:43:19 +0200 Message-Id: <20201128084320.10164-18-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4306b6b-d599-4b87-74a7-08d89379db4d X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: zsgwrEsysqyeSkCraX2A10ZJEMbHhWx91qnUX0wGU9uubK9727RbRHZKhAxTIwytceWhuU6XRfRqN/KyzMN8fuZODFOG+llgUvMxRXz/hbC8KYvHM1DPmT3FbczAcFb+GWJL2c/2KxS2qljTZiIcAO/uC7tMaw4nOMmN/PO1gyHbpuedHIWe5iipITa54ZzeAauteMtnb5ySCmhY7ooIoJkgAzoFvnzirsLG+x8EiBZ+oL8RN3BWOAA1AEdqfLMtptDw3H3Mwc/MbTjMRElICdfN+FNwYqhfHIoOSkIc+W9UcvVWr+CFY56GJr8vNt26hmSM0hzxiU1060PFWds/Xg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?ePPoNIuCyCrr6mdUdl+3mQl7n2O4kJ?= =?utf-8?q?7AgayqpZaiHSCgy9s6UGB0sITovSGQA+2tPjhWFd8pK0tpIfAvsiGXbu+ujOCMmh5?= =?utf-8?q?uyui1vNMmubrGgg/6wKcvKghFEYSHVIeOgihEnCw8687MvFmCx8lcebMW4+sDNylx?= =?utf-8?q?MXCCNQniQnGJYg9ifWXLN5Fw1qBvn3/b/VBp9wOugY6Zl9eGOcD6dUGLIk4uyCHt/?= =?utf-8?q?Mn+xR+Lax6yiaRkSskbWiFJkS5VCB3Hu4DwwURVHPCjedOq+ahwgUxvVxHnm/EPdx?= =?utf-8?q?M8od1v57Dvc1fclDcLURccqCu+JWJb9Zp+MZgLJqxGBYKgHSCY/krJL/GbTgmSpAg?= =?utf-8?q?HywVe61DhN81Vs505Lm4Ifhi/j7XAfCfNLVcVgTes7EsRXwI+eBU3s6IhBRyvt5PU?= =?utf-8?q?fYTzptIZ3jogXeYirqMjcPwE1VxuTzoGCeLWYa5DTOJPefaUyVUZ2CciMfLOmfroy?= =?utf-8?q?qaO6wF8oylNlPKpE/FQgdZSvgx3+Zwo3+ifohSolI0w2rteXWBLslwjj5o/NZZtz8?= =?utf-8?q?6TRQTu5nFK9PyvxOyz9hqbYLJnjXxd4wDI8666yFPBhR7R8vudc9GVHBmkIi3oHY7?= =?utf-8?q?TfmgBfaCo7mUzSrmWS5/oAeh3c3OficvyH+zd7CPKhjCf3uR+HTTSdpUUurYsdSnE?= =?utf-8?q?oRl4cimSqbCQc608Z9Z+2TYwJhPp0jHxPWHzR8sPPU/7LC8NybjRdRGt+xJJkuk1n?= =?utf-8?q?y8hGYB+Qg91hqCPArpcYcfDXbOPldgkNteL4BjgwzZgMHh8zW2dqzlRKgzuXOHeQ5?= =?utf-8?q?42rvt4Bk7ZpfZRYzv24k5gKcFzyOttoiL9mJKP/6zhGjPTP+qAU0wJC9gi0Kmom3W?= =?utf-8?q?r2MO1UJcFlMQtGU7P2+ue50SIipOkMuSNpgyrDylnAodjQJ/bZJhZgq/ugWwMnIhD?= =?utf-8?q?rzYQrM57RS8IPyoWW/mhvbhQDTohSAwBeXmijFEdbbU8t7Nlj1qcWDq8SluzFOkE3?= =?utf-8?q?F3jujU67q30CM6ESiu9?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4306b6b-d599-4b87-74a7-08d89379db4d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:45.6794 (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: i4pYaGlu2hRmbXr1B8+uHR+NrdDPjM/tgu30wKkm5BZQlJ+0q+oZdEHfTVwW+Sx1veSc/I75kIG+DhSGQrl7a+4086aOV2ENEQzazDLO34c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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 Sat Nov 28 08:43:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407493 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=LoGrXHaP; 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 4CjlWl1QjBz9s1l for ; Sat, 28 Nov 2020 19:48:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B01982783; Sat, 28 Nov 2020 09:46:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="LoGrXHaP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BEC8F82730; Sat, 28 Nov 2020 09:44:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 9E5B582731 for ; Sat, 28 Nov 2020 09:44:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eMAZrLv20DfZvWGlMTqoGC46gxJC10ed7mcQGWSpf8YL33IfqO49e0hEDPgn8eLBCc1z8s0/IxZD9AJjHTjwUX8j1F+/CHsgM7vz2XMeNdbsuk4Wtx4clqb090FHu71AHhgY1LVpNkqTtfgIu2atgoEz55og3Ryvjbkybf3LgUbDYd1grRKwp4kxcBNBCaSkItpr6jU7i2AbykwY2a5JjtOgjr5saQNw06aUumsw+X51Nk7WH3pp6vBAD7chBBWZX6qNfk1iT9BLiKYtj3znyTwXABxP+NoQ+U4CYFdj59fU/N44BHU687w2U4Cb7P6557+SMDiZyIcX//ycKfX5Tg== 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=jgOtdACU0yRsmPy0nfKtC1OGeQbo3TLEw+02v7mJ+Mw=; b=TR98zQ68ZGV2IqjPaIDMjUPG3JUyt9+KzVGTo6lNlGLwrO35NUMO7h/73xBLLSIOZbdmBgS0DtvW6Z1YEyZSeJ95bl6xsGaEyCTG0/JqjaUwmzYWQdpKSve/uprhCGRge5cz2oqNrDiLqdz3koH1iL6aedWDR37j6m7w037r1UiGyCloTZ1h9m5l6O/eDcQknI8Kt7bWWb+pvbPLUAjDKFnS7Av1r/OPgePJNdJTCMdhfGEd8wBGww/1sQW78xcprrYwWI9+Gp+wmSASFMzNE4D3CrgiG5fuAHhfGSTLY+XBuj20wZX0f2I7q4RQNjf+9T0FVYyp9jCL1OljcZdJUg== 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=jgOtdACU0yRsmPy0nfKtC1OGeQbo3TLEw+02v7mJ+Mw=; b=LoGrXHaPz46Jad//4VTzb3icgvgslFdGkgqmNbaYHCDrmlZhtTmxrs9YTU+MpoCby3xd78zhjtk2WLdEbmtA7Xvo5D2CJirnmln7fqlQ98V1AHQaoCLulDhZr9qd0Txbv/WzxQc++Vr/tTfd9cYJ4H0BUcVOSwNRsbKL1ruBO5c= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:47 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:47 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 18/18] global_data: Enable spl_handoff only if CONFIG_HANDOFF is set Date: Sat, 28 Nov 2020 10:43:20 +0200 Message-Id: <20201128084320.10164-19-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc93add1-9530-45aa-d516-08d89379dc27 X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: 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: x/Ba66Es7sHO3wscbBThhfknb+f21yczrxNfuOuMOIorIsfvzW2Nki8sesglFUC2b0QUbDdRKbAnvWzcebw5eTCRVs6I1xn6XQUnzKe8vzj6C04wCCm6mWsO1S3jXJd54oKKr3PrZmE5VsGr41e+8S6e4H/ncVEglGx1Sb6QfoZgjS/Gjs6g/IGlJK7nohhL11UPN5zdHvojHhwkxKgG0cqe3qC82zBW2QEu56SMfdBJlD6RJ6JvAIU+Hfu8pmAav6mtVNOQS1wqHe7YhzCHWXhL9F+g035N9qTvh8j4v6X0zw5Tqb1OsQJjnUjWF0s+qAZHffYczuzjbJfk5rbN8g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(4744005)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 8Hw4x5t4aYw8RnYindsCX7iTFEMhk84iv1pmOqlDWKlm7AVmwNW1GMzchd4VS+zGeWas/z0l/zdrUmqkOvorsC2T3vf7c7KUTZpMS43Mi4wwMrHQLFuR1nxSlrWxLxgBeNk4mUyJBIgUVnwMk83q74T9KJVTFmrEMZqbgbuOg+V74n0/W20R3vuVvzpVWYlMwFwvOVBWfM5aDHPOJzLmKQmsxlJGsz+490EVeDqMhKbWrMb3xoGUqDnJc6I7hTutFdudSVowNG8qMhqfldznP4+O7KbF5jL2UlIwd3RFbr/ZC4ezI8+iFsrJnzW2rl9WQJMOxWZ7nkndVG8ia4qxpdi+kmT2vzamqYe84YcbBffdptOv3VTnt9udULtg+1JexQT+xQA6Ex1m3dIDSwyujrVL4c0/5Nxo1e1coDizeOVv7wbKBxBN84I22EzFiv8XvlZHfC2ykper+mDCjB2z24ZWxWklikVXBsBDHkGRLCTmSOtt8pHXCfiBFqesRBC9xpPrXBvNkfj4LOcKNXkF7mYwsX9xQTEXB27SpbUOjm8kG8pV5mqvMCr5TAbqLZrRLztNvKGtvNfSThQ3qx0jt/rDi5Pxa+QH88ZyriDMJYqStVbPf0DfM0Q/M+pDIkrIQPNpZKrK+WM76bBLKMFb02k6AQge+7oyirh0KUhheZTm+zSPRaf1oQleE2K28n7lMvoLb4M7u/JQgdM5LPV8A1vTVS/EIWoL16SG5ubaUOMbVqkkOsbgZVhfnjywVp+kL1WoiY6m1RLqpOfHYbt7W8hmHgpNQkN2K5c3axErcM2pn6zMjwXh7Bi23LiZsniy+muw4znv6dfUCc9JeZ0AzAjCVQcYxtKQdO1K/V8+Qz/yOf9m3mao2Ek+opg73NL2og4S/9yCTnZulaKA5G2u38FDULI1ZKRqzmeijoazi3v/nkHLJwdcBsfP3PxFPm6t/YWzcsixj2O1EKyBJwynmqssCpkRu0WnKvxN6mb6UoQcnAuI8sKpbiJjSRQbNKFu X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc93add1-9530-45aa-d516-08d89379dc27 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:46.9397 (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: cbhGCqQCqm/PQc2DU4dh4P23NbMZKqGP1zxlkeiF06EKgK9iNxVQieHXN9cfnXo/0M+d2OsFYWsLWiVsZQOXfw4pmo25U/KY9BCAXRjn+BQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 --- v4 updates: - none 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) /**