Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues
Hi Leif， According to your advice, I have changed the name of header to OemHisiMiscLib and snet the v2 patch to you. Please help reviewing it when you are free. Thanks Wenyi On 2021/8/4 20:24, Leif Lindholm wrote: > +Rebecca > > Apologies for slow response, this arrived while I was on holiday. > > On Tue, Jun 22, 2021 at 20:33:25 +0800, wenyi,xie via groups.io wrote: >> EDK2 has removed header file ArmLibPrivate.h, so need to >> use ArmLib.h instead. A new file OemMiscLib.h is added >> to EDK2, its name is same with the header file in >> Hisilicon\Include and it will being included first. So >> some undefined issue occured and need to change the order >> of header files. > > Ugh, oops. Yes. So, we used the Hisilicon Smbios implementation to > create what is intended to become a fully generic module, > ArmPkg/Universal/Smbios/, and ended up keeping that header name. > Sorry about that. > > However, moving around packages to make one identically named file be > picked over another is not the right solution. Could you possibly > rename your existing header? OemMiscHisi.h? > > Best Regards, > > Leif > >> Cc: Leif Lindholm >> Cc: Ard Biesheuvel >> Signed-off-by: Wenyi Xie >> --- >> Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >>| 2 +- >> Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >>| 2 +- >> Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >>| 2 +- >> Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >>| 2 +- >> >> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf >> | 2 +- >> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf >>| 2 +- >> Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf >>| 2 +- >> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h >>| 13 - >> Silicon/Hisilicon/Hi1616/Pptt/Pptt.h >>| 2 +- >> Silicon/Hisilicon/Hi1620/Pptt/Pptt.h >>| 2 +- >> 10 files changed, 9 insertions(+), 22 deletions(-) >> >> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> index 1f992024acc2..f1b21ae80f3c 100644 >> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> @@ -20,12 +20,12 @@ >>EarlyConfigPeimD03.c >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >>MdePkg/MdePkg.dec >>MdeModulePkg/MdeModulePkg.dec >> >>ArmPkg/ArmPkg.dec >>Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >>PeimEntryPoint >> diff --git >> a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> index ab14597d8b75..728b33e85030 100644 >> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> @@ -21,11 +21,11 @@ >>BoardFeature2PHi1610Strings.uni >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >>MdePkg/MdePkg.dec >>MdeModulePkg/MdeModulePkg.dec >>ArmPkg/ArmPkg.dec >>Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >>BaseMemoryLib >> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> index d471102199ee..8a605b417be8 100644 >> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> @@ -21,11 +21,11 @@ >>OemMiscLibD05.c >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >>ArmPkg/ArmPkg.dec >>MdeModulePkg/MdeModulePkg.dec >>MdePkg/MdePkg.dec >>Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >>BaseMemoryLib >> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> index 59373a968523..1121550b40c4 100644 >> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> @@ -21,12 +21,12 @@ >>OemMiscLibD06.c >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >>ArmPkg/ArmPkg.dec >>MdeModulePkg/MdeModulePkg.dec >>MdePkg/MdePkg.dec >>Platform/Hisilicon/D06/D06.dec >>Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >>BaseMemoryLib >> diff --git >> a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf >>
Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues
+Rebecca Apologies for slow response, this arrived while I was on holiday. On Tue, Jun 22, 2021 at 20:33:25 +0800, wenyi,xie via groups.io wrote: > EDK2 has removed header file ArmLibPrivate.h, so need to > use ArmLib.h instead. A new file OemMiscLib.h is added > to EDK2, its name is same with the header file in > Hisilicon\Include and it will being included first. So > some undefined issue occured and need to change the order > of header files. Ugh, oops. Yes. So, we used the Hisilicon Smbios implementation to create what is intended to become a fully generic module, ArmPkg/Universal/Smbios/, and ended up keeping that header name. Sorry about that. However, moving around packages to make one identically named file be picked over another is not the right solution. Could you possibly rename your existing header? OemMiscHisi.h? Best Regards, Leif > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Signed-off-by: Wenyi Xie > --- > Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf > | 2 +- > Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > | 2 +- > Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf > | 2 +- > Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf > | 2 +- > > Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > | 2 +- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf > | 2 +- > Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf > | 2 +- > Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h > | 13 - > Silicon/Hisilicon/Hi1616/Pptt/Pptt.h > | 2 +- > Silicon/Hisilicon/Hi1620/Pptt/Pptt.h > | 2 +- > 10 files changed, 9 insertions(+), 22 deletions(-) > > diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf > b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf > index 1f992024acc2..f1b21ae80f3c 100644 > --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf > +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf > @@ -20,12 +20,12 @@ >EarlyConfigPeimD03.c > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec >MdePkg/MdePkg.dec >MdeModulePkg/MdeModulePkg.dec > >ArmPkg/ArmPkg.dec >Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] >PeimEntryPoint > diff --git > a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > index ab14597d8b75..728b33e85030 100644 > --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > @@ -21,11 +21,11 @@ >BoardFeature2PHi1610Strings.uni > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec >MdePkg/MdePkg.dec >MdeModulePkg/MdeModulePkg.dec >ArmPkg/ArmPkg.dec >Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] >BaseMemoryLib > diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf > b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf > index d471102199ee..8a605b417be8 100644 > --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf > +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf > @@ -21,11 +21,11 @@ >OemMiscLibD05.c > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec >ArmPkg/ArmPkg.dec >MdeModulePkg/MdeModulePkg.dec >MdePkg/MdePkg.dec >Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] >BaseMemoryLib > diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf > b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf > index 59373a968523..1121550b40c4 100644 > --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf > +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf > @@ -21,12 +21,12 @@ >OemMiscLibD06.c > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec >ArmPkg/ArmPkg.dec >MdeModulePkg/MdeModulePkg.dec >MdePkg/MdePkg.dec >Platform/Hisilicon/D06/D06.dec >Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] >BaseMemoryLib > diff --git > a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > > b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > index 99eea93b7988..2c3c1ff51408 100644 > --- > a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > +++ > b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > @@ -21,12 +21,12 @@ >ProcessorSubClass.c > > [Package
[edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues
EDK2 has removed header file ArmLibPrivate.h, so need to use ArmLib.h instead. A new file OemMiscLib.h is added to EDK2, its name is same with the header file in Hisilicon\Include and it will being included first. So some undefined issue occured and need to change the order of header files. Cc: Leif Lindholm Cc: Ard Biesheuvel Signed-off-by: Wenyi Xie --- Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf | 2 +- Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf | 2 +- Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf | 2 +- Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf | 2 +- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf | 2 +- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 2 +- Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf | 2 +- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h | 13 - Silicon/Hisilicon/Hi1616/Pptt/Pptt.h | 2 +- Silicon/Hisilicon/Hi1620/Pptt/Pptt.h | 2 +- 10 files changed, 9 insertions(+), 22 deletions(-) diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf index 1f992024acc2..f1b21ae80f3c 100644 --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf @@ -20,12 +20,12 @@ EarlyConfigPeimD03.c [Packages] + Silicon/Hisilicon/HisiPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] PeimEntryPoint diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf index ab14597d8b75..728b33e85030 100644 --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf @@ -21,11 +21,11 @@ BoardFeature2PHi1610Strings.uni [Packages] + Silicon/Hisilicon/HisiPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] BaseMemoryLib diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf index d471102199ee..8a605b417be8 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf @@ -21,11 +21,11 @@ OemMiscLibD05.c [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] BaseMemoryLib diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf index 59373a968523..1121550b40c4 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf @@ -21,12 +21,12 @@ OemMiscLibD06.c [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Platform/Hisilicon/D06/D06.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] BaseMemoryLib diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf index 99eea93b7988..2c3c1ff51408 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf @@ -21,12 +21,12 @@ ProcessorSubClass.c [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 9c795b5fd401..99cc8fc4c14e 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -48,11 +48,11 @@ ./Type09/MiscSystemSlotDesignationFunction.c [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hi
