From patchwork Tue May 16 08:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 1781821 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-solidrn-onmicrosoft-com header.b=UcKro3rv; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QL8WM2kFfz20dg for ; Tue, 16 May 2023 18:27:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D5408663D; Tue, 16 May 2023 10:27:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.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=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="UcKro3rv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E46B84667; Tue, 16 May 2023 10:27:55 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::620]) (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 1C386846B0 for ; Tue, 16 May 2023 10:27:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=josua@solid-run.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GXSf2/YqormYjltJzerGj4hWzsVjwB868+XD3D4oVLHIPBmgM99leBwN0z2m1ISXgsF+rwC3XJb/Pq1iI821mfGgSNxSy6aBKtCa4FNcv+Sk6gDmpOdhoyucqTJULv13dz78IgZ/s6KaJVRsE+D7giZY+//BckUndWemXoa8hl1soRJGjYttFkdNXyUZVFt5WeLqmZWU89snfEiZoCh7Vr3AoVVVEYlPp+z34U7Fr7thWKp/ZA0bdA8q3kj27i+bEEY/OoGo1HHSjmZldFLLpe7EU6X04FAsfyL2g9Jy8JOj+cM+zar5Hf2mvzxIvRyT+sXogVDqJ7W7xGk0mYuiRA== 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=ehUx0YLYmvrKRytV4nCeo+N2mXgZOCCWtWu0ql8xEBk=; b=BWi77zUTtGrYFtMFpwoJL0zhOEI3EWElqD4LSWBYXruZ0zvQa9gog53gXDudO+m+X3Cj0i32vMngBkpYBREzfOAbBzoOCTzRK3gBRdNGcV4dL52ZYRFq06bkfSy0fTJWBO/cJmU00piP9g9V7w8oypTSPaiJiJSrp+Bnvl43ny4oEB48HHuB0LvlAtfrFnAlOTAZKUWHbIGP5PkMkdIdmPIg/sqEfMydwOekJnh6RNktr+ZV/v4TOcP7gO1UTtWQsqeOFIlekmRCva6NyPqZA1uO1xfMiH5TlwUmRgM/W2pbg9JLsMtdQAJ6veza5WUqUbmTHxJ8TlX2vtRnJD+g6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ehUx0YLYmvrKRytV4nCeo+N2mXgZOCCWtWu0ql8xEBk=; b=UcKro3rvY8XA4UQSNFlFfsI41hilxe8ZjAlCwsLvBks93L2+vfhxdQsATd/sMtr3Eez7sJKlO/pSgHKJkGQWaQjoGmBJln5+JnK9MsZNjYixzTbfD3I0+L9w7f2v/6Htv+JE39l2ue3krjkajAktlXhGqWS7a8EH8INSk1zyy/8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) by PAXPR04MB8592.eurprd04.prod.outlook.com (2603:10a6:102:21b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.33; Tue, 16 May 2023 08:27:50 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e%6]) with mapi id 15.20.6387.032; Tue, 16 May 2023 08:27:50 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [PATCH] cmd: tlv_eeprom: fix signature for populate_serial_number function Date: Tue, 16 May 2023 11:27:34 +0300 Message-Id: <20230516082734.13254-1-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 X-ClientProxiedBy: FR2P281CA0108.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::19) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|PAXPR04MB8592:EE_ X-MS-Office365-Filtering-Correlation-Id: 790bb87f-5d58-4f0d-9df7-08db55e76f86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 80pd+agj5IVZ7YeCesS28uV4P3VOe8J3xDYcq/14j1pqIEkk7Qp5WYQPD4L0BJ6JTpAKHcPoGi+4ubOMF2V4cCX5Qh+DaT2CYwIRU2Dq21rFH823wTtGibwJZ0UnfEOqOgSqRWMJUd/I8dCtOtzWm1c8bHN83gyiwu+xJubdpeNnt95Ug4O7oNbe0sflnPmoPW7lrPuISBCFAtSIUuSalvbBpt3YHny5v0cA0Fj1EVb7QPALWHGq7xTFW/HyYZG4qDJ+O+plOZoKZL0QE0Q8QxypYMnkGVj+e28Zj+dFIXh8YrQcUDCIHAXatfQo10RAqkNCH2RVjjFx1lFYVSB7PvM4oVOgO7Wc0c6XJIDRtO7/aU0ZOs9tMVYuXzw2kW1rHXfcJdPGE+sr0lvwOOYnnT7dIKvT0qdBotFqNZtepGnSoaOjgpkOrK+7/VMOTg6BfyiWSjfe4aT9IlUwkgob7sS1e6UW7zZvzvdXYqdot4Z/qmb//DPxc2VhRFrp5Xq37prfwwV1saKxx9RE8RmDWfrcvML6gqY6UWY3LO1J/SEuxiDKVPOUMXuTrjmStM1y X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8963.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(39840400004)(346002)(366004)(136003)(376002)(396003)(451199021)(5660300002)(8676002)(8936002)(86362001)(83380400001)(2616005)(6512007)(6506007)(1076003)(38100700002)(186003)(54906003)(478600001)(6666004)(6486002)(52116002)(41300700001)(316002)(66946007)(66556008)(66476007)(4326008)(36756003)(6916009)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vuLncKMbhMuwZ1Ax+X563wN52AYyjhQTGGJogQGKmmt8Sp5UZl7U5cuxdtP8f+sHBojWuR34aYiXkT9lDXrIjsza8esg7BZfEb4vHz1NW1/39SK402oSLn6iQagZBaYmWnFvv+8oVh9fWafVwYErWYlIGskGCcvlw97WutakU3d6CrUcy7MAJfiwsTv468UA2SLkrLV2nB8DzKl2W3Jm+Hag96sSQCRyZ0NcG07C5g5zajkvFxSFpQs2toWVJAkuRUb5B1EE8Mo1X6/Q6tL13J8Dt6qnSqAJm1H+SvkZyIbz8z7m2jsn8N6vFIpHzTVn8iyvW9HYDykAA5NbNXpKvojfVbixtuYbdSo8mfgZNJpAtTaeL/wiQzT4+G381xBtxvRTe/oYD7GdScKXRzk+EpXboOd4FKW6yv1My8a6taHRLXqub3pW9Uq0cYdXUc9fdwi5gJ7BWqdbW+GNOd7N0GqndOJv/I+/mVarV7umQfvBBpu5KNCa0xdos6YC6c98zZls85xvW8Vczy5IBk9rZj627vgW+V3K8X7MUMOEl2+vgGRX8dGI3cURJfw8UVDfDBUliXRbzfFfo2rJ5UlKwKNzFJ+hONOytnHH1vvQa6vfd3uQJMEtz0LGua/8cyLZYo5AlOQ21dSiaAHesDxxDea1gVr2o+XiqIPWWbu2qoagNElTQqqZ7BR8mshbjfmaNUUNu0Qrk5SPdtXXs7R4K72zVFez2oHSCVLg5S0UdpzVGJs/diY14Np3uffB8XJSWYRP8DKIT7AF5NslKP/WO3RM0Y+bwAsQ2CE1sAp7pBbhCKOoS0dVUfPUPIHcQbityToks8pRiAOzmLZevssVbz97uuHu4MuffD1EAhUfNDVHZ3Fsb2bB39KqduVNCfZCwy+sbUajKPX8QqoOUYHhPQAFmrEq0mkMaDqPGTUga83A6lCBx9RdWsit6pkOpcsOumU16hYvwhNf4eWRutL/VWMAiQGTvNZTQ5vf+Pc1H4h8OVa4vhT5QRJFK/aUGuMoY8DWzyK1u+AQE3BaogA6ReOPC9op9minnS/jM3Rltia6YRvzBDtHT8Ab1mhYGIIlOD2rZQbUqSSu4ZxLU1m3Q4X71eK0/3PRlUuAQ9cbnjTfWBXhWCAB0RI9GOKGrlUeTdyrHAICnn9h+2+Eu9AOpkraCemoP+FsgMs6U2yrBNymc0pEOiIJpl58MMd1OK5/VTiC9Oa+2clPETc24Vm6rr8HAihCzu3inxSW+Wygqx4m/bxIt59y6AlvIrPe2O9P5SBVL8NbKppd6V4ebfft25i/FLMhRqWFbffa9mwGVytKJl7SNvaCdzk7oRpo2f6gorHsNZjhQOU6Dl50PgB0+htM33X9/LYUQX5Opp7T7A8bm7L85UfRPELe47MMC7sAJFSMeTVkwDQX/rAqHTqcGqT5m0AlLZjGc/FCUwYfTG5/liyNSQvSx0aCc7snYZVlFNR/gsQ/Ne2KHiLgd/bszU2cF7zdCtj4M/KjN3JsEMtUwz6shy5eIRNcuCS295jpGzn4DSiHJQePmJ73pG06F+iP8c8STHHHkyGbsdZc9fXoxf+ahL02pzbsvc3dYBvPJ0lB5WpBErS4UDr+STb3T7t16ANaCqOCkXMtl+dptcc= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 790bb87f-5d58-4f0d-9df7-08db55e76f86 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 08:27:50.2183 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jmaKCj4aLyD32BezvtjUHH/y5aokQWBMsEM5ep9o1qKUzJHk5R2pVY0exZhaPLc9YBrauUbp0bCCW5ihTLCOwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8592 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.8 at phobos.denx.de X-Virus-Status: Clean populate_serial_number is not used internally for the tlv_eeprom command, but rather provided as a library function for external use.. Remove the devnum that had recently been added by mistake, returning the function to its original signature. Instead place a 0-initialised member variable inside the function to same purpose, along with a node that it only supports reading from the first EEPROM in the system. Fixes: dfda0c0 ("cmd: tlv_eeprom: remove use of global variable current_dev") Signed-off-by: Josua Mayer Cc: Stefan Roese Cc: Baruch Siach Cc: Heinrich Schuchardt --- cmd/tlv_eeprom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c index 79796394c5c..0ca4d714645 100644 --- a/cmd/tlv_eeprom.c +++ b/cmd/tlv_eeprom.c @@ -1100,11 +1100,12 @@ int mac_read_from_eeprom(void) * * This function must be called after relocation. */ -int populate_serial_number(int devnum) +int populate_serial_number(void) { char serialstr[257]; int eeprom_index; struct tlvinfo_tlv *eeprom_tlv; + int devnum = 0; // TODO: support multiple EEPROMs if (env_get("serial#")) return 0;