From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D42DC43334 for ; Wed, 8 Jun 2022 16:22:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 877C984382; Wed, 8 Jun 2022 18:21:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="IuFKYVzR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D25A08436C; Wed, 8 Jun 2022 18:21:27 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::60c]) (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 CC3F184366 for ; Wed, 8 Jun 2022 18:21:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h0A86cWlGlWeLbhP0d1ZbFMEEV3PVgctw+LhpqOPdVT11O7fWItapkrM4hr6CRfhsavpieZyrQ0PmKXjHqwS9K7/J4TAQH//Zmh14kUvSyfSRjJtwl18w8oE4wmwHJMjphEqVU7opU8I/svq2Zq/8VV/dxzY1HYNV3VON0jkMN55nc3V0xydPUKlh1k3dJV7cIBN3GD7QFkkxV6CkZW2E0+CW2hJXXnv/hKeqxzoe/8GiSjYDlB28UUmN18WwnubPd7h2tKcb4ZifPr2TusSr7ra5NTpWwx3uYYzxCngFXPwhWbPhml6SwcufNI0tI0APH3AcMv0qpEpognHZVcEFw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=neWsjZyKw1i8QsNZvkhT0iVYvbEeXM0YbtXyy1MKEwM=; b=bR1ldn1A/LTDcZ6ZJFDXSP9j9yM47e4LJK5bt61jSOn9UeET3X1GChGoq8pzVGihSdBVkik3t5i/6v6g/cQsIeUnk7J6p8XNZjjf3NpY31ha85saNuzUgbp47aq6dFtCXZtPOB838IVrjr5FxTd0xiMgIgZKlkJT7rw6a7q1w+PtuS7WynEUKVr6fstvQyibQaz4qWaTOHi5jU2dC/wF7eqeuMBTXI+OJGKAvDXr0sUf4upnqJ1lVuMiAcZzMuHyLxr53AiEVv8d1rbTC9BiMnVxgMwK0d7z/6XAazApDn1otWI/voGzr/grGIMUE69Eff/VG22aAEkL/534A87udQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=neWsjZyKw1i8QsNZvkhT0iVYvbEeXM0YbtXyy1MKEwM=; b=IuFKYVzRLsNnFlk5yaUBXQg5ld4YFuwfcg8DRsxxoxw5/eG0n42/B+iCvh+PqudZhCGvsez05DthAY58ZHd3N1GuzkEdrgIWNe2upslUQZ84YPfqTakr+ig56gpwwWKRQvXR965e79PsvTkp9JbRQgo00vhnhqyySo0zenbJewQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by VI1PR0802MB2189.eurprd08.prod.outlook.com (2603:10a6:800:9b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.17; Wed, 8 Jun 2022 16:21:19 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f938:78d7:da4b:8d23]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f938:78d7:da4b:8d23%9]) with mapi id 15.20.5314.019; Wed, 8 Jun 2022 16:21:18 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Michal Simek Cc: Stefan Herbrechtsmeier Subject: [PATCH 06/10] xilinx: common: Separate display cpu info function Date: Wed, 8 Jun 2022 18:20:49 +0200 Message-Id: <20220608162054.25641-7-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220608162054.25641-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220608162054.25641-1-stefan.herbrechtsmeier-oss@weidmueller.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AS8P250CA0006.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 838882f4-07e2-4c56-94bd-08da496aeb34 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2189:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cKf0PHrDbxNaR2Dw1obnmdWoppMPykG9w86LlQoPNLBhcSW9xutPzIzKYwExvJkmeEnRgJ9wRl1hA9pOnk204KoFOZr26Y89RlXPy1ZUf7JEqI0dtT3EynBSWx1+41s6v+IwkVA6TdudofPItpo0G5PAm94q3J2LMRgc1zG3Da2DRYnBvOpbx5tKsdrOKvqApMdWix2vAQFK+PMeTtu/A33prEcuwVTlsAMloi8AI364IE2Wa7i9eUx78yE0N4trgM7IH3Qs86o0QjabABywhGMbuYb5G+yQSst9opELr9dMTOKtAyr4jXywT/5vYPkCCXgBSEOs70Y0JaGsnFNPyEuRmABhS/23UUohMORuDBsSfv0G2RKpcEI4VAlxMPRvSmtnL53+GRPuqYqavqUhaEQWyKV4IxHTU4sLLfVtZFTvbN2+4toRwfqu2WKkY8Z/97IJbfWJs+2+cqBoFiSz7t9QLNeH1ImRxCVTBq9GN1a1rCfKlYfcPDXdAsS3CVk1IWKM9HOjSmvW1SIBRzjU0CeFyIfRlMjrASZmL+MPeyjBtnVttgh4jRwiuL4n6uY/oXVNhmo2ZB8f63zy+dzVHF97TaKsGb/pkGlKIeBrP8UY4ykbIJHrwfBRljjgnY2bZuMUTK1lDErup4VCj/iMfG+fUoLTelEU7pp1k+/NLy7FP2MVcJB3rBMfs8oWPgquz1Eh4q1CEJjkKiqbmBGpAQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(2906002)(66946007)(66556008)(66476007)(2616005)(1076003)(107886003)(83380400001)(8676002)(5660300002)(186003)(8936002)(4326008)(6666004)(26005)(6512007)(6506007)(52116002)(36756003)(316002)(6486002)(86362001)(508600001)(38100700002)(6916009)(38350700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qECLru2GZBJH3jueo2qJaJOoZYjMkXfKk0PW9jCkI3fRWjiMv2i9g7WalaDS?= =?us-ascii?Q?IhCGrRY2p7EI0X/8gFHInrSVCd9NxWm7ml3mVmn9qE74dGGM7TRrG8uMGCDc?= =?us-ascii?Q?RY7o4egB3RayJH817hTUHWWeWGUPajg+8DMvceiAHuBeqdjLKs8BrVNYPGFG?= =?us-ascii?Q?TOOutlOXG6hxWMJTNjr6AqB6TqBl684F6f0cong8hWiQMOxgMDaIp8te7Lc5?= =?us-ascii?Q?7+hm+ij3wjDaakDjd0b0X1J/r7fuK0syeQH6Q608jnAUGUkd0THpvVprfMOk?= =?us-ascii?Q?gHrkGW1oCgTIYcGIyW9CxEx4JZrtdEXQTTZSx25NUh3QOWty/tvMBzUSYo9n?= =?us-ascii?Q?jtJZ4Ylt08nlEvstXo6/1dWBw81qnskSkeVICTId2X9FoR1t25N3FINJB4od?= =?us-ascii?Q?pvbw354cPBHAghrhApMQzNd9nPUAnKsso8+0LCjlvvgtRsHhKKalXm97ta3Y?= =?us-ascii?Q?83juLIqFjrpGcte+CdL9UF0in9TMzFE/zXzQy/IFMjkB4+sgEPpPvr5iDOHQ?= =?us-ascii?Q?3gb01zs09C2W6llK4RnYpT92ShZSsHULBZWHMSf7cMcr/4eM+JemKJyKMoJl?= =?us-ascii?Q?mHl/G/AYmxAdU/KHCrNo5wKjjxftBB/mhf/JroRSlbVxQ35KIkvjJX+ib6Ie?= =?us-ascii?Q?xJ0bJS9uPFdK/VVHXJucOn5RDiNLYuN3ra671BSgPpTruWxhOkIdohgtpv8p?= =?us-ascii?Q?ZltwCbt7oCOKL3/zoDxxY2S9Lwgk0yZSxzWZCboTDz5a7r9RCET/QD1Rua/7?= =?us-ascii?Q?HTpy5IXlxXqpBKKGoF6n+0G37eowhLoDprUo8ylNWsNvqmZsFu0pQFdgchlg?= =?us-ascii?Q?VpksFG3F7IFzLu+dPslLzJsUkyjXH7B76mbCQqOEKnbFkY2Q42gbtZGLSiHM?= =?us-ascii?Q?ZOLM8y48+BijmidsDRnWCIbXfdqLVxraQGkE/AEKw3Aw8sl2+gcaGoBilGKU?= =?us-ascii?Q?E2tIQdFsiau9bQvJy9WzajiKb9K0jNrYwI2U45iVenf2DiqeauRPSlnh0CT3?= =?us-ascii?Q?lwUG6biMmcoKVIe/nQsTCDx6t8Lw/xfbkB/pAyww+6PKPGH2DEu66+BDNlxB?= =?us-ascii?Q?LNtuXiOFyRZBb+qD5OFx47O6aSYt/ZGyo2MjmbyKtuYZOez6P5JDXLj90X5g?= =?us-ascii?Q?SNvHNw9Yq4EruNOZF9mD+JhD6y2Y/6v9bPyUTPJ48fkz9T7DIp7T1UbvOtYL?= =?us-ascii?Q?lmbHF8KtKHcAToFosRamnMMhehXmWPuo5F8i+mZhlVXpFeCOLavjM0E52YA1?= =?us-ascii?Q?l7kUhQ/Q1T256xGBp6GrS+14mRTTQerRkEiEPSye9DmcEY6yb3nraRcVnP1p?= =?us-ascii?Q?IGD+9Oydk88/wv/sq9e9euUm6k7T7f6antHq52RR7YdmXrxm2pxGNPK1fMRJ?= =?us-ascii?Q?YuDMZuS2uvz7dBDPxsdtlKNQreOrLgrvZmdSQLMG6xQSr3zPwChETS2pHSvc?= =?us-ascii?Q?POCSMbj5SIBWGUZw8r1U5GJie10jlq81g/T9k2lGA3ERPkV7Cd7GDoPunGbU?= =?us-ascii?Q?3EpsRwyamOMYF9+//SJv3fzsY1yRJXvTsNVzg1pVOJeTAzCScKjoUHgvDz8I?= =?us-ascii?Q?0/m1fT83e5zqje4wbRt+23Vy11BtdSoTWayd72q+HgB5BlMIn1FwqG87XrCp?= =?us-ascii?Q?68ThWTLxSq/dYhwxY153jEpiU7379N5wu7p4IIsLIdqtcttn0BvUtzuKUyKl?= =?us-ascii?Q?HDzvAOPzl783uhCeoD3/6YfFDd7ouT7G6eH3x1yimEm7uCRkLGV/lNAUS1FC?= =?us-ascii?Q?NPNnHqoJRfz45fzlsQezTmMPJlZ52C4=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 838882f4-07e2-4c56-94bd-08da496aeb34 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2022 16:21:18.8892 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ArNUslBpVZrJD6Lvb5FZbQ3gYD+l5lsVWG7r1uOxnegbHn1KWVIPPemwUsGkWgzZ3pqzRAu1UXRf9zbgrOxj7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2189 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Move the print_cpuinfo function of CONFIG_DISPLAY_CPUINFO into its own source file to support reuse by other board vendors. Signed-off-by: Stefan Herbrechtsmeier --- board/xilinx/common/Makefile | 3 +++ board/xilinx/common/board.c | 29 ---------------------------- board/xilinx/common/cpu-info.c | 35 ++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 board/xilinx/common/cpu-info.c diff --git a/board/xilinx/common/Makefile b/board/xilinx/common/Makefile index 212028478c..cdc3c96774 100644 --- a/board/xilinx/common/Makefile +++ b/board/xilinx/common/Makefile @@ -5,6 +5,9 @@ # obj-y += board.o +ifndef CONFIG_ARCH_ZYNQ +obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o +endif ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_FRU) += fru.o fru_ops.o endif diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 402fa77006..5f2afb9def 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -485,35 +485,6 @@ int __maybe_unused board_fit_config_name_match(const char *name) return -1; } -#if defined(CONFIG_DISPLAY_CPUINFO) && !defined(CONFIG_ARCH_ZYNQ) -int print_cpuinfo(void) -{ - struct udevice *soc; - char name[SOC_MAX_STR_SIZE]; - int ret; - - ret = soc_get(&soc); - if (ret) { - printf("CPU: UNKNOWN\n"); - return 0; - } - - ret = soc_get_family(soc, name, SOC_MAX_STR_SIZE); - if (ret) - printf("CPU: %s\n", name); - - ret = soc_get_revision(soc, name, SOC_MAX_STR_SIZE); - if (ret) - printf("Silicon: %s\n", name); - - ret = soc_get_machine(soc, name, SOC_MAX_STR_SIZE); - if (ret) - printf("Chip: %s\n", name); - - return 0; -} -#endif - #if CONFIG_IS_ENABLED(DTB_RESELECT) #define MAX_NAME_LENGTH 50 diff --git a/board/xilinx/common/cpu-info.c b/board/xilinx/common/cpu-info.c new file mode 100644 index 0000000000..4a863d00de --- /dev/null +++ b/board/xilinx/common/cpu-info.c @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2014 - 2020 Xilinx, Inc. + * Michal Simek + */ + +#include +#include + +int print_cpuinfo(void) +{ + struct udevice *soc; + char name[SOC_MAX_STR_SIZE]; + int ret; + + ret = soc_get(&soc); + if (ret) { + printf("CPU: UNKNOWN\n"); + return 0; + } + + ret = soc_get_family(soc, name, SOC_MAX_STR_SIZE); + if (ret) + printf("CPU: %s\n", name); + + ret = soc_get_revision(soc, name, SOC_MAX_STR_SIZE); + if (ret) + printf("Silicon: %s\n", name); + + ret = soc_get_machine(soc, name, SOC_MAX_STR_SIZE); + if (ret) + printf("Chip: %s\n", name); + + return 0; +} -- 2.30.2