From nobody Fri Apr 26 04:22:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60180+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60180+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1590190789; cv=none; d=zohomail.com; s=zohoarc; b=NZgv9Ws43CE8LGGLWH+Vuk7hFGwIss44JBEtzk1GcYrQ+qu5HTkCDc5WiAlSxjal1u2uIXN3Lb05El0loD4gCPVfhN9/g3dP8r/DHzQ4jux5I6KbJOJJEYrmQdgnZCWWsPkhY58tMcNCWv1aNeqE2GDAXz4cDkMK9IpSWEuQVRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590190789; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=R/AF6XEPsBe921+48WMKdJ1yqWBWwSzPPbzVVQnR1FE=; b=DVHJ+lSmVgmgkqnGN5Fr2djIN5NJm31ZS8tEki0XiFNyYCufR33hG1vNUrD5pa3ntBsMxri8UrL4w3BSFKbxGB/lI+1xHcPoWhDbz4weNl8SRT67Nj1BKHZiZi8bcVwQzWwP6XN6y7dMUPg+butF4/NgF6cQ9YdeyzL2Xhm/e6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60180+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1590190789542279.279229195173; Fri, 22 May 2020 16:39:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QhN8YY1788612x2QYg8l7wZJ; Fri, 22 May 2020 16:39:49 -0700 X-Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.1019.1590190788500558932 for ; Fri, 22 May 2020 16:39:48 -0700 X-Received: by mail-wr1-f43.google.com with SMTP id e1so11842585wrt.5 for ; Fri, 22 May 2020 16:39:48 -0700 (PDT) X-Gm-Message-State: kHTRkEdzovwTYFF3gm4LW48kx1787277AA= X-Google-Smtp-Source: ABdhPJxCF8Oyb0Nc2C5ta9Nw99+ZtiGy7rSCnEuVXlrlsyFJRBKRXoegsEoGV80dR/3RTtyH1FhDlg== X-Received: by 2002:a5d:6b90:: with SMTP id n16mr5550628wrx.220.1590190786750; Fri, 22 May 2020 16:39:46 -0700 (PDT) X-Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id u7sm5171485wrm.23.2020.05.22.16.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 16:39:46 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Graeme Gregory , Radoslaw Biernacki , Tanmay Jagdale Subject: [edk2-devel] [FIXUPS edk2-platforms 1/3] Silicon/Qemu: mirror Platform layout Date: Sat, 23 May 2020 00:39:42 +0100 Message-Id: <20200522233944.6845-2-leif@nuviainc.com> In-Reply-To: <20200522233944.6845-1-leif@nuviainc.com> References: <20200522233944.6845-1-leif@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,leif@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1590190789; bh=NhhqSol9PllvXdXZCIMWLqaxMlK8T8+qdpVrhAVmvBw=; h=Cc:Date:From:Reply-To:Subject:To; b=llTFX9pDhJceAIR9c9k70UflJ7Fp4EChUgd4aDvikbA+VrBEAto5OY7PuRuEpeM64IR tXUjBiuXd7DVtJ+EWH0tHGtjgGxn7U+c/tmyqy+CQ1cd3ZQ3l0G0wa9zZGbCz6Z1sTXPj 6ksTyXoyGzVV1711FboWLTyirnpGYwYm+9U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Platform/Qemu is empty, apart from the SbsaQemu dirctory, which holds SbsaQemu.dsc and SbsaQemu.fdf. Silicon/Qemu held Drivers, Library and a file called SbsaQemuPkg.dec. Move them all into a subdirectory called SbsaQemu, and drop the Pkg but from the .dec name. Signed-off-by: Leif Lindholm --- Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 8 ++++---- Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 2 +- .../Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 0 .../Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf | 2 +- .../{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S | 0 .../Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c | 0 .../{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf | 2 +- .../Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuMem.c | 0 .../Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c | 0 .../Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf | 0 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c | 0 .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf | 0 Silicon/Qemu/{SbsaQemuPkg.dec =3D> SbsaQemu/SbsaQemu.dec} | 0 13 files changed, 7 insertions(+), 7 deletions(-) rename Silicon/Qemu/{ =3D> SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuP= latformDxe.c (100%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuP= latformDxe.inf (92%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S = (100%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c (10= 0%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf (= 92%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuLib/SbsaQemuMem.c (10= 0%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuN= orFlashLib.c (100%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuN= orFlashLib.inf (100%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/Sbsa= QemuPciHostBridgeLib.c (100%) rename Silicon/Qemu/{ =3D> SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/Sbsa= QemuPciHostBridgeLib.inf (100%) rename Silicon/Qemu/{SbsaQemuPkg.dec =3D> SbsaQemu/SbsaQemu.dec} (100%) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/S= bsaQemu.dsc index 8c6b062f8467..4db3ab465163 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -162,7 +162,7 @@ [LibraryClasses.common] ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibN= ull.inf =20 TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf - NorFlashPlatformLib|Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNor= FlashLib.inf + NorFlashPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/Sb= saQemuNorFlashLib.inf =20 CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -170,7 +170,7 @@ [LibraryClasses.common] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - PciHostBridgeLib|Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuP= ciHostBridgeLib.inf + PciHostBridgeLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/= SbsaQemuPciHostBridgeLib.inf =20 FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf =20 @@ -218,7 +218,7 @@ [LibraryClasses.common.PEIM] PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/Pei= ServicesTablePointerLib.inf =20 FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf - ArmPlatformLib|Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf + ArmPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf =20 [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -640,7 +640,7 @@ [Components.common] !include NetworkPkg/Network.dsc.inc =20 # NonDiscoverableDevices - Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf + Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDevic= eDxe.inf =20 # IDE/AHCI Support diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/S= bsaQemu.fdf index 04639c9a46e2..be7c78acebfd 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf @@ -288,7 +288,7 @@ [FV.FVMAIN_COMPACT] INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf =20 # NonDiscoverableDevices - INF Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf + INF Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDx= e.inf INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciD= eviceDxe.inf =20 #VGA diff --git a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c= b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c similarity index 100% rename from Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c rename to Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatfor= mDxe.c diff --git a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.i= nf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.= inf similarity index 92% rename from Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf rename to Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatfor= mDxe.inf index 42a373ee0ed2..21d2135f6d17 100644 --- a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe= .inf @@ -24,7 +24,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Silicon/Qemu/SbsaQemuPkg.dec + Silicon/Qemu/SbsaQemu/SbsaQemu.dec =20 [LibraryClasses] PcdLib diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuHelper.S b/Silicon/Qe= mu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuHelper.S rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.c b/Silicon/Qemu/= SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.c similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.c rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.c diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf b/Silicon/Qem= u/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf similarity index 92% rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf index 9eb69eba71d3..c067a80cc715 100644 --- a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf @@ -26,7 +26,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Silicon/Qemu/SbsaQemuPkg.dec + Silicon/Qemu/SbsaQemu/SbsaQemu.dec =20 [LibraryClasses] ArmLib diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuMem.c b/Silicon/Qemu/= SbsaQemu/Library/SbsaQemuLib/SbsaQemuMem.c similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuMem.c rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuMem.c diff --git a/Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c= b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlas= hLib.c diff --git a/Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.i= nf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.= inf similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlas= hLib.inf diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostB= ridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQem= uPciHostBridgeLib.c similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBr= idgeLib.c rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPc= iHostBridgeLib.c diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostB= ridgeLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQ= emuPciHostBridgeLib.inf similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBr= idgeLib.inf rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPc= iHostBridgeLib.inf diff --git a/Silicon/Qemu/SbsaQemuPkg.dec b/Silicon/Qemu/SbsaQemu/SbsaQemu.= dec similarity index 100% rename from Silicon/Qemu/SbsaQemuPkg.dec rename to Silicon/Qemu/SbsaQemu/SbsaQemu.dec --=20 2.20.1 -=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 (#60180): https://edk2.groups.io/g/devel/message/60180 Mute This Topic: https://groups.io/mt/74411430/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-