From patchwork Wed Mar 31 17:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1460665 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=fOrWd5tR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4F9Yll4dGpz9sW4 for ; Thu, 1 Apr 2021 04:51:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 664F6828EE; Wed, 31 Mar 2021 19:51:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.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=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="fOrWd5tR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B87D382898; Wed, 31 Mar 2021 19:51:03 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::626]) (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 9727282898 for ; Wed, 31 Mar 2021 19:50:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EypMvjUxE0LdZzOPpT9qc0iucSOqPV+mAxqBebUjonfX+vzecddcmCwQN+MxzAw59T/lFP00WUlPLXt3qc5TQ9F+TE0mIgzjT8JYP/UP/Gx9u/p4IvhqQCkZJegWM1uVI33lLt//Z12XitAbuVYuTMGs0GUlfSPmhlmo/uRlBXUhxXePufR5EI3PZFpTiu4xAiO0KTv+EwYIrT8g2hsPQNYlMpSw4G9WBSHrKc0t2UZxT92dngQUyORA0XwkdMNnmsBNYy/4z+dPD2pKCJaA+uNY5VkPL1WdfvTpED3ZzwMjNmkfOnJxC4Jc60T6Geyme9kQrSoPpHnKXETWJQmkRA== 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=LpJBQLwACj5CJXPzmdm/j6zClD69wW/64B2t96E7chk=; b=WP7qlifq5kXU30h8LpgjQWmuEMBw3wALFNVokiRwBh76lC29+L3HYxSilED8mAOYYvcCwP6wNrA7ZMlOTh2qyHpMyl8PZWjP1ZxqjT+b8amxVOEX0bupecUraIYUnVHUIptZ+JGHQQfktBvLHvEWsm3u8kCn1G3S4KC8bJnKLBUQo7V8YB5kOVP/46U4Quk1nBx8B6iFc/dm0hXzjTR+zTMVGwfCzvdLG9RBv/zHia8vho76V4azQ1B+f9pI37jU01y3tUSu6auAXLARziNaZIkCsQEOxSv5pMtVMD7H7vdR9JKYmV6D0qHc510jbOkKbLMlkCoqNdgRu1G4mSUlEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LpJBQLwACj5CJXPzmdm/j6zClD69wW/64B2t96E7chk=; b=fOrWd5tROBtXli2MXM+2kAcMrDGPGGjKmjssjH8ShW5tgrxdD0+RtJFs6Rn4MolskFiJtDefQ0FKZLY7zOlyCK0No8sj4XsumT1R7fUokFa2JTjQ8aa6RaFQGYbr2n2x/JOMMy9L9EHs+PdrulRyllCu1H9SM/4WYzw6C0jQPkE= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.31; Wed, 31 Mar 2021 17:50:55 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.3999.027; Wed, 31 Mar 2021 17:50:55 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Bin Meng Subject: [PATCH v3 2/5] sysinfo: Use global sysinfo IDs for existing sysinfo drivers Date: Wed, 31 Mar 2021 13:50:37 -0400 Message-Id: <20210331175041.2122432-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210331175041.2122432-1-sean.anderson@seco.com> References: <20210331175041.2122432-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: MN2PR18CA0014.namprd18.prod.outlook.com (2603:10b6:208:23c::19) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR18CA0014.namprd18.prod.outlook.com (2603:10b6:208:23c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Wed, 31 Mar 2021 17:50:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b93b7856-3ab0-4534-4192-08d8f46d88a3 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 43T3bO7o2IKcLramapaLMFjgA9nlOX+BpIRty4QEWutPiGOfxHNA5MUdm25q3N7PovMhIRel2lWcdT+nl2goa/DETfdAvTFopBR+7Wf2OT+iu1lOtdKXY/AmUSDId/Kx2KorseGT+AD67xS9gxAd72VnRY8fbFISPEnOXQXEwTeSD4+D2a4UL0798BoP/CVgjTi1gpb2QpUMDECqDyzF76RMGKr8IKK1soSRyE96XtQxjj+gy81QOW9DrjkN6RanQIRQZUQECjiWFn1JXNOPeK/LP5fqK8Kdi8zHsoUN6qnfS4Cv8dywMFtDyDX2wP1XBsiNad6OJ6c+r/L+8HpNn2x7Pe43grxu6hfT66/5ZQ3CkotZ36FfMJuiMbANXOsd4G4YD8pmsUSb2FbjYy1ASwT7CTKGJJOeeU2dL7apt+bPFkwxLtNHry4hZtMbJiluzcRf/cLp1227mhGBHzZ8U2VM68WcOhnT4Lys8J/8xQC8oezD0xyJ+c8Y44vpmZYjAy+MG+3cHDYnWu097mrC9QEjdzcGdm/QYsYo6tJsI6j/WaBP65LdaIw0TOuk9iBRYhGe0sg4vCdNWtKORnuNJbQDWUlTm4iU3GLkDO4Dkzc1Ot5wdRdPhFEUJO9lvhpqpnouHWX5dCE/BgP54TbmJw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(376002)(396003)(136003)(366004)(39830400003)(2616005)(6512007)(83380400001)(4326008)(38100700001)(16526019)(956004)(1076003)(5660300002)(6666004)(86362001)(6486002)(44832011)(316002)(8676002)(26005)(478600001)(66946007)(36756003)(52116002)(2906002)(54906003)(66476007)(6506007)(8936002)(66556008)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6CuXgUxtTFXytvtagBLfUvHG9Q2pesDVx1Df0qz26S3U0VYkkDzkREslIByY88o+7a5jlFMrdzY02WES2x2j4d5sro6zCQCIpC3cYghkTbyJwAY++rHFquMuutjX4rBibbXFtLr8lT6soSFseYnPeZftFpjw4zyJ04SjJ9zQqIT2mbM/rngev+FxnBpJaw4JohnO4YE7fQCEkSyDsd86Daijm2+kpVOPH9MpYSs6F4+satuuhy59db1BASTjiw84sOlGekqbYaUGQ6RBd34n8pYi98YH+8osZIhRG+aBnOdFB2SPRtlj2nJtS7RD1S/yYCNMetASEYDu8HOMM24AmZGr9jKH6NFqq+D0CO46i1BP3g9F2164pkIlMlaIoocWxZE7Jaw/343IQNu/PDQkajd1FcbBu35SB4H+n2H+Lc4ks0reMjxu4Q5/ElZnsqgc5tBGfSIgEz+FvB7O1qSnsqCIpew1H6othNmUyDLxXyjb3CrEIFmqpIgGJb0DMRuRwRVIeYp25dJpDX3uQSR29ORfZy7gLE4zTZE781RZTHv8sywkcC3GGibjXePLK/RxHfE1K01UHtal390BKRrmL7MJm9HRM009P2YwllBCP5IrkJdmIAYpx9VHY4PALslo7XXd8KyGGcqsYS7nTHI64OQKeSHZmdX/bMnNFjUN8TRisdjfyWy1wzPEp7JnRkpAXy8IrR9SND2fB320Cw0qrOkOVEyBEP8ydVQHpQGgA6ij+iSmMcMv++cwNAdjNNTZXZUfG5MwkCFj1qVMR33FYTnjW4JNHt9iD0KrghFdMJor8/UchBm/8TnVXtP+KnUB1rORgPmZ4mQ2IwuDykSfecApDUVy9vav/B7DliQdSG+expqOmUKjcJDly0QmxAZnubbTGM2/z2KIqYdZ/z7zHOPX1TPxK20xXI9Tcsp4Vb7sXUOLx1xj1syCuAxrMVt65wTUysIImyzuvVydvXgMshIcQ4hudKhnWC4ZhgRgtjiZ0UFI1FBbjFWT0AcE1DYCUt5Vdo2gVY3fFFdUUK24/camUofI8hq2fjBGT+jggMlTi8TG+3ayGjn+lnjLyzw7toEXnnKDaZT+X5G7CV6mnzaUIoDtMrgyqUm8TXxHRvGI24F69Q3qbH7wiN4zYjAGlbWLHpZzxY1ZcqZ95HGDAWcf+EH3BcoZBEZDS5wU5Tq+y/kTNcSKpE8z5KtnOQx3CViXjiuoWJtSF3eISvuYtXg2HwRAkJx8bpms5UpBBWBUzbL5aFtfwg43b725rr2SPMFt508NrG9pCBaJdkAoPZu1TWBG99bIf8ZyrNPvXJpbovHBTWWuELafbLHjIrkQ X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: b93b7856-3ab0-4534-4192-08d8f46d88a3 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2021 17:50:55.6037 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PS/u77QVfp687nWDRRbcUu7KgljoDaSzpG9Pue3n3lkKxfY84PX0bbyZnsusPp/gwTnzUWu5/JLP1BLSFNimbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 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.4 at phobos.denx.de X-Virus-Status: Clean Since 07c9e683a4 ("smbios: Allow a few values to come from sysinfo") there are common global sysinfo IDs. This patch moved existing IDs above SYSINFO_ID_USER. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v3: - Rework patch to use sjg's sysinfo IDs Changes in v2: - Set BOARD_HWVERSION to SYSINFO_ID_REVISION, as they represent the same content. - Use enums instead of defines for sysinfo ids drivers/sysinfo/gazerbeam.h | 8 +++++--- drivers/sysinfo/sandbox.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/sysinfo/gazerbeam.h b/drivers/sysinfo/gazerbeam.h index 171729d203..6bf3c0098d 100644 --- a/drivers/sysinfo/gazerbeam.h +++ b/drivers/sysinfo/gazerbeam.h @@ -5,10 +5,12 @@ * */ +#include + enum { - BOARD_MULTICHANNEL, - BOARD_VARIANT, - BOARD_HWVERSION, + BOARD_HWVERSION = SYSINFO_ID_BOARD_MODEL, + BOARD_MULTICHANNEL = SYSINFO_ID_USER, + BOARD_VARIANT }; enum { diff --git a/drivers/sysinfo/sandbox.h b/drivers/sysinfo/sandbox.h index 2cff494f56..d9c5804c26 100644 --- a/drivers/sysinfo/sandbox.h +++ b/drivers/sysinfo/sandbox.h @@ -5,7 +5,7 @@ */ enum { - BOOL_CALLED_DETECT, + BOOL_CALLED_DETECT = SYSINFO_ID_USER, INT_TEST1, INT_TEST2, STR_VACATIONSPOT,