Message ID | 20201122083556.6756-5-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=Yq6fiiQd; 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 4Cf3bB5jtwz9sSf for <incoming@patchwork.ozlabs.org>; Sun, 22 Nov 2020 19:38:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27E47825D8; Sun, 22 Nov 2020 09:37:36 +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="Yq6fiiQd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87B5C825C4; Sun, 22 Nov 2020 09:37:25 +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 NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::61a]) (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 696FC821A4 for <u-boot@lists.denx.de>; Sun, 22 Nov 2020 09:37:05 +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=FyUO/+ySgbB41o/1Eo+FqVhCNoAwFn7dscXn6u1Q9PPK5pewyPqrJOTFycitJQE7Qsv7roHG0CjDtVpcpyqz+jLrWuz38rv6k8epg3I2MAODDyqPd0IRGMatxTIyYBE6C9hV/WXNsy8Leumo1/1K0NkAyk569C8MTHALJFTq4zyb5TvcwRunBFI/1oemOgwW6mkEnjD2MO4sEw9vz7EqP3Ur/Vo4SkPyg3aYNvHq/7TRev8dhWYnpXD75L9jzz1oQ5ldactAkmvM/ATeKmzBJ+SBR4TKW0/j2QVjHLtdy6lkhaJle5/k7pTI6CNqy71gOLjQfVgsCJcRxQbvDElmwg== 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=Q6Rr5uTurhD3CrXZ3tWKoSCMtO8eJOCUV9fn7p9trqc=; b=kdE9ltLa8QKmSY1QGQUXavqBoZSGeIikvNg8c35EZA39dVA4gFGpckH2zLhmS0B7bz9AfyUsovuRYwn5tI2XX026ShLBQdqL7UQYzMOMbkI5s8yrJ1nIZNuHpjik4aJSolO7wOX7+ryxOM9rRb9+mCFUGhqErGioYtixiSjBn+zLo0TwkeP8mEF3M5Y35PALcZz9C1YwqjUNqb8OiW9WaGTeKqbHVhIt6ser9qgyhcJPbBev9ACwjchwYUI5O/h+N84o7YyD57e5nq9Q1ycoT6JItMGMCylQ8rtr5BaZTAb6FlRJ7zKKVYl1ZSyYkY74HXcOFTIEnPKruTGarzuIdg== 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=Q6Rr5uTurhD3CrXZ3tWKoSCMtO8eJOCUV9fn7p9trqc=; b=Yq6fiiQdZDs+f36pIncn2LVs+Y3XkMEheHXwW4XTA9QL7awGg04e5AjwvQ9iwr4ihw3Ds7uyFMlnbo3sBVA1LKMWeFvaePaFVRJnhsZJ8Vcgzi/WCs9wgZMQmS4obdDMCtYRpUMkC3V9dt4jOGuGq+9MSec5TV0NZFykxmH2ylg= 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 BL0PR11MB3345.namprd11.prod.outlook.com (2603:10b6:208:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Sun, 22 Nov 2020 08:37:02 +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; Sun, 22 Nov 2020 08:37:02 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 04/18] common: board_f: Move setup_machine code to setup_bdinfo Date: Sun, 22 Nov 2020 10:35:42 +0200 Message-Id: <20201122083556.6756-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201122083556.6756-1-ovidiu.panait@windriver.com> References: <20201122083556.6756-1-ovidiu.panait@windriver.com> Content-Type: text/plain X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) 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 VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Sun, 22 Nov 2020 08:37:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d2a9fcd-2a27-4d39-ce40-08d88ec1c893 X-MS-TrafficTypeDiagnostic: BL0PR11MB3345: X-Microsoft-Antispam-PRVS: <BL0PR11MB334569D37296678D2EA845AAFEFD0@BL0PR11MB3345.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g9Vf52BtLzs22hrUGZcMGhX2Dmpm9fXmCw8ZYbDX6YB18WNufQwxHJ1653C72CHp8hhikG93VkJu21uL6mk8C+m+j5gxDBAQaOutOGK5ccPgQ2wHvJs9cMvqb9Va+MVkw2nVzqvHjCZLgj7c9HvLTG97nFacKxzp+yIUH9klcvktReZscNK1ygITiQ7JwTy0f4V5thLWfgNcvg0OEMSHes/klRDetHX8RwEV1AW7O9YMjVVE9HYfqKn4xaZSCTej0jPTErEnj60GOQUG3H6kIRKA3qsTA3CW6TLv7mue1Xg4qupA2deOr0+kJuix4EiAbbe+2E6vm/n1A+Kw6mdNqQ== 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)(396003)(366004)(346002)(39840400004)(376002)(136003)(6666004)(1076003)(2616005)(5660300002)(44832011)(52116002)(8936002)(66556008)(36756003)(83380400001)(16526019)(6512007)(26005)(186003)(66476007)(4326008)(6506007)(6916009)(86362001)(956004)(66946007)(6486002)(8676002)(478600001)(316002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xyjp7UFr5MdKg0cm7aZWu8Ff9jzMbt4dTc2PzUMfScfoygm3dJe5w5Pi2gZIz4iYfI++nMkkblE222x/O4cjlw4SQX0Wbtfct/ZHNMqWOwRxi3ovKMrY1fHv0Bx3l4/LjtRH4/arIb1mdAw72pqJtyUSqXvgxHs6lac15XiLbeG9Wqb8wLiJXY2pRPo7ia3ZXCi1oPKz+WV1Uv0z8YXkzil5YKFw+M87WMvEAjX0IHYI+uWHsjEgTncASbCkR2AMrmBMm7PqokxWFu3C1zoh6qMM2ys05xcxqTEHqp7ymOcWyNYBBYaHkZIqlFHgSo27tSWx99KriWDHNHMbKZZ3ZOuuwjByESKhGAHPF8KQZCC1wFZoynEdpfqi1WcQjuHi6UTOiu9s5WbjVhQ4D/Es2bZCzgwh5T8zKtUeic9r2bZzI3H+sCTcOFJLgrwlZDdAa0lfTrXadk9MzaNKsT0m2Xc7j15dSf2yk9na5FTYSB5ADZUYMhzDy546RczLM/6abq6H5GiP8VMbyqsuNlKUi9RLyqM7v2RUbGjR9xXV5loee0c4BonQ7rkg9bodY+F7WG9oK/9X4bCo6V7R/RBpX542LhDytpSs+p53PtW+KTo4at5Ws6/LV/bbP6IFXijXVC4P1V/PnWOrqZJboWijdsSDnLzSoqYGQHYYXYCYL8uMCf3jbbjqT8f3ZcZWg+1cPvrB0PsTcfDwsYksz85dOaZeDdAUpQ772ZZq7wRgmPCP8goNkLBan0Y69CAAUxHbfba5LTuKXo1zb2Un3loB9a+DTqnskGf1+IVi4PXlsJYHVtF8f7JUjNPmAi3QOU5jSWbXaj2BZmVb5vnZPRTkcWAAJHE8r9/y54nDCpuJauN4J9NJf/YtZHugkdQUEi1+psO69qsun1M1Xl7Hw7uH0w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d2a9fcd-2a27-4d39-ce40-08d88ec1c893 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2020 08:37:02.1485 (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: a7MdEJ3DFRcMX1ku6xyMAkwOFAogpiJyiHcAouJ/oUW7Afp9Aac9yw2/1Jxc23aGBL8+nWQpYGsrr0Xjm+mhypMzR+nczYD2b8xEJtgA3r4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3345 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_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,