From patchwork Mon Nov 23 13:16:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404775 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=kXq0fdGr; 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 4CfnnW5KRBz9sWy for ; Tue, 24 Nov 2020 00:19:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A8DF825C4; Mon, 23 Nov 2020 14:18: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="kXq0fdGr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C9E1825C1; Mon, 23 Nov 2020 14:18:20 +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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::614]) (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 0ED77825C1 for ; Mon, 23 Nov 2020 14:18:12 +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=EZ1qdaJ4HakJs2Gt3RUl0LuVcSh/FzN7VrqYuE50pistE1I9Lm0D6T1+j5wMTbX8orD2LqSYiq8NqPvN/u65WKt0xGs97ke8BQahXeeDM7oYsg7RbyK6BbA+R707FywqiVgK9W5xKfMe6+ztOkfiO9hEHSv8CHoNBPzvc45yevdCUH5XVBVen5WhBjTQNiCJI6LeSpKb3nbQIgQRVMEitRAuGrcXALFmqTmEBtdNqGugrPZ1dirXfz45JnXgF3ydqIyQQeLvr3pKNBCBJo2eBQyIo6JYx23+2vHC6A8kFYo9D8fm6iuOEwUoc6FG3ACeYHp28BaUrSDEWBY6YRrvYg== 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=EzzamgQn9sM7mIUIOwQx9eeSrmk5aq0wjQn3kJuNv1U=; b=mLv60qtu8kr5YhrOXkdoyBXVX1s/kOm4ElvVVMA4KrCiMBAJGoPrP5uiS5tVQgnGf/IbSeC2HT0gnIcJRaa+I4Mqae0sB/NOy+vLZI38jVK79dHfzanI6p3/b1UjILjocEouHFbd68qERvEUXrLeIMA1JsSpfK9uZxDvhgmuUEJoXLC0piX/VxTx8QQ8XLQ4jC2ZP3hUDkZpd9g7+8QSHEyQiUDJGzTT0SfAqQIEF/193Bdamf7DSxJuRPSZn2C7FwdfrWUpSmn+zNxr+5aKWAq34DmF9coEngg3pyfwAl7jvxj31+jDXeb19U+tpkkMjMsjMRov4xbrNNEIMSB5Bg== 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=EzzamgQn9sM7mIUIOwQx9eeSrmk5aq0wjQn3kJuNv1U=; b=kXq0fdGrwnEpSJWnpyFGg9QaWit1MLbzIO0PYC9LtRS8XAvC+RxPBq3vEKm+tqjDvVp0eR6Hs/QJ7QdzPthHcutCQQzkxhcE7gndC5sZ8oIJc0aDPy1f6TuNjgHCgkTwWaJpxQLRb48pUopDivgH39Rkf5JrtHMUskYSY1yNK24= 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 MN2PR11MB4336.namprd11.prod.outlook.com (2603:10b6:208:18c::22) 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:49 +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:49 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v3 04/18] common: board_f: Move setup_machine code to setup_bdinfo Date: Mon, 23 Nov 2020 15:16:37 +0200 Message-Id: <20201123131651.33032-5-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> 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:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1990edfe-31c9-46e4-9765-08d88fb22d0c X-MS-TrafficTypeDiagnostic: MN2PR11MB4336: 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: 3MIvUFYJR9oJ8ZapXV9abg+bLxe2enzHuo7Sdxn2O6JiMyRlVekmssHuuJ1dv5o21BsAmOvyICJH+/CyQEURFS+jRe8GCjgfk0iWnl8g9ytX/GD5B+MSfZnkORrhEqZA3Om3oxfG63/dkIAtiyBGugsPHzntzlcQITGR/ISAH3YaAVaB1/Ro6XTbxdnWUUKJwpM16xgrL+oR/9H3RIrplapK4VvRgqGIj/shqt6RDLmv3U+/kgotzacGuTP5PgE8PiBm8b7o3R+yMTjinEZAtdeFMxWlCk0cqIZa0lebmtJf9/IWyPkCV2LbqytI4f8gjSDsTK80NxD2sjfpM3wFXw== 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)(346002)(136003)(366004)(396003)(39840400004)(376002)(6512007)(4326008)(16526019)(478600001)(52116002)(186003)(5660300002)(316002)(8676002)(6486002)(6666004)(83380400001)(6916009)(36756003)(66946007)(86362001)(44832011)(2906002)(26005)(2616005)(8936002)(66476007)(66556008)(1076003)(956004)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GEulwLvQOI6OZ4T9Ec2oqtVsY9aaN2VO22o2oHTe9ELKFoe+Gn06us9HOEJJEoOqTxB1yW9035HwcS5QSrwYg2pDXHjrenNcPkALVmEHPnO4vCk5Fai7xfGj/5lyZX8IQ6w8yh25B6Zez1ju6sXKw/KquJbL14bUU1uAWTYZVH6jpDTCgKIFa4/ShoQTvyhwkxNNJzcl7Ya/BS5oI8+k12wmamIDyO4WhNk5HJwBSPuhym1RLgQAtPQ86PmVVHkmUfdNCqg8JwPC4CIenwhgU5q3SZhMyeP1mKCALRv54nFg0GlxWvAJH4k1Sho2C1qxs1ezz0AylnnECIhtqXqiAwPbQaimrhlT7ogpk7DxZSDzV6Ha7oGK9DUeeI8qaTRCE6lOrASqe6jH/avKKs1ByhjLx/S/xtZGim/zf5FbLnEPcNRtXTO1acxbrRm6mKSeYZAAmMtQkspvJfgueljPVnfAoxy0lWujA9OOavZJaJtPl0hLAk+WFnI7PYUBktnLO41oR0lwwGI8J+PsjepxnnBlufaP3PdH8Ua/6766HnLdkNo7Fv3DR1+sn2EepQSPCj2yn6FCnO5JNw+JABKTrLwExAecjH7JmqkVehSnWoWmRK8GLm1TarN+hzQFvcCkN0M18SZG/HFmx0giB8txqhewoLJY/d6vNv7Aq7hDa7GFkwgAx2zqtlnmxBjlXPfwRzzoQSiEhDAcKS1uu0qDVJEYP1ui9EFmV+R4kwKWVRR7PNZla/+OWT4zeOO4560MW9K47W9POVZMlDlwzwi0DKdAiRmPZytMQvFHu2AfIiuP1ar0IG7Isvr/1VQLVxsYYN3fhFSjS2VHXWvOL+8ltVpE3KKZnf+RJhGNaDOmF3TVSZtwLGf/MoxRh38gTsSRzAWqWiG/FNEziY4PNxoKgg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1990edfe-31c9-46e4-9765-08d88fb22d0c 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:49.8354 (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: xZYsdp7/GwKZuZotI7lcU65lQgShaC9y1RQxSihHvYhJZp4JTjXbybdou5DMeIyau3zAp4gVsBOE1lmOz2mtjUISlYda/zuamBGbKJIpzBc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4336 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 --- 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,