From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web10.1947.1608583148205064555 for ; Mon, 21 Dec 2020 12:39:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=MrE7LmFd; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: msalter@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608583147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Od9Suia/P4ISpHzWbOC67LICBYTKIsthEAL7qc3v+M=; b=MrE7LmFd6HxKu20+i+m8q2MZToObSY02MSILsq9yiT0ocx+1eKp1AYq5bieY9GhcxTn5pp McPNkWy7xFJzfiBnJU/zXawyGNUV9qOFeniSKA8IybJQ7lHonstujJd3zsUd0PUwq0Mc5u ECh9E1dDMDBLt8kQfA4Z1LgcbYWv4Xk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-570-ZDPSChHoN4ep6-iMF8LE-g-1; Mon, 21 Dec 2020 15:39:03 -0500 X-MC-Unique: ZDPSChHoN4ep6-iMF8LE-g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D3278049C1; Mon, 21 Dec 2020 20:39:02 +0000 (UTC) Received: from trippy.localdomain (ovpn-118-51.rdu2.redhat.com [10.10.118.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBE6B5D9D7; Mon, 21 Dec 2020 20:39:01 +0000 (UTC) From: "Mark Salter" To: devel@edk2.groups.io Cc: Leif Lindholm , Abner Chang , Daniel Schaefer , Gilbert Chen Subject: [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Date: Mon, 21 Dec 2020 15:38:54 -0500 Message-Id: <20201221203855.635031-2-msalter@redhat.com> In-Reply-To: <20201221203855.635031-1-msalter@redhat.com> References: <20201221203855.635031-1-msalter@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=msalter@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="US-ASCII" The "ProcessorManufacture" field of SMBIOS_TABLE_TYPE4 was recently renamed to "ProcessorManufacturer". This is causing a compilation error for RISC-V/SiFive builds. Switch to the new name. CC: Leif Lindholm CC: Abner Chang CC: Daniel Schaefer CC: Gilbert Chen Signed-off-by: Mark Salter --- .../RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c | 2 +- Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe= .c b/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c index 6079513a559f..b30f9d7f6a18 100644 --- a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c +++ b/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c @@ -142,7 +142,7 @@ BuildSmbiosType4 ( DEBUG ((DEBUG_VERBOSE, " Socket StringID: %d\n", Type4HobData->Smbio= sType4Processor.Socket));=0D DEBUG ((DEBUG_VERBOSE, " Processor Type: 0x%x\n", Type4HobData->Smbi= osType4Processor.ProcessorType));=0D DEBUG ((DEBUG_VERBOSE, " Processor Family: 0x%x\n", Type4HobData->Sm= biosType4Processor.ProcessorFamily));=0D - DEBUG ((DEBUG_VERBOSE, " Processor Manufacture StringID: %d\n", Type= 4HobData->SmbiosType4Processor.ProcessorManufacture));=0D + DEBUG ((DEBUG_VERBOSE, " Processor Manufacture StringID: %d\n", Type= 4HobData->SmbiosType4Processor.ProcessorManufacturer));=0D DEBUG ((DEBUG_VERBOSE, " Processor Id: 0x%x:0x%x\n", \=0D Type4HobData->SmbiosType4Processor.ProcessorId.Signature, Type4H= obData->SmbiosType4Processor.ProcessorId.FeatureFlags));=0D DEBUG ((DEBUG_VERBOSE, " Processor Version StringID: %d\n", Type4Hob= Data->SmbiosType4Processor.ProcessorVersion));=0D diff --git a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c b/S= ilicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c index 88f36cbbe299..326c4525bb0e 100644 --- a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c +++ b/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c @@ -198,7 +198,7 @@ CreateU54SmbiosType4DataHob ( ProcessorDataHob.SmbiosType4Processor.Socket =3D TO_BE_FILLED_BY_VENDOR;= =0D ProcessorDataHob.SmbiosType4Processor.ProcessorType =3D CentralProcessor= ;=0D ProcessorDataHob.SmbiosType4Processor.ProcessorFamily =3D ProcessorFamil= yIndicatorFamily2;=0D - ProcessorDataHob.SmbiosType4Processor.ProcessorManufacture =3D TO_BE_FIL= LED_BY_VENDOR;=0D + ProcessorDataHob.SmbiosType4Processor.ProcessorManufacturer =3D TO_BE_FI= LLED_BY_VENDOR;=0D SetMem ((VOID *)&ProcessorDataHob.SmbiosType4Processor.ProcessorId, size= of (PROCESSOR_ID_DATA), TO_BE_FILLED_BY_CODE);=0D ProcessorDataHob.SmbiosType4Processor.ProcessorVersion =3D TO_BE_FILLED_= BY_VENDOR;=0D ProcessorDataHob.SmbiosType4Processor.Voltage.ProcessorVoltageCapability= 3_3V =3D 1;=0D --=20 2.29.2