public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Mark Salter" <msalter@redhat.com>
To: devel@edk2.groups.io
Cc: Leif Lindholm <leif@nuviainc.com>,
	Abner Chang <abner.chang@hpe.com>,
	Daniel Schaefer <daniel.schaefer@hpe.com>,
	Gilbert Chen <gilbert.chen@hpe.com>
Subject: [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name
Date: Mon, 21 Dec 2020 15:38:54 -0500	[thread overview]
Message-ID: <20201221203855.635031-2-msalter@redhat.com> (raw)
In-Reply-To: <20201221203855.635031-1-msalter@redhat.com>

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 <leif@nuviainc.com>
CC: Abner Chang <abner.chang@hpe.com>
CC: Daniel Schaefer <daniel.schaefer@hpe.com>
CC: Gilbert Chen <gilbert.chen@hpe.com>
Signed-off-by: Mark Salter <msalter@redhat.com>
---
 .../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->SmbiosType4Processor.Socket));
   DEBUG ((DEBUG_VERBOSE, "     Processor Type: 0x%x\n", Type4HobData->SmbiosType4Processor.ProcessorType));
   DEBUG ((DEBUG_VERBOSE, "     Processor Family: 0x%x\n", Type4HobData->SmbiosType4Processor.ProcessorFamily));
-  DEBUG ((DEBUG_VERBOSE, "     Processor Manufacture StringID: %d\n", Type4HobData->SmbiosType4Processor.ProcessorManufacture));
+  DEBUG ((DEBUG_VERBOSE, "     Processor Manufacture StringID: %d\n", Type4HobData->SmbiosType4Processor.ProcessorManufacturer));
   DEBUG ((DEBUG_VERBOSE, "     Processor Id: 0x%x:0x%x\n", \
           Type4HobData->SmbiosType4Processor.ProcessorId.Signature, Type4HobData->SmbiosType4Processor.ProcessorId.FeatureFlags));
   DEBUG ((DEBUG_VERBOSE, "     Processor Version StringID: %d\n", Type4HobData->SmbiosType4Processor.ProcessorVersion));
diff --git a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c b/Silicon/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 = TO_BE_FILLED_BY_VENDOR;
   ProcessorDataHob.SmbiosType4Processor.ProcessorType = CentralProcessor;
   ProcessorDataHob.SmbiosType4Processor.ProcessorFamily = ProcessorFamilyIndicatorFamily2;
-  ProcessorDataHob.SmbiosType4Processor.ProcessorManufacture = TO_BE_FILLED_BY_VENDOR;
+  ProcessorDataHob.SmbiosType4Processor.ProcessorManufacturer = TO_BE_FILLED_BY_VENDOR;
   SetMem ((VOID *)&ProcessorDataHob.SmbiosType4Processor.ProcessorId, sizeof (PROCESSOR_ID_DATA), TO_BE_FILLED_BY_CODE);
   ProcessorDataHob.SmbiosType4Processor.ProcessorVersion = TO_BE_FILLED_BY_VENDOR;
   ProcessorDataHob.SmbiosType4Processor.Voltage.ProcessorVoltageCapability3_3V = 1;
-- 
2.29.2


  reply	other threads:[~2020-12-21 20:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
2020-12-21 20:38 ` Mark Salter [this message]
2020-12-21 20:38 ` [PATCH edk2-platforms 2/2] Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces Mark Salter
2020-12-22  6:36 ` [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Abner Chang
2020-12-23  2:53   ` [edk2-devel] " Zhiguang Liu
2020-12-23  6:41     ` 回复: " gaoliming
2020-12-23  6:44       ` Michael D Kinney
2020-12-23  7:05         ` 回复: " gaoliming
2020-12-23  7:17           ` Bob Feng
2020-12-23  7:28           ` Zhiguang Liu
2020-12-23 15:47             ` Abner Chang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201221203855.635031-2-msalter@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox