From patchwork Thu Nov 5 09:09:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1394816 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=iVex7FdW; 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 4CRd8K6RGGz9sRK for ; Thu, 5 Nov 2020 20:12:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 079908256C; Thu, 5 Nov 2020 10:11:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="iVex7FdW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D7A98254F; Thu, 5 Nov 2020 10:10:59 +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 NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::627]) (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 C1B2B82518 for ; Thu, 5 Nov 2020 10:10:53 +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=Xz5loklzuW96ybfxhP5j6EI69EgVkYfv7O6BBqQUMmY6ei1V8JabRPfFcr1WbKvrjio/19BSlgRPwKhJUeMFnIC66exDIWTqXkIUK6kW1MnVzLRhqf/Lk0S2VDM7mjYfcH2bgpcX4XdQOp3CujI7E2CxKdK67WNLA1c9bATpKUnTvjCF2Vxdvv+LQX1Ag5VVtHTgt+bUbgLfD1GT/+nTeTKrOhagH6NLK670TIjIKaz1hvYoxLAYdi+auYVXqFskXKKCroIWJab9S/xWHMoytVtW0f+XE32dxb86JL7JCZX1F4URyz22NDmof0BsA/LhNOfj9WiOVlNLNGlCKCDboQ== 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=YLWrVslbq2xk+oSAzRiRAdCBcvDquE9m+79kE+HgWGs=; b=jplOknBQcALUiCwIuQ/WQIMTRyeerkxzH3xQX9xvxY/cPo4iQnVzXJSKXo5JHoFW9fBVEGN174RWJ2wJAn8GsRskqmfHqwYZUG+UNxcpZrI/ODY4RPQgx+v2hU/5qc9Ho91Cig+nICWnIfcTNUllkJ0dITwnaYga43DjJI3GPFLh892mxMsZ5Q+8qlFGKrgSZKVYYcDKNPrmVitRID1K6VZV4Hqc/PribGltEvu8DKvf3RminWs3YqGpyGDZYpf29HSy4+6OtGaT6rUHYVoYRQsLb4Eq7vzYlVk+mVqRjIgnx0C5y3AjSVVSi2GLuXOMltscDzryPz1GJGSNbggf5g== 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=YLWrVslbq2xk+oSAzRiRAdCBcvDquE9m+79kE+HgWGs=; b=iVex7FdWGPG2zQBXdkUltMTLaNJVPl2PJZgKXhRbdeZuhc3u25RUBZX4BKNv5r2dVJGUc7KYtedfDiQiDbH6KqCx3QKc3U/AJrFR+eG30sjb5WVR+UsV8X6Ov8+gPVU8IvPiciXwEfqO+Y6Jd/aXvDMgh6NYL6DNmdTW+asxUEc= 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:48 +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:48 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH 07/18] common: board_r: Drop initr_post_backlog wrapper Date: Thu, 5 Nov 2020 11:09:44 +0200 Message-Id: <20201105090955.29641-8-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:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 609b283a-6751-4bd4-bee8-08d8816aaf98 X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: 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: qDx8wuHY9sc0W9TCjqtyVnm8KkGVaxs0+fxcTkferKq2ORS4EDE6qm9mIzkQW61PytdU/ydd8xwT74fkAnzgUiC3B9d4VF5r9uOPmcUqAWiq2QKkIvEafAo8TYj71L7NR9x9dMkkAWrsIFv++GLCCueacPnus30DAivvj4AIgmBUKyxfqaJwO7abNNefRyX15RY5sp92wu8N1nQ1PmZXmq8bXhg3RQzTcGp56nXh1e4AY+1ziSvS349BGjiDj/3hYp+bK/VOMYvhViHA/m2cK8PGqb1qA0dBAvAslIUjstldFwCzb1Ohcw65X5vwxRlo 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: c2xgJygUduv+e9+/FCS2h2uml2zR06D50Fu8/eI48mbfDW/vJCMKO+6SHijRV32TKCn6R9ny/fsKRyAGEfzdSd5qboUl/fh4X/hYpBYH2WivY33PmZ5qOQOh6PtFTh5cJbDcv2lbXuN6svfAh7+3mD135QPxqCSdc1mepMpBFOlOJ7gTINLBDF7pEZYxCp1LBbz3PudPicy7ikB753PoaShaKfXJ+3A3rcMv6aoAR8NSPTWUB2KQ6PFmjEnV1qLq59ooAnlQ3Cl8lIyUgoWoMUWPUCBl0OMx9t+rT8E4liz/xgOT0c4VFp2NPr4EBLb+XXraW90DP0qV0KsdxFOVkzfF2cq6Hg2akzX2bx8EVj0R4U5FlXp+TT+5feicYnKB2zx6LAuE4GWu705U8Cq7LvJQFsCXukce6zEHNni/TLivb21vie6X5GsmdHbYunwaWtDasZcjrq0w6kxFRDCCKVihe00SZNveIGZMOrKlpoTo424i+leSPrS70RAC9ioBfaj6iZAgGrJDuCq951clzW2ODBYVNha4vaWUaCJ8bvoPZ7uqjIdRHRgSkp328ePct2/NDlP8oBt6yuNHqdp5zLsMtqZTY+wsVzQaD/dJ2E6AfwHGpdKzYCBkkSEOJULZuzPBqrshaWi8RHpsusuewg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 609b283a-6751-4bd4-bee8-08d8816aaf98 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:48.8053 (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: ZLteSTVGpD8J/kY05XOD5TTZ6/Z5o0N0mdcW+A/K+DUf7p5ICavV+yC7/baA2jf50Rgd/YumdjosKjoPUUZPCtZv581dj8uWr6iZLAuQJuw= 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 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 --- common/board_r.c | 10 +--------- include/post.h | 2 +- post/post.c | 4 +++- 3 files changed, 5 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..3dd68a6d9f 100644 --- a/include/post.h +++ b/include/post.h @@ -107,7 +107,7 @@ 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_output_backlog(void); int post_run (char *name, int flags); int post_info (char *name); int post_log (char *format, ...); 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)