From patchwork Thu Nov 5 09:09:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394822 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=BAi+iNpm; 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 4CRdB50ylTz9sTL for ; Thu, 5 Nov 2020 20:14:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6AE0282591; Thu, 5 Nov 2020 10:11: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=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="BAi+iNpm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 445B98253F; Thu, 5 Nov 2020 10:11:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::622]) (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 3557382544 for ; Thu, 5 Nov 2020 10:10:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7pyIGk8BgVO4EVAC2EKCQRACln+SZ/2Hm0q9N6YRjcbemt0QdvJTHleTIpGc5YaPc+Cetjow1ebx2pN/6cSs8sAPM0dvYvZs4iDC0Mfe0j04Ajhiqc4ALVfltQZOEQJPKbtlyt42TZZm2/cV+l0mzH38fONR1Q+5tGvLsGIDbxfpVr9erhs0GKOD5LV83wcGbPNM+WiUX193roFmc6PZhwyIktm3O/uFJwx3+h1f7ewjqk/i0CtxqIP2W3rG6E/hkLw2iCtjX4jrdb8L5J2K0cK1g8y4DCs8fAlKZAMMOcKQHZN+0rJeCAiP6MIC5O0T4rHZUHvb93CouJ9D57MBw== 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=eWTX33D09jBla/4T4Lz+CyTmX42DC94HQhvKfp3zQ0g=; b=Kp/6vCIZmX1TNE02M59MO7wLvWUUJZ0MmEdlaUknuz7IPvL/XdjuHIvvxRBatY19YGO5n3KKXTWi8yPhooI/ZfsaRm3Aif9Gzqz9/eHQ4Bhq19tEcXLgpzUi1AAy5vaWk07gOdWXLnma1fXI6gIm1IvTfdxvzlqUtiV2ZlX4RbLyuMLeKoUrXhZlQMzKa32OSDj9qivfj0It6qsPWB7/+mh6B7T6NIKCsywg3uy3T75/CrGBi13WOutjUHMEvRN4EmRLflOawvsSXZsv5Dgc2y24X3juY58NXHfAJea+cWJ7k8Rs/+UnREr0r4NGIRySn1w0rw+X3DFoyAWPEnByvQ== 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=eWTX33D09jBla/4T4Lz+CyTmX42DC94HQhvKfp3zQ0g=; b=BAi+iNpmsQg1QcYQiENRsKdLwBbSkPe+YxpUnwHzsbtRjhCChV5nJ9zzcqV7EtZaVDzmL5WCrJb0edGBY2g1TjXmTsmERkcGHSkNcoqjf9IgVakDJVMETn1h9tTOZbHHbxgF0hZu8skeUgoc58/MeSyCSMfJje440yqbpW9Zx10= 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 MN2PR11MB4333.namprd11.prod.outlook.com (2603:10b6:208:195::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Thu, 5 Nov 2020 09:10:55 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::a464:f45d:2dc9:f8df%5]) with mapi id 15.20.3499.032; Thu, 5 Nov 2020 09:10:55 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 13/18] common: board_r: Drop initr_jumptable wrapper Date: Thu, 5 Nov 2020 11:09:50 +0200 Message-Id: <20201105090955.29641-14-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201105090955.29641-1-ovidiu.panait@windriver.com> References: <20201105090955.29641-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) 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 VI1PR06CA0198.eurprd06.prod.outlook.com (2603:10a6:802:2c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Thu, 5 Nov 2020 09:10:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81ba1298-da79-4e70-b71a-08d8816ab36a X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: 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: 5O2KuDWGZaGNggvUa8JWEceAcxyYOL1EjEeb9Oa/D0aMkCw7qdjqBD4eSVGlqOxJzvHQdTvxSIX9oW9LIh35ZWEAZDn5OrzzNoZkPr5p6+3WTym3GQdpSfOpFMoUlWyoWNnPdkLOCLMauYkAg5xP+TE6Vw60bfDFapbXRMfgKdhzI8m9psOWBP5szxt9kPj+XImt1w3YNnusrhurFh8ANbXFxOZJVJ2BB8qveko8+BFFwOURljs7I5cSBVR2lM5Glwuyu0lsrLWqrhpfDgUq775u+B7Cz33QTCMypWN4hPs37GZu7U7AI6n9NkUPD90h4x1f58ZXPPx6Yc1mWKImDA== 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)(136003)(39850400004)(346002)(396003)(376002)(83380400001)(2906002)(66556008)(36756003)(66476007)(66946007)(6916009)(478600001)(4326008)(8936002)(6666004)(16526019)(26005)(44832011)(6506007)(5660300002)(86362001)(8676002)(6486002)(6512007)(1076003)(186003)(52116002)(956004)(2616005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: nh0NhruqiXZN/ErQXbnMws9Ay9kVNAW/dheGRU7ODa13sTlHpUwjCIcaW6A+jedGV3aGx2YbF2B6Ieay3V13NcFv+vz0ePrJw7oQOL+3El73Umww5Ync58qGhB2gLGd6UaEm5ZPY4lBd58mqBgZLSvc+6KK25cSScDRANsLhcwqUgGYMQsVJGB6WYTWJSVRCQlpFq70aELyBrD1gU8tPq0LeRG1NV3hauP8RWkQEJLEi99DNuA93fd0d3akeupiK1daM0WRnhjykNwi5Qv+s9BRvT4Z+nXIWjo5kmmOInERp8yPHAtJ/cSwceG37Sd45eiDcEVGnxvfhsLXnvjCQawx2Wj6fE2JHANw37TaDrVbWNyjyPZktiMuvCXmzYiDJMaG0oT68HaVtTJsbVmZgKI9trGsDd1+JgZSH8Oyv7xA1EhfCpnZKvadciFTWi1y46lE0/EMzQblttnLDVjrHcWA24t0bGLwG2bWnONchEk5dc5UWjmmx2zABx+YJsddPj5vb4CuHc87GG05ERfUs4B0UfZRXkUkovMqtypYG6jfqp/pLtswVlAbgFp0j69po6aY294KMIeq3IOPuPicbf+p1Zg9ljYMN0P16kAm8ideJO9P/X6+Lzr0kWxMz4XPGPfsqllTZjQtt9pSgYMJiIQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81ba1298-da79-4e70-b71a-08d8816ab36a X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2020 09:10:55.1725 (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: p8q9r2aBqeyxuPOKOrxsfT3nBv7YjCt3/eRLF+40SE4R/1Eve1FkeZo+ILMOC3TeCOrgMAxtDhmaS4FWkeZ+y2JFi4AcsXCMlF8ZQby0SRA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4333 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 --- common/board_r.c | 8 +------- common/exports.c | 4 +++- include/exports.h | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 1cb9f13dc2..cb9b2424d1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -481,12 +481,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) { @@ -748,7 +742,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..be13c771a4 100644 --- a/include/exports.h +++ b/include/exports.h @@ -16,7 +16,7 @@ struct cmd_tbl; struct spi_slave; /* Set up the jump table for use by the API */ -void jumptable_init(void); +int jumptable_init(void); /* These are declarations of exported functions available in C code */ unsigned long get_version(void);