From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=VmHKJLmq; spf=pass (domain: nuviainc.com, ip: 209.85.221.43, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f43.google.com with SMTP id e1so11842585wrt.5 for ; Fri, 22 May 2020 16:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=012h+82hVexc3jHWyHI/NIgR+ObUiu6FF7QAfzyJ5n4=; b=VmHKJLmqJg3fu0+cuJj6K31s0+1HoaaKVyfa2d5S2XSeiEU05ksIcAn2AAE88LHtdl 6W+k9/ULbQkhGBp+aYn2a5uxTR+y7q3S5oI0dOYN/WjrjwQaalt5simPEYYEKP78Psbb bPg1SD04PW/zigL2RFJFJQgSHyBXK2OpQw4+mLRtgHHQ3OeCfsVBgYwpcl3Rp7CZ0XuP prIifvTlfAAYnQp1pGWdiswyViqxh9kGjN0IL3SG95xwxKL1eHcbo7OcGcGSbfAoG53R AnJ5pmIklDHtQGQk8j0C9YqlcmlXdh4gY38+yF9w1sYsD0MfQpp/+91tkSADXMB51s0u w38A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=012h+82hVexc3jHWyHI/NIgR+ObUiu6FF7QAfzyJ5n4=; b=PBeeMEuYgeU46SafjIIJXh8UIgz65xEyyQj2JmZobA7+jNmtj9JS1+a9u6pFd1w78S P3Jgm1C4iljncipQ3yvOafSO4ay8X4dx2W8cMUo8q7vsdkKB4OFI+MO0XUvqZ3vTEkKw kqxZ9x1d54U6QUnT8yDbkn8ejr7/rgcKeooMcWTzchKcgMic3LATFUJGbw2r4/7PukPq EwvtsMZVZoOOD6Fv1Wm5ss9YuKXBqrm5q6e3aH9ftd2t4c1gpv8KYGsi3KlYeHV/7UyP 5wgAkozhAqs6YfRXZ9guZKUqnwdlQlSRXsLUvhvYn0/W7jOpo0uRDw033O0PbBey9vZQ dPcQ== X-Gm-Message-State: AOAM532iMjgLajiaTZawEY/ENvgPQ3BLlBXduJDBrvgRGkp+wwA2aAl9 FjJwwfwc3WgDX5fZjSCFLbKS965DgYrkc0nQmte7kzurY9vdQJFbaxQlHk288ppxPiMOumb+AIQ et+7UYasPsnUyJi208m+qKaIVh2a0Q+dsmFrsa6k0sNF/ozRmiZ1neTZ7J26R1xTWow== 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) Return-Path: 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: [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> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522233944.6845-1-leif@nuviainc.com> References: <20200522233944.6845-1-leif@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 +- .../{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S | 0 .../Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c | 0 .../{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf | 2 +- .../Qemu/{ => 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 => SbsaQemu/SbsaQemu.dec} | 0 13 files changed, 7 insertions(+), 7 deletions(-) rename Silicon/Qemu/{ => SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c (100%) rename Silicon/Qemu/{ => SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf (92%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf (92%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuMem.c (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c (100%) rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf (100%) rename Silicon/Qemu/{SbsaQemuPkg.dec => SbsaQemu/SbsaQemu.dec} (100%) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.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/ArmPlatformLibNull.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf - NorFlashPlatformLib|Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf + NorFlashPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -170,7 +170,7 @@ [LibraryClasses.common] CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf - PciHostBridgeLib|Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf + PciHostBridgeLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf @@ -218,7 +218,7 @@ [LibraryClasses.common.PEIM] PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf - ArmPlatformLib|Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf + ArmPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf @@ -640,7 +640,7 @@ [Components.common] !include NetworkPkg/Network.dsc.inc # NonDiscoverableDevices - Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf + Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf # IDE/AHCI Support diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.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 # NonDiscoverableDevices - INF Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf + INF Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf #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/SbsaQemuPlatformDxe.c diff --git a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf 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/SbsaQemuPlatformDxe.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 [LibraryClasses] PcdLib diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuHelper.S b/Silicon/Qemu/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/Qemu/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 [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/SbsaQemuNorFlashLib.c diff --git a/Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf 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/SbsaQemuNorFlashLib.inf diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf similarity index 100% rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.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 -- 2.20.1