Message ID | 20201123131651.33032-13-ovidiu.panait@windriver.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=XV4YSlkn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cfnmz4Vnrz9sWy for <incoming@patchwork.ozlabs.org>; Tue, 24 Nov 2020 00:19:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C9BE825C1; Mon, 23 Nov 2020 14:18:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="XV4YSlkn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9F428825D4; Mon, 23 Nov 2020 14:18:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::617]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8F6A3821F7 for <u-boot@lists.denx.de>; Mon, 23 Nov 2020 14:18:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RfFNKEx8twITwGoE7103WK+7ZM1TBkix8rBo6eu76Nnm48WcdIBomiiTwZMzWfdRpU5SERZ0zKkKkJbHa6gpyvqkZID1EdAdoDOTsb5eZYMdmmAMtKX1WBfPQ7ij7DjA4snLx+7QNy0vk9MlcTMIKr8aOdHZowU8CoFB+6jG7cqKF3Vi7xy45hok92ecWeh+lceje4l7ETfaUhXwLzhW7tTuEGbZt5XOU6BU6eiJidjajWe9L/6GBOF6+akZ075hcxuU4AZC9g6GP6iCNBClMtHZozaZr8o59jJkF0NEt2y8f8c6T9QeJdnbIemIfR4n+DY8uGf8LJuNO8YphOYLjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aRHDzvXXJAkrVwWqcNHiwcOoRPFYcdeZjeyt6fnvz/k=; b=GOW7taFeF6D8NGxULZzWJefuWY/XXlcenwtf8V9l3iU3GQgsVhfcb+vOiHSwtHnQrmnah6dVntp9oRhQ7I3wBeQd753jYAqe9RrpE/0YypmHLxV41V3GvNBmpgQqAkjPLFfovuv0HJ9+KBGbf/dJ5uJu0znAlYUjYMAE1PWi0uwKNVarBLul9PmVHWEUbaEvNamNOO11VvrTt/3NJ7Ix3/5hM9n4938rNjU02OElKsC5S6s+WQZkT5rPZPKqvik1kn9AkC7IAeerRyu+AKqznlmVGf2QSler1qRTLUKkr5Tr+XM5DFqLIwAdhIaDq1rkR6YmTI2m5o6I3QLZlInQKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aRHDzvXXJAkrVwWqcNHiwcOoRPFYcdeZjeyt6fnvz/k=; b=XV4YSlknXLaStuEKNU/WWRuuldSokUTk8NDpZVeqf8W/RExEmCLLC3WqoD9Kix00zQ2mkAE4EBnC3QvVQ3iYADsk5+RvFenVDZ9ijns9QD9OIATZPICxKaJnRo5SoRfRNJcN1m0ru1MQwo87CZ06pJcAPeB8Rr6Sh/PigvAU47g= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4205.namprd11.prod.outlook.com (2603:10b6:208:192::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Mon, 23 Nov 2020 13:17:58 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Mon, 23 Nov 2020 13:17:58 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 12/18] common: board_r: Drop initr_xen wrapper Date: Mon, 23 Nov 2020 15:16:45 +0200 Message-Id: <20201123131651.33032-13-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201123131651.33032-1-ovidiu.panait@windriver.com> References: <20201123131651.33032-1-ovidiu.panait@windriver.com> Content-Type: text/plain X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR09CA0089.eurprd09.prod.outlook.com (2603:10a6:802:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Mon, 23 Nov 2020 13:17:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf64be17-6da9-4c40-84d0-08d88fb2322e X-MS-TrafficTypeDiagnostic: MN2PR11MB4205: X-Microsoft-Antispam-PRVS: <MN2PR11MB4205C022AEB0D4CACFBA78B0FEFC0@MN2PR11MB4205.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bRsz5TkJX0pMD8ZKlBtkpdlOkh1rWtL39/WwUAGmrQmkrMilYArjsvXObi/KM8+QDWSWbRbMyYAx43OIISz9Sq4u7lgHJPzuclz7qrJowfJDT+XU8PI0QQOOZeRU+74rQTgNznhgpmmH78zyvgEi4fbEvoUYOKrn1rqqHpiACJc4XyOYF7oe8nSf7hEe407zRtNYvyTnVMbJbz22+yIS2KNG5Orj1jxEsEAFKunBBoivt7gBBjQ1HEUhZoA5d2cVL+ze9gRzoxvW7tIHOBe7V8/TjtIOrONpGLHfwFvxqHWcQ61awCZrITeXkudqcVFJl5gFalm8xcwt4pb1R7sd3w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39850400004)(396003)(136003)(366004)(1076003)(8936002)(6916009)(2906002)(52116002)(86362001)(4326008)(8676002)(83380400001)(5660300002)(36756003)(2616005)(956004)(6506007)(186003)(26005)(16526019)(6512007)(6486002)(478600001)(44832011)(66946007)(66556008)(6666004)(316002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1wwFUpue+gG330SOj8BM5xrDivo1kn0zqKySWwYFcNld/ur4zyF5VTIFNlNU7xEKxf7ckTgf+0QWGou7Rsl6xLn1R+HBTNMnbyPi5zOhWy3IJlxBjZIJsdksxM+bimoNLBalNDZTWa5p2UxKzr7GzpHNS2aH/2tHVqiasn2/VCUS/VD/y1Uyu+DXvDaJBdY9nHl2DI7oWaFkmt3foYqvOPTl2K6GbHzR4W2X2r/JBjB4dSH73U122lgpVhQE8nGzPIjC0hBEw7w9PlKNXMczzZaTDNKFGQCgYtgKeuxCpHosIDDUNOiLl2KtmNncxaTBvohEsig9glowBBCL62g5NSHhnIz5moRGB8hdxwgbkqxO90vBAVv/lEr5JIxsEzlwkcq8tADR83Gwguu8uyhA1sLy5JIhlzejbi9dFzJKYwUimxT4mZoapwaOmxPVGES0Bm2PuqZuvWZ38JjIfCeNbE47aBHN1BSeveFaH36PWgWh1Qm+xpnKhx5xtnjnlmTISjuV9e70dcYRokJbeZJ6f/HdX6rjW0uW5fDjDdCBCUr5zpurRuJImdxYbTpq9hrrX53F++D0PZ5HqM5dQcEohIv9I39T7dz/0LLzL+nkFNWpI4fY+ETHcyRMKT6BJmfi0Sh++8TgpvX4/s/oPsoh4La0tZ18VdGJKY+Xq+GUAK6PyDijzQMhrIB/f1wdD0ggx2MaU0fznn7+M5PiXxHIHdrzFvSL1bDEJ6QDU6cxkp4fcapdLJ7lYoetR2DbrwMD1VjnEzN6FVl1obHWDm2eQdJsIN/D9HUW5OpZxP0AXSUDu3X/j2XvtyeFl5Vc+Ivvsh6WQHUrmdNxdVpZ2JOEF682P1cRX1L4L7AmpeVtIfY/3bXgn8VmwtrY2wnbekCdWffRBZUF/B6rroCmxo59xQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf64be17-6da9-4c40-84d0-08d88fb2322e X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2020 13:17:58.3614 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cVFu53JAr5QFcw7zd7Pr2XcgkArTGEBy4btsyAOAoXD7lGysNLtF41dEbBGiJZYyIAhFGmhlwtOhUVsQJai+YGncNwlm1xO/Zyx4rUY8rSI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
Minor board_f/board_r cleanups
|
expand
|
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