From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web09.3563.1571660910172794859 for ; Mon, 21 Oct 2019 05:28:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TJ/GXx9I; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571660909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9zQf2eFspIYelGpdwSUpFEMN3yQk1h3nAoOuSAmyOII=; b=TJ/GXx9ICqaCsLCf+VqCtR3dYESGEvU1YlQNXyNdh/Jt4kX5lKv80T/I1w3re0d0gJsE5O ZOF1LOI9CwB3IW9FZeyvsxgPVvC+ozN50YpDPO+BhusM+7TlolHKvy/8OtL4HkDG1X8X1n o10ke9SdVubwydE1yEX8/Ev0A1BF1FE= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-zVcZWvY3NKqXR_iyyAXmhA-1; Mon, 21 Oct 2019 08:28:26 -0400 Received: by mail-wm1-f70.google.com with SMTP id 6so1358125wmj.9 for ; Mon, 21 Oct 2019 05:28:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=2Z08Zd3779xd3PTdKDE2ZJG2jmrNxEexKURg2BznEUw=; b=NC4mqyrXdPmwvFutVqOSIvBr77dqwgrnzLox8WaBDWwGLuJQ6am884qv57y5AHh437 M44/c1CoUZxqtyHQsi29eKtOjNG5etNnc4OsmjhMY5OquCXxQyxOlttEqUYWJwi4qSAX cwUUSR5+ra3cCJdnLnVrUlxy1/EqeDj76goeLW9/zpS/5QfNpz4xcEj8pObN5AAAHJtJ +zdDtLyZhsaoKfFdDuVAtRPBt+0op5Qumxgx2k1/nWkzmeTt/YQd5G1IAH4z1ceT24d7 MsAcA1to6Y1XPyq0azghPlTSLhRUEslE90exDBDylpFN0XS1zUw8F53g3cpHZmcDAW1D vhHQ== X-Gm-Message-State: APjAAAWoaTqscXDwiv6aUUBWxH11EaULaYN08/lmD3E/oInb11AGyEVJ 1DPJYW5HOE7GdeYMYHtnL2bFW+yx7KPrUvw4gtT6wWuTA2fS69Oqn1vfdKcZJi41lNc9owkSBXo 5SPJTn600ZIdAIQ== X-Received: by 2002:adf:e34b:: with SMTP id n11mr169360wrj.250.1571660903759; Mon, 21 Oct 2019 05:28:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxhHrGgfb4NDDkX8Zkk9u0ObRVcRtk3ANvsm45pYVprfX+MXqLakkLcXmAmLcJyG7mLDKgX7Q== X-Received: by 2002:adf:e34b:: with SMTP id n11mr169250wrj.250.1571660901808; Mon, 21 Oct 2019 05:28:21 -0700 (PDT) Return-Path: Received: from [192.168.1.41] (129.red-83-57-174.dynamicip.rima-tde.net. [83.57.174.129]) by smtp.gmail.com with ESMTPSA id i5sm13163925wmd.21.2019.10.21.05.28.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Oct 2019 05:28:21 -0700 (PDT) Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4 To: devel@edk2.groups.io, pete@akeo.ie Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org References: <20191021112506.1456-1-pete@akeo.ie> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <6baf8d74-3639-593c-419a-c4e8d4e6b7d0@redhat.com> Date: Mon, 21 Oct 2019 14:28:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191021112506.1456-1-pete@akeo.ie> X-MC-Unique: zVcZWvY3NKqXR_iyyAXmhA-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Pete, On 10/21/19 1:25 PM, Pete Batard wrote: > In preparation for adding Raspberry Pi 4 support, the Pi 3 platform > is restructured by factorizing all the drivers and libraries that are > going to be commonly used by the two platforms. >=20 > Because much of the Pi 4 SoC is an extension of the Pi 3 one this > means that almost everything, except the ACPI tables, is moved up > into a new common RaspberryPi/ subdirectory that will serve both > platforms. The .dec is also moved to this directory, under a new > RaspberryPi.dec name, and existing references to it are updated. >=20 > No other changes are being applied at this stage. >=20 > Signed-off-by: Pete Batard > --- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ArasanMmcHostDxe/ArasanMmcHos= tDxe.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ArasanMmcHostDxe/ArasanMmcHos= tDxe.h | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ArasanMmcHostDxe/ArasanMmcHos= tDxe.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ConfigDxe/ConfigDxe.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ConfigDxe/ConfigDxe.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ConfigDxe/ConfigDxeFormSetGui= d.h | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ConfigDxe/ConfigDxeHii.uni = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/ConfigDxe/ConfigDxeHii.vfr = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DisplayDxe/ComponentName.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DisplayDxe/DisplayDxe.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DisplayDxe/DisplayDxe.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DisplayDxe/DisplayDxe.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DisplayDxe/Screenshot.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/ComponentName.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/DriverBinding.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf= | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/DwUsbHostDxe/DwcHw.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/FdtDxe/FdtDxe.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/FdtDxe/FdtDxe.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/ComponentN= ame.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/GraphicsCo= nsole.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/GraphicsCo= nsole.h | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/GraphicsCo= nsoleDxe.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/GraphicsCo= nsoleDxe.uni | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/GraphicsCo= nsoleDxeExtra.uni | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/GraphicsConsoleDxe/NewFont.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/ComponentName.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/Diagnostics.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/Mmc.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/Mmc.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/MmcBlockIo.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/MmcDebug.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/MmcDxe.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/MmcDxe/MmcIdentification.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/PlatformSmbiosDxe/PlatformSmb= iosDxe.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/PlatformSmbiosDxe/PlatformSmb= iosDxe.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/RpiFirmwareDxe/RpiFirmwareDxe= .c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/RpiFirmwareDxe/RpiFirmwareDxe= .inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/SdHostDxe/SdHostDxe.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/SdHostDxe/SdHostDxe.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/FileIo.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/FvbInfo.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/VarBlockSe= rvice.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/VarBlockSe= rvice.h | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/VarBlockSe= rviceDxe.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Drivers/VarBlockServiceDxe/VarBlockSe= rviceDxe.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Include/IndustryStandard/RpiMbox.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Include/Protocol/DwUsb.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Include/Protocol/ExtendedTextOut.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Include/Protocol/RpiFirmware.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Include/Protocol/RpiMmcHost.h = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/MemoryInitPeiLib/MemoryInitPe= iLib.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/MemoryInitPeiLib/MemoryInitPe= iLib.inf | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformBootManagerLib/Platfo= rmBm.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformBootManagerLib/Platfo= rmBm.h | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformBootManagerLib/Platfo= rmBootManagerLib.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformLib/AArch64/Raspberry= PiHelper.S | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformLib/PlatformLib.inf = | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformLib/RaspberryPi.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformLib/RaspberryPiMem.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformUiAppLib/PlatformUiAp= pLib.c | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/PlatformUiAppLib/PlatformUiAp= pLib.inf | 2 +- > Platform/RaspberryPi/{RPi3 =3D> }/Library/ResetLib/ResetLib.c = | 0 > Platform/RaspberryPi/{RPi3 =3D> }/Library/ResetLib/ResetLib.inf = | 2 +- > Platform/RaspberryPi/RPi3/RPi3.dsc = | 34 ++++++++++---------- > Platform/RaspberryPi/RPi3/RPi3.fdf = | 24 +++++++------- > Platform/RaspberryPi/{RPi3/RPi3.dec =3D> RaspberryPi.dec} = | 2 +- > 69 files changed, 45 insertions(+), 45 deletions(-) >=20 > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmc= HostDxe.c b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.= c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcH= ostDxe.c > rename to Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.= c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmc= HostDxe.h b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.= h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcH= ostDxe.h > rename to Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.= h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmc= HostDxe.inf b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDx= e.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcH= ostDxe.inf > rename to Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.= inf > index 487b7e3592ab..3f0d7b6b9e9d 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe= .inf > +++ b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf > @@ -23,7 +23,7 @@ [Packages] > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > PcdLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Pl= atform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c > rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/= Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > similarity index 94% > rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf > rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > index 24112d517467..28fc2682b585 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf > +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > @@ -33,7 +33,7 @@ [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > BaseLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSet= Guid.h b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetG= uid.h > rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni= b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni > rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni > diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr= b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr > rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c= b/Platform/RaspberryPi/Drivers/DisplayDxe/ComponentName.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c > rename to Platform/RaspberryPi/Drivers/DisplayDxe/ComponentName.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c b/= Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c > rename to Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h b/= Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h > rename to Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf = b/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf > similarity index 93% > rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf > rename to Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf > index 31da2090b402..4261f383e12a 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf > +++ b/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf > @@ -35,7 +35,7 @@ [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > ArmPkg/ArmPkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > BaseLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c b/= Platform/RaspberryPi/Drivers/DisplayDxe/Screenshot.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c > rename to Platform/RaspberryPi/Drivers/DisplayDxe/Screenshot.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName= .c b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.= c > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding= .c b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.= c > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.= c b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.= h b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.= inf b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.i= nf > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > index f86480c035ba..e880c2fb0261 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > @@ -28,7 +28,7 @@ [Packages] > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > MemoryAllocationLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h b/Pla= tform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h > rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform= /RaspberryPi/Drivers/FdtDxe/FdtDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c > rename to Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf b/Platfo= rm/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf > rename to Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf > index 570b05b62564..bf9912b4f7d8 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf > +++ b/Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf > @@ -22,7 +22,7 @@ [Packages] > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > BaseLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Compone= ntName.c b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Componen= tName.c > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphic= sConsole.c b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsol= e.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphics= Console.c > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole= .c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphic= sConsole.h b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsol= e.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphics= Console.h > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole= .h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphic= sConsoleDxe.inf b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsC= onsoleDxe.inf > similarity index 94% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphics= ConsoleDxe.inf > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole= Dxe.inf > index 51d1eed12ea2..8a8c5a44b6a0 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsol= eDxe.inf > +++ b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.= inf > @@ -36,7 +36,7 @@ [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > UefiBootServicesTableLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphic= sConsoleDxe.uni b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsC= onsoleDxe.uni > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphics= ConsoleDxe.uni > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole= Dxe.uni > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphic= sConsoleDxeExtra.uni b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/Grap= hicsConsoleDxeExtra.uni > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/Graphics= ConsoleDxeExtra.uni > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole= DxeExtra.uni > diff --git a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont= .c b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/NewFont.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.= c > rename to Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/NewFont.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c b/P= latform/RaspberryPi/Drivers/MmcDxe/ComponentName.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/ComponentName.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c b/Pla= tform/RaspberryPi/Drivers/MmcDxe/Diagnostics.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/Diagnostics.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c b/Platform/Ra= spberryPi/Drivers/MmcDxe/Mmc.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/Mmc.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h b/Platform/Ra= spberryPi/Drivers/MmcDxe/Mmc.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h > rename to Platform/RaspberryPi/Drivers/MmcDxe/Mmc.h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c b/Plat= form/RaspberryPi/Drivers/MmcDxe/MmcBlockIo.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/MmcBlockIo.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c b/Platfo= rm/RaspberryPi/Drivers/MmcDxe/MmcDebug.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/MmcDebug.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf b/Platfo= rm/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf > rename to Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf > index 0690f9da9c4f..b7a31dd43916 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf > +++ b/Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf > @@ -26,7 +26,7 @@ [Sources.common] > Diagnostics.c > =20 > [Packages] > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > MdePkg/MdePkg.dec > =20 > [LibraryClasses] > diff --git a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c= b/Platform/RaspberryPi/Drivers/MmcDxe/MmcIdentification.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c > rename to Platform/RaspberryPi/Drivers/MmcDxe/MmcIdentification.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/Platform= SmbiosDxe.c b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbios= Dxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformS= mbiosDxe.c > rename to Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDx= e.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/Platform= SmbiosDxe.inf b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbi= osDxe.inf > similarity index 93% > rename from Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformS= mbiosDxe.inf > rename to Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDx= e.inf > index 485450625b54..0bd72c3ba6a1 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosD= xe.inf > +++ b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.in= f > @@ -26,7 +26,7 @@ [Packages] > MdeModulePkg/MdeModulePkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > ArmPkg/ArmPkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > UefiBootServicesTableLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmware= Dxe.c b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareD= xe.c > rename to Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmware= Dxe.inf b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > similarity index 91% > rename from Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareD= xe.inf > rename to Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > index bba00070764c..87bca98fec28 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > +++ b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > @@ -23,7 +23,7 @@ [Packages] > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > ArmLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c b/Pl= atform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c > rename to Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf b/= Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf > rename to Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf > index 4a950dc05d6c..7386ff251864 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf > +++ b/Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf > @@ -25,7 +25,7 @@ [Packages] > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > PcdLib > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.= c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo= .c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.= c > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBloc= kService.c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServic= e.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlock= Service.c > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService= .c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBloc= kService.h b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServic= e.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlock= Service.h > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService= .h > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBloc= kServiceDxe.c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockSer= viceDxe.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlock= ServiceDxe.c > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService= Dxe.c > diff --git a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBloc= kServiceDxe.inf b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockS= erviceDxe.inf > similarity index 95% > rename from Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlock= ServiceDxe.inf > rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService= Dxe.inf > index 394a4f61a5b8..ecfb8f85c9c1 100644 > --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServic= eDxe.inf > +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.= inf > @@ -36,7 +36,7 @@ [Packages] > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > BaseLib > diff --git a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h= b/Platform/RaspberryPi/Include/IndustryStandard/RpiMbox.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h > rename to Platform/RaspberryPi/Include/IndustryStandard/RpiMbox.h > diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h b/Platfor= m/RaspberryPi/Include/Protocol/DwUsb.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h > rename to Platform/RaspberryPi/Include/Protocol/DwUsb.h > diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h= b/Platform/RaspberryPi/Include/Protocol/ExtendedTextOut.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h > rename to Platform/RaspberryPi/Include/Protocol/ExtendedTextOut.h > diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/P= latform/RaspberryPi/Include/Protocol/RpiFirmware.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h > rename to Platform/RaspberryPi/Include/Protocol/RpiFirmware.h > diff --git a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h b/Pl= atform/RaspberryPi/Include/Protocol/RpiMmcHost.h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h > rename to Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h > diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryIni= tPeiLib.c b/Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.= c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInit= PeiLib.c > rename to Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.= c > diff --git a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryIni= tPeiLib.inf b/Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLi= b.inf > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInit= PeiLib.inf > rename to Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.= inf > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Pla= tformBm.c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.= c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Plat= formBm.c > rename to Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.= c > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Pla= tformBm.h b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.= h > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Plat= formBm.h > rename to Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.= h > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Pla= tformBootManagerLib.inf b/Platform/RaspberryPi/Library/PlatformBootManagerL= ib/PlatformBootManagerLib.inf > similarity index 94% > rename from Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf > rename to Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBoo= tManagerLib.inf > index e1b132a0ae3a..79b75d667f55 100644 > --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBo= otManagerLib.inf > +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootMan= agerLib.inf > @@ -32,7 +32,7 @@ [Packages] > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > ShellPkg/ShellPkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > BaseLib > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/Raspbe= rryPiHelper.S b/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryP= iHelper.S > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/Raspber= ryPiHelper.S > rename to Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHel= per.S > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.in= f b/Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf > similarity index 94% > rename from Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf > rename to Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf > index 5c1f55e2df88..ed986034b957 100644 > --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf > +++ b/Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf > @@ -23,7 +23,7 @@ [Packages] > ArmPkg/ArmPkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > ArmLib > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c = b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c > rename to Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem= .c b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.= c > rename to Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformU= iAppLib.c b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.= c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUi= AppLib.c > rename to Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.= c > diff --git a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformU= iAppLib.inf b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLi= b.inf > similarity index 91% > rename from Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUi= AppLib.inf > rename to Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.= inf > index 27b0c30c3917..ab1a917f7e92 100644 > --- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib= .inf > +++ b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf > @@ -22,7 +22,7 @@ [Sources] > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > UefiLib > diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c b/Plat= form/RaspberryPi/Library/ResetLib/ResetLib.c > similarity index 100% > rename from Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c > rename to Platform/RaspberryPi/Library/ResetLib/ResetLib.c > diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf b/Pl= atform/RaspberryPi/Library/ResetLib/ResetLib.inf > similarity index 92% > rename from Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf > rename to Platform/RaspberryPi/Library/ResetLib/ResetLib.inf > index f58020bf912d..b02a06d9d0bf 100644 > --- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf > +++ b/Platform/RaspberryPi/Library/ResetLib/ResetLib.inf > @@ -27,7 +27,7 @@ [Packages] > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > - Platform/RaspberryPi/RPi3/RPi3.dec > + Platform/RaspberryPi/RaspberryPi.dec > =20 > [LibraryClasses] > DebugLib > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RP= i3/RPi3.dsc > index e3dc2d494f6f..a0365c5cf606 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.dsc > +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc > @@ -162,7 +162,7 @@ [LibraryClasses.common] > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > - MemoryInitPeiLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/MemoryI= nitPeiLib/MemoryInitPeiLib.inf > + MemoryInitPeiLib|Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryI= nitPeiLib.inf > PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSection= Lib/PrePiExtractGuidedSectionLib.inf > LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCu= stomDecompressLib.inf > @@ -202,7 +202,7 @@ [LibraryClasses.common.UEFI_DRIVER] > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemory= AllocationLib.inf > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i= nf > - EfiResetSystemLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/ResetL= ib/ResetLib.inf > + EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf > ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf > =20 > !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > @@ -332,12 +332,12 @@ [PcdsFixedAtBuild.common] > [LibraryClasses.common] > ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf > ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf > - ArmPlatformLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformL= ib/PlatformLib.inf > + ArmPlatformLib|Platform/RaspberryPi/Library/PlatformLib/PlatformLib.in= f > TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.i= nf > UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootMa= nagerLib.inf > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > - PlatformBootManagerLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/P= latformBootManagerLib/PlatformBootManagerLib.inf > + PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManage= rLib/PlatformBootManagerLib.inf > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custom= izedDisplayLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.= inf > =20 > @@ -479,7 +479,7 @@ [Components.common] > # > ArmPkg/Drivers/CpuDxe/CpuDxe.inf > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/VarBl= ockServiceDxe.inf > + Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf > MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in= f > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { > > @@ -506,18 +506,18 @@ [Components.common] > =20 > MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf > MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/Graph= icsConsoleDxe.inf > + Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf > MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf > MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDxe.in= f > + Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf > =20 > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > =20 > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFirmwa= reDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/ConfigDxe.inf > + Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > + Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf > + Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > @@ -541,7 +541,7 @@ [Components.common] > # > # SMBIOS Support > # > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/Platfo= rmSmbiosDxe.inf > + Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf > MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > =20 > # > @@ -557,12 +557,12 @@ [Components.common] > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.= inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/LogoDxe.inf > + Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf This change seems not related to the rest of your refactor. > MdeModulePkg/Application/UiApp/UiApp.inf { > > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.i= nf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > - NULL|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformUiAppLi= b/PlatformUiAppLib.inf > + NULL|Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLi= b.inf > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMainten= anceManagerUiLib.inf > } > =20 > @@ -575,7 +575,7 @@ [Components.common] > # > # USB Support > # > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHostDx= e.inf > + Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > @@ -584,9 +584,9 @@ [Components.common] > # > # SD/MMC support > # > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHostDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/ArasanM= mcHostDxe.inf > - Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDxe.inf > + Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf > + Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf > + Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf > =20 > # > # Networking stack > diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RP= i3/RPi3.fdf > index b06a15fb8ec3..fd4e490fdcdf 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.fdf > +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf > @@ -189,7 +189,7 @@ [FV.FvMain] > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/V= arBlockServiceDxe.inf > + INF Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe= .inf > INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDx= e.inf > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > @@ -206,16 +206,16 @@ [FV.FvMain] > # > INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf > INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/G= raphicsConsoleDxe.inf > + INF Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe= .inf > INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf > INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDx= e.inf > + INF Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf > =20 > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFi= rmwareDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/ConfigDxe.= inf > + INF Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf > + INF Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf > + INF Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf > INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > @@ -247,7 +247,7 @@ [FV.FvMain] > # > # SMBIOS Support > # > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/Pl= atformSmbiosDxe.inf > + INF Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.i= nf > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > =20 > # > @@ -284,7 +284,7 @@ [FV.FvMain] > # > # USB Support > # > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHo= stDxe.inf > + INF Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf > INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf > INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > @@ -293,14 +293,14 @@ [FV.FvMain] > # > # SD/MMC support > # > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHostDxe.= inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/Ara= sanMmcHostDxe.inf > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDxe.inf > + INF Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf > + INF Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf > + INF Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf > =20 > # > # Pi logo (splash screen) > # > - INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/LogoDxe.inf > + INF Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf Ditto. The rest of the patch looks OK. > =20 > # > # Device Tree support (used by FdtDxe) > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/Ra= spberryPi.dec > similarity index 97% > rename from Platform/RaspberryPi/RPi3/RPi3.dec > rename to Platform/RaspberryPi/RaspberryPi.dec > index 0554ee20bac5..3e9171eccb13 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.dec > +++ b/Platform/RaspberryPi/RaspberryPi.dec > @@ -9,7 +9,7 @@ > =20 > [Defines] > DEC_SPECIFICATION =3D 0x0001001A > - PACKAGE_NAME =3D RPi3Pkg > + PACKAGE_NAME =3D RaspberryPi > PACKAGE_GUID =3D DFA0CA8B-F3AC-4607-96AC-46FA04B84D= CC > PACKAGE_VERSION =3D 1.0 > =20 >=20