From patchwork Mon Jun 20 16:36:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1645601 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=TfHbuy4F; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LRb2h4lgDz9sFx for ; Tue, 21 Jun 2022 02:39:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9AC9F84004; Mon, 20 Jun 2022 18:37:38 +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="TfHbuy4F"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B89B820FC; Mon, 20 Jun 2022 18:37:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::612]) (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 954BF82119 for ; Mon, 20 Jun 2022 18:37: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=HR1Mpo0PQifdWcbpptQfT2ALnLEwmc+CIuI3mmoSs0TnEZ9FE7jboDygj3ULpddaOq2whoBHm7er8gQeS2Y7jhSA4KXyqLsPAPgdH1n4DpzDmGbRWemuoaVf3IJa3BDvkI02s6zPl5iLEL45fLzPm2YAcYY7ac997Fc3x5a4g6CoLAoy5J0g2rag3pX8tu4CAZa33fdVSlDwLgyFwhc+wV5rANIBdaHEGcnM3uFQUc9iFIzdcZE8xVilfpEXXh5srfGs2e8TmzDKa1kdQAATejqexRxw628H+U7+6sDTpkHl9QT3T5df1tscd3lRmSxeV4ECXpw1EvTbgBvDSLPvRg== 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=Umg27XgD+U3uylfHlNfgJs60SIG8i452HsGxjpsk+D0=; b=VVWjuJVzApPROWpvs04sbjaPdHBM4FXn2WsnXcSQw+YuR3J6ZN1bFeXEoARRAlk93YRlCLqZbB/d1ODOGPIKjCWwtu9I879jQAlYeTlqFJQ/CZvCZ4ttuKF7T5FrJiyY7s7HLlhPLCHKrngJ2T4/yX4YrQlsS3lTPP8FekRXzwD3OR0rVJSRZn4P/1y8fRNMv1D9ByPKWpuglyQmE1YzxqHudhlOVMDJqIMVWjiAcoUQXm9qsC7xa5c8XINqC/XNHy04JDJkJV2o5PMtdUC3M32Zh7dE4XC3I2wtTBtIUzC/gisutXfgniaPyuLP5Re0ixzIyjLdNBBMw0UM0O2+Sw== 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=Umg27XgD+U3uylfHlNfgJs60SIG8i452HsGxjpsk+D0=; b=TfHbuy4Fx8OQD39VLZJDeqOy0wzFKbKAEQ0FHY0JoEuFgRfrYNuML7wV9IjJ3KVycyHK2/dftR/ZF9et39XrodfuZToqKq9vREP9m0pkUuXlRWlbsVue7H7qhUefH7N5MsrwgyzViT172eywVLBT3tPwJp9KigUVT11ilFGsXoo= 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 AM6PR08MB3928.eurprd08.prod.outlook.com (2603:10a6:20b:a9::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Mon, 20 Jun 2022 16:37:18 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787%7]) with mapi id 15.20.5353.022; Mon, 20 Jun 2022 16:37:18 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Michal Simek Cc: Stefan Herbrechtsmeier Subject: [PATCH v2 10/15] xilinx: common: Separate display cpu info function Date: Mon, 20 Jun 2022 18:36:45 +0200 Message-Id: <20220620163650.18756-10-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0560.eurprd06.prod.outlook.com (2603:10a6:20b:485::10) 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: d4887e0b-7df0-4c96-1903-08da52db2441 X-MS-TrafficTypeDiagnostic: AM6PR08MB3928: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: Lt202OdCTz6wQS2Pp+2fvmvQznchtqidoiS0v+py4DndCG59nD9QEjtUoWjcblsFrPY55HWFYaHiKnGLSsad45mMMs6xQ7sC1qGVKbkzmqW4cM9m/B+E0YooZZSWpo8uYJMbLdU2dELvFkX8/3D5JccuXaOJkUGZvD8chPYgtC6PmW8UgE7Iqn19FVh0t+af/8bg44FdoJnxcn/d9VMzrnljZkHzNUpwpaYIliVXlW7OmT7nZ+cLlTj4fS+Tqwj+Fk5yE/KbdM3295OnUm1oxGhNEJpzblRtg6wUC9X7C5p4VsQC6r0YR5Ye77tppJcCtaNCHSgiCUydBi9HOrq0/ZOV9YT7Vu5BoDBJJoNPP/di7lQPUnxezCzJr+VP4wfip22ilQU9qmVL078O6Kt219LLcMo8/HcIVlDK3QKJukAOc0UjFkLNUrvIY8kvx0VJkceMJ5dMA/2DSgDysYUDEwFC43oMgL14v21C6fKv0xe9zI8Sinqaq2FmR9vlfYHG3pZrEtcLzija3vfoaNHqdmNVo9fjA74Gjbb2/Tl0fayxND8urR97k41Y6sUQiBcz+jbfs93xgHLBR6bvIZWM21TAuC5gd0CZtSJyNfz2eU6WkvpSKlruQhX7dc02Mbg74GA5InICZ3IU1yv8QGwDaxxUTlrLhj0VKUv7gMB8xj6QHokBah/hURuVOdB06Um+JM3TFqZlbLpulPvgG+n05w== 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:(13230016)(4636009)(346002)(136003)(376002)(366004)(396003)(39860400002)(66476007)(6506007)(66556008)(8936002)(4326008)(6486002)(1076003)(6916009)(478600001)(8676002)(316002)(66946007)(2616005)(5660300002)(186003)(38350700002)(41300700001)(107886003)(6666004)(36756003)(2906002)(83380400001)(38100700002)(6512007)(26005)(52116002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VSZXkkcFDmfHF7wVOxpVqx5M3KiqDuB6ZJJrOTDe1dWCjOlCZBuw8I/WpIFn13HCCU79dzhVGWdJvt6viRp5Ii08ZSCJsjnmoFdE1wzR6G3b597LuOf2bj3mzD6YhNWiP7PWE2Ip5JaX7kY96JSUSr8I+nwJ0MoyMgvIpi/Tu1g2/yUeYwgS4+AhZzaEfOyqwhy3YCxK8L+6LkY39tGFSeRr8TKxfjd80WiGphpGjzC4x5t8auDzlwdFXF1+WO2ZanCpnwcggr3z3IcNIbufK65POgPSkIpzYjfXDRd/5OqWf/Asdz1OJW3FiYK346RfmXA35olAAS1wMMvw11UexRdNs2pbpGtkSpJ2EiC8gaUbdPgjrxBdqA1cczgR9cJ+gAhPuvUyGpG4BUk1trlTZ8oJh6uo5NXevfTn6gfcU2dppK8TFdeTMJXeVbnPI35r/CBtPis8/0wbVwepH16PAdhVvOVgav3caLGE8Qn9frj3ErETfUMuZ5PKuNxijmDMc33imy/4yxuYmhj+BEA3dymvzXshCLWXqxK9Zil5hltjYaeieRmhX7jbM6YrPv/XuY24nxDNvhvWW4JAHdyCNcE379d3UPT6WIzR6P91mBI9PFZNdPQhhGXSLXKzjx9N0GGZk7+qyLv2/v4qh84Q+kroN6xxBw5ng/HRv7TOgy6+p368PC5n+HxryfcZdmed6KYf7cWGka2bW08X6l6tPwQJx1Juvb+byBTblU0n5ixqW3FGO/lgeXrSTngxL9VGkSEZ/MLfaVCBwsfR5DLiApcJUVXiEtfPEXebtqwNTxVq1y7xE7kLdqU/uAabZT1o/RPdSHcQdb3nYBBFrzGL5GuZouEC5h+PKf2y9PYt2sOf99pcoAxzsqDDX7+w4VEJBbi0PdfmWrQUM8PuGft4jvJcagPrP+6dh/kZhKLaXYo3F8sWlLnOWVmKWzykgZd3CEFIMGPkGiiCU3qzEFMrOZ1RA+cQwXhiNDls9WktH5b+X73EpNycWY3J4TrItzQ2cPR+u6Btb0W0rzfiKJ8yxR84liFOSl33tTIkh0Hf2X2+/6un7zk1E3MxZzocg8AU6JG62EVICF42HOEp4FqOpOu+Pcx/WNSeSQRWrcLGn/xCVVEQPQ+E8RpGLq5+vq0+yCYd4bWA8OGB3p2fGspG8cVP0mQFcDSBRSMzGxGh4dMY/GwGYPyjdqSqhDZV+eMU1WmTuOBeSG0YLlsGaKw0XecAD2ogGZVk+E0DajDLEQMylvS+qrxM1sRL4bgH6T15ogBuspPV9nXwD7RgOjKHQRF8TKsJIS0t3Npo2u440b8m6TZ38y0mVDOWSAwJjqjrBmZU7WzYON3XefEgW0VdqCP8ViVVpRdd/Iw2M9QTX6RgBDA7IPYLWdMhw/pyMqCjhcyiCoNuQRKlKcuAg5/7zTB0a26+ts14c/QQ9Ph3d7hXa0AVTjb+ZDkgGTXCfKqvnld/cgZFoqclSXPPDpCtcM1uNMeLsd5iz0Cb3YhmooxbFvSZRyewML6cHyZj0Ix+A5FCqIDHUitMjlisp49Sz4AsDK+9+GhJWfSzrIAWEt+IT1TDC8V8nu8MXCXSY5t1i0yy97RiWPBrNrAkJZDsLcX6aFC6PvHRRxUjZl+pwr0rpuOiZ4y/7W0w7AofpLLKVDzp4AtQsOeKt6IbgPN1WZZQoG9tzxo8F+F0C4OzKXQ3RfRGtvjxmaxMypGhvElui0Yt9+qLRhnoD30uNtRxzLVk7x3DuDk0KHK8K4wj0rY= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4887e0b-7df0-4c96-1903-08da52db2441 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2022 16:37:18.7156 (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: oC58RTccL+GRYulAfGKaKHuIfYXjrQhMg9PlN1ERtYmmk8YaFeQob8iOdzZ5uql7ia4PszYwN8C5vowIwAagFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3928 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.6 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 --- (no changes since v1) 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; +}