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);