[PATCH edk2-platforms 0/2] RISC-V: Fix build errors

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
@ 2020-12-21 20:38 Mark Salter
  2020-12-21 20:38 ` [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Mark Salter
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Mark Salter @ 2020-12-21 20:38 UTC (permalink / raw)
  To: devel; +Cc: Leif Lindholm, Abner Chang, Daniel Schaefer, Gilbert Chen

I ran into some errors while compiling for RISC-V/SiFive target.
These were trivial things arising from edk2 commits:

  bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field ProcessorManufacturer
  9c1f455f5f0e MdePkg: Remove code wrapped by DISABLE_NEW_DEPRECATED_INTERFACES

Mark Salter (2):
  Silicon/RISC-V: Update old SMBIOS struct filed name
  Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

 .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---
 .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-
 .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

-- 
2.29.2


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name
  2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
@ 2020-12-21 20:38 ` Mark Salter
  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
  2 siblings, 0 replies; 11+ messages in thread
From: Mark Salter @ 2020-12-21 20:38 UTC (permalink / raw)
  To: devel; +Cc: Leif Lindholm, Abner Chang, Daniel Schaefer, Gilbert Chen

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


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH edk2-platforms 2/2] Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
  2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
  2020-12-21 20:38 ` [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Mark Salter
@ 2020-12-21 20:38 ` Mark Salter
  2020-12-22  6:36 ` [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Abner Chang
  2 siblings, 0 replies; 11+ messages in thread
From: Mark Salter @ 2020-12-21 20:38 UTC (permalink / raw)
  To: devel; +Cc: Leif Lindholm, Abner Chang, Daniel Schaefer, Gilbert Chen

The non-status reporting PcdSet functions were deprecated and have now
been removed. Update SiFive code to assert on error status.

Deprecated PcdSet* code under DISABLE_NEW_DEPRECATED_INTERFACES has been
removed. This includes PcdSetXX interfaces used by RISC-V code
which is now causing a compilation error. Switch to the PcdSetXXS
interfaces.

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>
---
 .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c b/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c
index b69569339d25..55501fa6b85f 100644
--- a/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c
+++ b/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c
@@ -1087,18 +1087,21 @@ FvbInitialize (
   //
   // Set several PCD values to point to flash
   //
-  PcdSet64 (
+  Status = PcdSet64S (
     PcdFlashNvStorageVariableBase64,
     (UINTN) PcdGet32 (PcdPlatformFlashNvStorageVariableBase)
     );
-  PcdSet32 (
+  ASSERT_EFI_ERROR (Status);
+  Status = PcdSet32S (
     PcdFlashNvStorageFtwWorkingBase,
     PcdGet32 (PcdPlatformFlashNvStorageFtwWorkingBase)
     );
-  PcdSet32 (
+  ASSERT_EFI_ERROR (Status);
+  Status = PcdSet32S (
     PcdFlashNvStorageFtwSpareBase,
     PcdGet32 (PcdPlatformFlashNvStorageFtwSpareBase)
     );
+  ASSERT_EFI_ERROR (Status);
 
   FwhInstance = (EFI_FW_VOL_INSTANCE *)
     (
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
  2020-12-21 20:38 ` [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Mark Salter
  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 ` Abner Chang
  2020-12-23  2:53   ` [edk2-devel] " Zhiguang Liu
  2 siblings, 1 reply; 11+ messages in thread
From: Abner Chang @ 2020-12-22  6:36 UTC (permalink / raw)
  To: Mark Salter, devel@edk2.groups.io
  Cc: Leif Lindholm, Schaefer, Daniel, Chen, Gilbert

Entire patch set looks good to me. Thanks for fixing this.
Reviewed-by: Abner Chang <abner.chang@hpe.com>

> -----Original Message-----
> From: Mark Salter [mailto:msalter@redhat.com]
> Sent: Tuesday, December 22, 2020 4:39 AM
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <leif@nuviainc.com>; Chang, Abner (HPS SW/FW
> Technologist) <abner.chang@hpe.com>; Schaefer, Daniel
> <daniel.schaefer@hpe.com>; Chen, Gilbert <gilbert.chen@hpe.com>
> Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
> 
> I ran into some errors while compiling for RISC-V/SiFive target.
> These were trivial things arising from edk2 commits:
> 
>   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field
> ProcessorManufacturer
>   9c1f455f5f0e MdePkg: Remove code wrapped by
> DISABLE_NEW_DEPRECATED_INTERFACES
> 
> Mark Salter (2):
>   Silicon/RISC-V: Update old SMBIOS struct filed name
>   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces
> 
>  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---
>  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-
>  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-
>  3 files changed, 8 insertions(+), 5 deletions(-)
> 
> --
> 2.29.2


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-22  6:36 ` [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Abner Chang
@ 2020-12-23  2:53   ` Zhiguang Liu
  2020-12-23  6:41     ` 回复: " gaoliming
  0 siblings, 1 reply; 11+ messages in thread
From: Zhiguang Liu @ 2020-12-23  2:53 UTC (permalink / raw)
  To: devel@edk2.groups.io, abner.chang@hpe.com, Mark Salter
  Cc: Leif Lindholm, Schaefer, Daniel, Chen, Gilbert


[-- Attachment #1.1: Type: text/plain, Size: 2291 bytes --]

Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image001.jpg@01D6D919.D10D2E00]



> -----Original Message-----

> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com>; devel@edk2.groups.io

> Cc: Leif Lindholm <leif@nuviainc.com>; Schaefer, Daniel

> <daniel.schaefer@hpe.com>; Chen, Gilbert <gilbert.chen@hpe.com>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

> 

>



[-- Attachment #1.2: Type: text/html, Size: 7602 bytes --]

[-- Attachment #2: image001.jpg --]
[-- Type: image/jpeg, Size: 74820 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-23  2:53   ` [edk2-devel] " Zhiguang Liu
@ 2020-12-23  6:41     ` gaoliming
  2020-12-23  6:44       ` Michael D Kinney
  0 siblings, 1 reply; 11+ messages in thread
From: gaoliming @ 2020-12-23  6:41 UTC (permalink / raw)
  To: devel, zhiguang.liu, abner.chang, 'Mark Salter'
  Cc: 'Leif Lindholm', 'Schaefer, Daniel',
	'Chen, Gilbert'


[-- Attachment #1.1: Type: text/plain, Size: 3251 bytes --]

Zhiguang:

df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a
real commit. 

 

Anber:

Please make sure git pull as rebase way. You can configure git by the
command git config --global pull.rebase true

 

Thanks

Liming

 

发件人: bounce+27952+69393+4905953+8761045@groups.io
<bounce+27952+69393+4905953+8761045@groups.io> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io; abner.chang@hpe.com; Mark Salter
<msalter@redhat.com>
抄送: Leif Lindholm <leif@nuviainc.com>; Schaefer, Daniel
<daniel.schaefer@hpe.com>; Chen, Gilbert <gilbert.chen@hpe.com>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

 

Hi Abner,

 

The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is
missing

Can you help fix it?

 

Thanks

Zhiguang



 

> -----Original Message-----

> From: devel@edk2.groups.io <mailto:devel@edk2.groups.io>
<devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com <mailto:msalter@redhat.com> >;
devel@edk2.groups.io <mailto:devel@edk2.groups.io> 

> Cc: Leif Lindholm <leif@nuviainc.com <mailto:leif@nuviainc.com> >;
Schaefer, Daniel

> <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com> >; Chen, Gilbert
<gilbert.chen@hpe.com <mailto:gilbert.chen@hpe.com> >

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build
errors

> 

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang < <mailto:abner.chang@hpe.com>
abner.chang@hpe.com>

> 

> > -----Original Message-----

> > From: Mark Salter [ <mailto:msalter@redhat.com>
mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To:  <mailto:devel@edk2.groups.io> devel@edk2.groups.io

> > Cc: Leif Lindholm < <mailto:leif@nuviainc.com> leif@nuviainc.com>;
Chang, Abner (HPS SW/FW

> > Technologist) < <mailto:abner.chang@hpe.com> abner.chang@hpe.com>;
Schaefer, Daniel

> > < <mailto:daniel.schaefer@hpe.com> daniel.schaefer@hpe.com>; Chen,
Gilbert < <mailto:gilbert.chen@hpe.com> gilbert.chen@hpe.com>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

> 

> 

> 

> 

> 

 




[-- Attachment #1.2: Type: text/html, Size: 12213 bytes --]

[-- Attachment #2: image003.jpg --]
[-- Type: image/jpeg, Size: 69631 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-23  6:41     ` 回复: " gaoliming
@ 2020-12-23  6:44       ` Michael D Kinney
  2020-12-23  7:05         ` 回复: " gaoliming
  0 siblings, 1 reply; 11+ messages in thread
From: Michael D Kinney @ 2020-12-23  6:44 UTC (permalink / raw)
  To: devel@edk2.groups.io, gaoliming@byosoft.com.cn, Liu, Zhiguang,
	abner.chang@hpe.com, 'Mark Salter'
  Cc: 'Leif Lindholm', 'Schaefer, Daniel',
	'Chen, Gilbert'


[-- Attachment #1.1: Type: text/plain, Size: 4171 bytes --]

Liming,

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

Mike

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com>
Cc: 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang:
df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit.

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

Thanks
Liming

发件人: bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io> <bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors


Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image002.jpg@01D6D8B3.F3EF2510]



> -----Original Message-----

> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel

> <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

>

>




[-- Attachment #1.2: Type: text/html, Size: 53482 bytes --]

[-- Attachment #2: image002.jpg --]
[-- Type: image/jpeg, Size: 83273 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  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
  0 siblings, 2 replies; 11+ messages in thread
From: gaoliming @ 2020-12-23  7:05 UTC (permalink / raw)
  To: 'Kinney, Michael D', devel, 'Liu, Zhiguang',
	abner.chang, 'Mark Salter', 'Li, Aaron'
  Cc: 'Leif Lindholm', 'Schaefer, Daniel',
	'Chen, Gilbert'


[-- Attachment #1.1: Type: text/plain, Size: 5221 bytes --]

Mike:

 Edit history means to do force push. It may impact edk2-platform mirror repo. 

 

And, there is one more commit about FitGen from Aaron besides Abner patches. 

 

Thanks

Liming

发件人: Kinney, Michael D <michael.d.kinney@intel.com> 
发送时间: 2020年12月23日 14:44
收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com>
抄送: 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com>
主题: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

 

Liming,

 

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

 

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

 

Mike

 

From: devel@edk2.groups.io <mailto:devel@edk2.groups.io>  <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> ; Liu, Zhiguang <zhiguang.liu@intel.com <mailto:zhiguang.liu@intel.com> >; abner.chang@hpe.com <mailto:abner.chang@hpe.com> ; 'Mark Salter' <msalter@redhat.com <mailto:msalter@redhat.com> >
Cc: 'Leif Lindholm' <leif@nuviainc.com <mailto:leif@nuviainc.com> >; 'Schaefer, Daniel' <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com> >; 'Chen, Gilbert' <gilbert.chen@hpe.com <mailto:gilbert.chen@hpe.com> >
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

 

Zhiguang:

df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit. 

 

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

 

Thanks

Liming

 

发件人: bounce+27952+69393+4905953+8761045@groups.io <mailto:bounce+27952+69393+4905953+8761045@groups.io>  <bounce+27952+69393+4905953+8761045@groups.io <mailto:bounce+27952+69393+4905953+8761045@groups.io> > 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io> ; abner.chang@hpe.com <mailto:abner.chang@hpe.com> ; Mark Salter <msalter@redhat.com <mailto:msalter@redhat.com> >
抄送: Leif Lindholm <leif@nuviainc.com <mailto:leif@nuviainc.com> >; Schaefer, Daniel <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com> >; Chen, Gilbert <gilbert.chen@hpe.com <mailto:gilbert.chen@hpe.com> >
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

 

Hi Abner,

 

The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?

 

Thanks

Zhiguang



 

> -----Original Message-----

> From: devel@edk2.groups.io <mailto:devel@edk2.groups.io>  <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com <mailto:msalter@redhat.com> >; devel@edk2.groups.io <mailto:devel@edk2.groups.io> 

> Cc: Leif Lindholm <leif@nuviainc.com <mailto:leif@nuviainc.com> >; Schaefer, Daniel

> <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com> >; Chen, Gilbert <gilbert.chen@hpe.com <mailto:gilbert.chen@hpe.com> >

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> 

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang < <mailto:abner.chang@hpe.com> abner.chang@hpe.com>

> 

> > -----Original Message-----

> > From: Mark Salter [ <mailto:msalter@redhat.com> mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To:  <mailto:devel@edk2.groups.io> devel@edk2.groups.io

> > Cc: Leif Lindholm < <mailto:leif@nuviainc.com> leif@nuviainc.com>; Chang, Abner (HPS SW/FW

> > Technologist) < <mailto:abner.chang@hpe.com> abner.chang@hpe.com>; Schaefer, Daniel

> > < <mailto:daniel.schaefer@hpe.com> daniel.schaefer@hpe.com>; Chen, Gilbert < <mailto:gilbert.chen@hpe.com> gilbert.chen@hpe.com>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

> 

> 

> 

> 

> 

 




[-- Attachment #1.2: Type: text/html, Size: 17185 bytes --]

[-- Attachment #2: image002.jpg --]
[-- Type: image/jpeg, Size: 60803 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-23  7:05         ` 回复: " gaoliming
@ 2020-12-23  7:17           ` Bob Feng
  2020-12-23  7:28           ` Zhiguang Liu
  1 sibling, 0 replies; 11+ messages in thread
From: Bob Feng @ 2020-12-23  7:17 UTC (permalink / raw)
  To: devel@edk2.groups.io, gaoliming@byosoft.com.cn, Kinney, Michael D,
	Liu, Zhiguang, abner.chang@hpe.com, 'Mark Salter',
	Li, Aaron
  Cc: 'Leif Lindholm', 'Schaefer, Daniel',
	'Chen, Gilbert'


[-- Attachment #1.1: Type: text/plain, Size: 5932 bytes --]

Liming, Aaron’s patch has not been pushed.

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Wednesday, December 23, 2020 3:05 PM
To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com>; Li, Aaron <aaron.li@intel.com>
Cc: 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Mike:
 Edit history means to do force push. It may impact edk2-platform mirror repo.

And, there is one more commit about FitGen from Aaron besides Abner patches.

Thanks
Liming
发件人: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
发送时间: 2020年12月23日 14:44
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Liming,

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

Mike

From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
Cc: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang:
df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit.

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

Thanks
Liming

发件人: bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io> <bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors


Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image003.jpg@01D6D93E.B755EDB0]



> -----Original Message-----

> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel

> <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

>

>




[-- Attachment #1.2: Type: text/html, Size: 18577 bytes --]

[-- Attachment #2: image003.jpg --]
[-- Type: image/jpeg, Size: 43575 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  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
  1 sibling, 1 reply; 11+ messages in thread
From: Zhiguang Liu @ 2020-12-23  7:28 UTC (permalink / raw)
  To: devel@edk2.groups.io, gaoliming@byosoft.com.cn, Kinney, Michael D,
	abner.chang@hpe.com, 'Mark Salter', Li, Aaron
  Cc: 'Leif Lindholm', 'Schaefer, Daniel',
	'Chen, Gilbert'


[-- Attachment #1.1: Type: text/plain, Size: 6446 bytes --]

Hi Liming,

edk2-platform mirror repo is already impacted.
I use git cherry-pick to sync to mirror, but to cherry-pick a merge, it needs to specify the parent number manually.
Pls see the below git cherry-pick option for reference.

--mainline parent-number
Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.
Thanks
Zhiguang


From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Wednesday, December 23, 2020 3:05 PM
To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io; Liu, Zhiguang <zhiguang.liu@intel.com>; abner.chang@hpe.com; 'Mark Salter' <msalter@redhat.com>; Li, Aaron <aaron.li@intel.com>
Cc: 'Leif Lindholm' <leif@nuviainc.com>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com>; 'Chen, Gilbert' <gilbert.chen@hpe.com>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Mike:
 Edit history means to do force push. It may impact edk2-platform mirror repo.

And, there is one more commit about FitGen from Aaron besides Abner patches.

Thanks
Liming
发件人: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
发送时间: 2020年12月23日 14:44
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Liming,

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

Mike

From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
Cc: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang:
df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit.

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

Thanks
Liming

发件人: bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io> <bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors


Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image001.jpg@01D6D940.4B7213B0]



> -----Original Message-----

> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel

> <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

>

>




[-- Attachment #1.2: Type: text/html, Size: 20213 bytes --]

[-- Attachment #2: image001.jpg --]
[-- Type: image/jpeg, Size: 60061 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors
  2020-12-23  7:28           ` Zhiguang Liu
@ 2020-12-23 15:47             ` Abner Chang
  0 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2020-12-23 15:47 UTC (permalink / raw)
  To: Liu, Zhiguang, devel@edk2.groups.io, gaoliming@byosoft.com.cn,
	Kinney, Michael D, 'Mark Salter', Li, Aaron
  Cc: 'Leif Lindholm', Schaefer, Daniel, Chen, Gilbert


[-- Attachment #1.1: Type: text/plain, Size: 7416 bytes --]

Hi all, I screwed it up by merging the pull request,  I should just push the commits. sorry about that.

Abner


From: Liu, Zhiguang [mailto:zhiguang.liu@intel.com]
Sent: Wednesday, December 23, 2020 3:29 PM
To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; Kinney, Michael D <michael.d.kinney@intel.com>; Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com>; Li, Aaron <aaron.li@intel.com>
Cc: 'Leif Lindholm' <leif@nuviainc.com>; Schaefer, Daniel <daniel.schaefer@hpe.com>; Chen, Gilbert <gilbert.chen@hpe.com>
Subject: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Hi Liming,

edk2-platform mirror repo is already impacted.
I use git cherry-pick to sync to mirror, but to cherry-pick a merge, it needs to specify the parent number manually.
Pls see the below git cherry-pick option for reference.

--mainline parent-number
Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent.
Thanks
Zhiguang


From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of gaoliming
Sent: Wednesday, December 23, 2020 3:05 PM
To: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>; Li, Aaron <aaron.li@intel.com<mailto:aaron.li@intel.com>>
Cc: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Mike:
 Edit history means to do force push. It may impact edk2-platform mirror repo.

And, there is one more commit about FitGen from Aaron besides Abner patches.

Thanks
Liming
发件人: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
发送时间: 2020年12月23日 14:44
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: RE: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Liming,

Since this change was just made, we should consider editing history to fix this.  Can you help with this?

This should have never happened.  I will check settings to see if I can disable merge commits on edk2-platforms.

Mike

From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of gaoliming
Sent: Tuesday, December 22, 2020 10:42 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; 'Mark Salter' <msalter@redhat.com<mailto:msalter@redhat.com>>
Cc: 'Leif Lindholm' <leif@nuviainc.com<mailto:leif@nuviainc.com>>; 'Schaefer, Daniel' <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; 'Chen, Gilbert' <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
Subject: 回复: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

Zhiguang:
df24ce325872020e80d8f7bee93407f4c1517845 is the merge commit. It is not a real commit.

Anber:

Please make sure git pull as rebase way. You can configure git by the command git config --global pull.rebase true

Thanks
Liming

发件人: bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io> <bounce+27952+69393+4905953+8761045@groups.io<mailto:bounce+27952+69393+4905953+8761045@groups.io>> 代表 Zhiguang Liu
发送时间: 2020年12月23日 10:53
收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>; abner.chang@hpe.com<mailto:abner.chang@hpe.com>; Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>
抄送: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>
主题: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors


Hi Abner,



The git history for edk2-platforms master branch looks strange.

And the commit message of df24ce325872020e80d8f7bee93407f4c1517845 is missing

Can you help fix it?



Thanks

Zhiguang

[cid:image002.jpg@01D6D984.E3820DB0]



> -----Original Message-----

> From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Abner

> Chang

> Sent: Tuesday, December 22, 2020 2:36 PM

> To: Mark Salter <msalter@redhat.com<mailto:msalter@redhat.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Schaefer, Daniel

> <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> Subject: Re: [edk2-devel] [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

>

> Entire patch set looks good to me. Thanks for fixing this.

> Reviewed-by: Abner Chang <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>

>

> > -----Original Message-----

> > From: Mark Salter [mailto:msalter@redhat.com]

> > Sent: Tuesday, December 22, 2020 4:39 AM

> > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>

> > Cc: Leif Lindholm <leif@nuviainc.com<mailto:leif@nuviainc.com>>; Chang, Abner (HPS SW/FW

> > Technologist) <abner.chang@hpe.com<mailto:abner.chang@hpe.com>>; Schaefer, Daniel

> > <daniel.schaefer@hpe.com<mailto:daniel.schaefer@hpe.com>>; Chen, Gilbert <gilbert.chen@hpe.com<mailto:gilbert.chen@hpe.com>>

> > Subject: [PATCH edk2-platforms 0/2] RISC-V: Fix build errors

> >

> > I ran into some errors while compiling for RISC-V/SiFive target.

> > These were trivial things arising from edk2 commits:

> >

> >   bd9da7b1da26 MdePkg,ShellPkg: Fix typo in SMBIOS_TABLE_TYPE4 field

> > ProcessorManufacturer

> >   9c1f455f5f0e MdePkg: Remove code wrapped by

> > DISABLE_NEW_DEPRECATED_INTERFACES

> >

> > Mark Salter (2):

> >   Silicon/RISC-V: Update old SMBIOS struct filed name

> >   Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces

> >

> >  .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c        | 9 ++++++---

> >  .../ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c    | 2 +-

> >  .../SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c   | 2 +-

> >  3 files changed, 8 insertions(+), 5 deletions(-)

> >

> > --

> > 2.29.2

>

>

>

>

>




[-- Attachment #1.2: Type: text/html, Size: 25051 bytes --]

[-- Attachment #2: image002.jpg --]
[-- Type: image/jpeg, Size: 43082 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-12-23 15:49 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-21 20:38 [PATCH edk2-platforms 0/2] RISC-V: Fix build errors Mark Salter
2020-12-21 20:38 ` [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Mark Salter
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox