From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id C074094113E for ; Tue, 9 Jan 2024 06:40:21 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=PQACo1tRQCxTr0vAqIIv+zfL/C5Cq3LhDH7C1kh7kH0=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:User-Agent:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1704782420; v=1; b=qXxbNFGt2Mn0iWPWWNugOkx+gmPF0zHheSXQb1ThnGnN1iP7POtu8XQtsYzjusUOXoOf/zYW wBBoAmuw6N4ZiNq2mp5CLxw/xj7CqWiES6C5AyL0lUkWaEKALpe39BIasZA3evC3OvPDMOGQwG3 2Mv+0FzJ040vGDtSu21NLQqk= X-Received: by 127.0.0.2 with SMTP id bJPHYY7687511xboqGdtM50Q; Mon, 08 Jan 2024 22:40:20 -0800 X-Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by mx.groups.io with SMTP id smtpd.web10.11540.1704782418744114844 for ; Mon, 08 Jan 2024 22:40:19 -0800 X-Received: from loongson.cn (unknown [10.40.24.149]) by gateway (Coremail) with SMTP id _____8BxrvBK6pxlamIDAA--.10741S3; Tue, 09 Jan 2024 14:40:11 +0800 (CST) X-Received: from [10.40.24.149] (unknown [10.40.24.149]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxvodF6pxlVYkIAA--.22462S3; Tue, 09 Jan 2024 14:40:05 +0800 (CST) Message-ID: <0ec16957-5394-41d1-ad2a-d55ecd517d22@loongson.cn> Date: Tue, 9 Jan 2024 14:40:05 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [PATCH v6 24/36] ArmVirtPkg: Move PlatformBootManagerLib to OvmfPkg To: devel@edk2.groups.io, lersek@redhat.com Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Jiewen Yao References: <20240105094118.2279380-1-lichao@loongson.cn> <20240105094538.2281380-1-lichao@loongson.cn> From: "Chao Li" In-Reply-To: X-CM-TRANSID: AQAAf8DxvodF6pxlVYkIAA--.22462S3 X-CM-SenderInfo: xolfxt3r6o00pqjv00gofq/1tbiAQALCGWcmykMAQABsF X-Coremail-Antispam: 1Uk129KBj93XoWxtFy8ZF1DJF43uF4fArWUtrc_yoWfCF4fpF 1ktr4rCr18G3Wav347Way09a1F9asxKF15Jw4Ykw12kasYqF1a9r1UtryFk343ZF12yr4D ZF4vka13uFWDZagCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnRJUUUyCb4IE77IF4wAF F20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r 1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAF wI0_Jr0_JF4l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AKxVW8Jr0_Cr1UM2AIxVAIcxkEcVAq 07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1lYx0E2Ix0cI8IcVAFwI0_Jrv_JF 1lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCj r7xvwVCIw2I0I7xG6c02F41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr 1lx2IqxVAqx4xG67AKxVWUGVWUWwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE 14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7 IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E 87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0x ZFpf9x07ULdb8UUUUU= Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lichao@loongson.cn List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: t2Sk0GVfRv7W1WoLE4zl0CRpx7686176AA= Content-Type: multipart/alternative; boundary="------------KOyvnfrI0Tw6eq9q4oZG57Ft" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=qXxbNFGt; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io --------------KOyvnfrI0Tw6eq9q4oZG57Ft Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Laszlo, Thanks, Chao On 2024/1/8 22:02, Laszlo Ersek wrote: > On 1/5/24 10:45, Chao Li wrote: >> Moved the PlatformBootManagerLib to OvmfPkg and renamed to >> PlatformBootManagerLibLight for easy use by other ARCH. >> >> Build-tested only (with "ArmVirtQemu.dsc"). >> >> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4584 >> >> Cc: Ard Biesheuvel >> Cc: Leif Lindholm >> Cc: Sami Mujawar >> Cc: Gerd Hoffmann >> Cc: Jiewen Yao >> Cc: Lazlo Ersek >> Signed-off-by: Chao Li >> --- >> ArmVirtPkg/ArmVirtPkg.ci.yaml | 1 - >> ArmVirtPkg/ArmVirtPkg.dec | 1 - >> ArmVirtPkg/ArmVirtQemu.dsc | 2 +- >> ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- >> .../Library/PlatformBootManagerLibLight}/PlatformBm.c | 0 >> .../Library/PlatformBootManagerLibLight}/PlatformBm.h | 0 >> .../PlatformBootManagerLib.inf | 7 +++---- >> .../Library/PlatformBootManagerLibLight}/QemuKernel.c | 0 >> OvmfPkg/OvmfPkg.dec | 4 ++++ >> 9 files changed, 9 insertions(+), 8 deletions(-) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBm.c (100%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBm.h (100%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/PlatformBootManagerLib.inf (92%) >> rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library= /PlatformBootManagerLibLight}/QemuKernel.c (100%) >> >> diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.ya= ml >> index 506b0e72f0..b186d4eb42 100644 >> --- a/ArmVirtPkg/ArmVirtPkg.ci.yaml >> +++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml >> @@ -24,7 +24,6 @@ >> ], >> ## Both file path and directory path are accepted. >> "IgnoreFiles": [ >> - "Library/PlatformBootManagerLib/PlatformBm.c" >> ] >> }, >> ## options defined .pytool/Plugin/CompilerPlugin > You don't seem to be reinstating this under OvmfPkg, so I think the same = source file under OvmfPkg will cause a CI failure. There was no CI failure, there was a PR for edk2 in the cover letter,=20 all of the CI are passed. https://github.com/tianocore/edk2/pull/5208 > >> diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec >> index 315db4e8ea..6aa5ea05f4 100644 >> --- a/ArmVirtPkg/ArmVirtPkg.dec >> +++ b/ArmVirtPkg/ArmVirtPkg.dec >> @@ -27,7 +27,6 @@ >> =20 >> [LibraryClasses] >> ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h >> - FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h >> =20 >> [Guids.common] >> gArmVirtTokenSpaceGuid =3D { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6= E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } } >> diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec >> index a03c30995b..2ed7863a98 100644 >> --- a/OvmfPkg/OvmfPkg.dec >> +++ b/OvmfPkg/OvmfPkg.dec >> @@ -144,6 +144,10 @@ >> # >> HardwareInfoLib|Include/Library/HardwareInfoLib.h >> =20 >> + ## @libraryclass FdtSerialPortAddressLib >> + # >> + FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h >> + >> [Guids] >> gUefiOvmfPkgTokenSpaceGuid =3D {0x93bb96af, 0xb9f2, 0x4eb= 8, {0x94, 0x62, 0xe0, 0xba, 0x74, 0x56, 0x42, 0x36}} >> gEfiXenInfoGuid =3D {0xd3b46f3b, 0xd441, 0x124= 4, {0x9a, 0x12, 0x0, 0x12, 0x27, 0x3f, 0xc1, 0x4d}} > These two hunks don't seem to belong in this patch -- I think they might = belong to patch 22, "ArmVirtPkg: Move the FdtSerialPortAddressLib to OvmfPk= g"; is that right? > > Also, the lib classes in the [LibraryClasses] section of the DEC file was= originally meant to be lexicographically sorted. Over time, soring errors = got introduced; it would be nice to restore the sort order in a separate pa= tch. (Although it's not a pre-requisite for this patch set to be accepted, = I guess.) You are right, this change should belong to patch 22, in V7 I would sort=20 it lexicographically. > > >> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc >> index 147180f645..e48c75b5e9 100644 >> --- a/ArmVirtPkg/ArmVirtQemu.dsc >> +++ b/ArmVirtPkg/ArmVirtQemu.dsc >> @@ -70,7 +70,7 @@ >> =20 >> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.= inf >> BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf >> - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf >> + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pl= atformBootManagerLib.inf >> PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBm= PrintScLib.inf >> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo= mizedDisplayLib.inf >> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer= BltLib.inf >> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKe= rnel.dsc >> index c22a422353..668a65ba64 100644 >> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc >> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc >> @@ -69,7 +69,7 @@ >> =20 >> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.= inf >> BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf >> - PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf >> + PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Pl= atformBootManagerLib.inf >> PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBm= PrintScLib.inf >> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo= mizedDisplayLib.inf >> FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBuffer= BltLib.inf >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/Ov= mfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/Ov= mfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManager= Lib.inf >> similarity index 92% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManage= rLib.inf >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManage= rLib.inf >> index 1ddcd107d2..f2fb69bd3c 100644 >> --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.i= nf >> +++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib= .inf >> @@ -20,7 +20,7 @@ >> # >> # The following information is for reference only and not required by = the build tools. >> # >> -# VALID_ARCHITECTURES =3D ARM AARCH64 >> +# VALID_ARCHITECTURES =3D ARM AARCH64 LOONGARCH64 >> # >> =20 >> [Sources] >> @@ -29,7 +29,6 @@ >> QemuKernel.c >> =20 >> [Packages] >> - ArmVirtPkg/ArmVirtPkg.dec >> MdeModulePkg/MdeModulePkg.dec >> MdePkg/MdePkg.dec >> OvmfPkg/OvmfPkg.dec >> @@ -56,15 +55,15 @@ >> UefiRuntimeServicesTableLib >> =20 >> [FixedPcd] >> - gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol >> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate >> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits >> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity >> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits >> + gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol >> =20 >> [Pcd] >> - gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer >> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut >> + gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer >> =20 >> [Guids] >> gEfiEndOfDxeEventGroupGuid >> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/Ov= mfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c > These last few hunks seem to restore sorting order (is that right?), whic= h is welcome, but probably belong in a separate patch. Yes, the sort orders should appear in the patch 23, I will adjust them=20 in V7. > >> similarity index 100% >> rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c >> rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c > Looks OK to me otherwise. > > Thanks > Laszlo > > > >=20 > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113423): https://edk2.groups.io/g/devel/message/113423 Mute This Topic: https://groups.io/mt/103540123/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --------------KOyvnfrI0Tw6eq9q4oZG57Ft Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Hi Laszlo,


=
Thanks,
Chao
On 2024/1/8 22:02, Laszlo Ersek wrote: 
On 1/5/24 10:45, Chao Li wrote=
:

Moved the PlatformBootManage=
rLib to OvmfPkg and renamed to
PlatformBootManagerLibLight for easy use by other ARCH.

Build-tested only (with "ArmVirtQemu.dsc").

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=
=3D4584

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Lazlo Ersek <lersek@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
---
 ArmVirtPkg/ArmVirtPkg.ci.yaml                              | 1 -
 ArmVirtPkg/ArmVirtPkg.dec                                  | 1 -
 ArmVirtPkg/ArmVirtQemu.dsc                                 | 2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                           | 2 +-
 .../Library/PlatformBootManagerLibLight}/PlatformBm.c      | 0
 .../Library/PlatformBootManagerLibLight}/PlatformBm.h      | 0
 .../PlatformBootManagerLib.inf                             | 7 +++----
 .../Library/PlatformBootManagerLibLight}/QemuKernel.c      | 0
 OvmfPkg/OvmfPkg.dec                                        | 4 ++++
 9 files changed, 9 insertions(+), 8 deletions(-)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBm.c (100%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBm.h (100%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/PlatformBootManagerLib.inf (92%)
 rename {ArmVirtPkg/Library/PlatformBootManagerLib =3D> OvmfPkg/Library/=
PlatformBootManagerLibLight}/QemuKernel.c (100%)

diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yaml
index 506b0e72f0..b186d4eb42 100644
--- a/ArmVirtPkg/ArmVirtPkg.ci.yaml
+++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml
@@ -24,7 +24,6 @@
         ],
         ## Both file path and directory path are accepted.
         "IgnoreFiles": [
-            "Library/PlatformBootManagerLib/PlatformBm.c"
         ]
     },
     ## options defined .pytool/Plugin/CompilerPlugin

You don't seem to be reinstating this under OvmfPkg, so I think the same so=
urce file under OvmfPkg will cause a CI failure.

There was no CI failure, there was a PR for edk2 in the cover letter, all of the CI are passed.

https://github.com/tianocore/edk2/pull/5208



diff --git a/ArmVirtPkg/ArmV=
irtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 315db4e8ea..6aa5ea05f4 100644
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -27,7 +27,6 @@
=20
 [LibraryClasses]
   ArmVirtMemInfoLib|Include/Library/ArmVirtMemInfoLib.h
-  FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h
=20
 [Guids.common]
   gArmVirtTokenSpaceGuid =3D { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0=
x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } }


      

        
diff --git a/OvmfPkg/OvmfPkg=
.dec b/OvmfPkg/OvmfPkg.dec
index a03c30995b..2ed7863a98 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -144,6 +144,10 @@
   #
   HardwareInfoLib|Include/Library/HardwareInfoLib.h
=20
+  ##  @libraryclass  FdtSerialPortAddressLib
+  #
+  FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h
+
 [Guids]
   gUefiOvmfPkgTokenSpaceGuid            =3D {0x93bb96af, 0xb9f2, 0x4eb8, {=
0x94, 0x62, 0xe0, 0xba, 0x74, 0x56, 0x42, 0x36}}
   gEfiXenInfoGuid                       =3D {0xd3b46f3b, 0xd441, 0x1244, {=
0x9a, 0x12, 0x0, 0x12, 0x27, 0x3f, 0xc1, 0x4d}}


      

      
These two hunks don't seem to belong in this patch -- I think they might be=
long to patch 22, "ArmVirtPkg: Move the FdtSerialPortAddressLib to OvmfPkg"=
; is that right?

Also, the lib classes in the [LibraryClasses] section of the DEC file was o=
riginally meant to be lexicographically sorted. Over time, soring errors go=
t introduced; it would be nice to restore the sort order in a separate patc=
h. (Although it's not a pre-requisite for this patch set to be accepted, I =
guess.)

    

    You are right, this change should belong to patch 22, in V7 I would
    sort it lexicographically.

    

      




      

        
diff --git a/ArmVirtPkg/ArmV=
irtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 147180f645..e48c75b5e9 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -70,7 +70,7 @@
=20
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-  PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor=
mBootManagerLib.inf
+  PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Platf=
ormBootManagerLib.inf
   PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin=
tScLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize=
dDisplayLib.inf
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL=
ib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne=
l.dsc
index c22a422353..668a65ba64 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -69,7 +69,7 @@
=20
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-  PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/Platfor=
mBootManagerLib.inf
+  PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLibLight/Platf=
ormBootManagerLib.inf
   PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrin=
tScLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize=
dDisplayLib.inf
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL=
ib.inf
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/OvmfP=
kg/Library/PlatformBootManagerLibLight/PlatformBm.c
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h b/OvmfP=
kg/Library/PlatformBootManagerLibLight/PlatformBm.h
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.h
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.h
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerL=
ib.inf b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib=
.inf
similarity index 92%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLi=
b.inf
rename to OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLi=
b.inf
index 1ddcd107d2..f2fb69bd3c 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBootManagerLib.in=
f
@@ -20,7 +20,7 @@
 #
 # The following information is for reference only and not required by the =
build tools.
 #
-#  VALID_ARCHITECTURES           =3D ARM AARCH64
+#  VALID_ARCHITECTURES           =3D ARM AARCH64 LOONGARCH64
 #
=20
 [Sources]
@@ -29,7 +29,6 @@
   QemuKernel.c
=20
 [Packages]
-  ArmVirtPkg/ArmVirtPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
@@ -56,15 +55,15 @@
   UefiRuntimeServicesTableLib
=20
 [FixedPcd]
-  gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits
+  gUefiOvmfPkgTokenSpaceGuid.PcdUninstallMemAttrProtocol
=20
 [Pcd]
-  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  gUefiOvmfPkgTokenSpaceGuid.PcdTerminalTypeGuidBuffer
=20
 [Guids]
   gEfiEndOfDxeEventGroupGuid
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/OvmfP=
kg/Library/PlatformBootManagerLibLight/QemuKernel.c


      

      
These last few hunks seem to restore sorting order (is that right?), which =
is welcome, but probably belong in a separate patch.

    

    Yes, the sort orders should appear in the patch 23, I will adjust
    them in V7.

    

      



      

        
similarity index 100%
rename from ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c
rename to OvmfPkg/Library/PlatformBootManagerLibLight/QemuKernel.c


      

      
Looks OK to me otherwise.

Thanks
Laszlo







    

  




_._,_._,_





Groups.io Links:



 =20
    You receive all messages sent to this group.
 =20
 =20




View/Reply Online (#113423) |


 =20

|

  Mute=
 This Topic


| New Topic







Your Subscriptio=
n |
Contact Group Owner |

Unsubscribe

 [rebecca@openfw.io]


_._,_._,_



--------------KOyvnfrI0Tw6eq9q4oZG57Ft--