From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81])
 by mx.groups.io with SMTP id smtpd.web11.3793.1571663390812465965
 for <devel@edk2.groups.io>;
 Mon, 21 Oct 2019 06:09:51 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jSW8Xpyq;
 spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1571663389;
	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=i6p1YLiD0cC8aMafr1tsJ5KrNI0Ok1nKqLN6NiVwKXc=;
	b=jSW8XpyqIjKbQ+pQmK3y5cyhE9K+QG0L0H5J2j6nkfRpcnJLQ4ndiMtu1mMvQHNbvP9cNY
	icT6Fv8hvwGLcqDs4qvZptidXrei8KKpJc/tDejPwOBcpr19UVmqZMBZauW69DbLbUFZdD
	hV3a/HRf7BHZBJUFwB+AA4KaRbgApd8=
Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com
 [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-27-lbGTrbCvPlm5LX5av9EiUA-1; Mon, 21 Oct 2019 09:09:47 -0400
Received: by mail-wr1-f69.google.com with SMTP id h4so7265628wrx.15
        for <devel@edk2.groups.io>; Mon, 21 Oct 2019 06:09:46 -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=s2Gmrfh0l1lKtjAxMkk4Pl04r/Phyoc5z4OxN2E2Wgw=;
        b=Ji3lSN5NSV/KoEmcRaiLcJvCR0CC56yFvl+zmmj3QTnbGFYYtd7HNnosWX+aKIAlJA
         XyuVxyRkcIeMSVMW1YyOtUEy/WNZbSvCACNAqbmkko0nEloASHKLZ3IjYX+sF4XOUV/O
         BC29kjQ2b5eMEbdb6V9IVr/clkhQelIWhg5lPjHNsji2KH5LBGl7ZhVkdGcIE1+D9NqL
         m3h2D3dPnt4ogmmU9WytL1E9u19GQgW2JxzVc+1XVB2q2QSbe9sJ4a+msHc03NBX31xO
         gXu0SQ4BwXtF6ApbtX56Pf9l6S6X3rv+1qZSfA8UHacptZFGCXCfN9YtWnzxCUYPk/DV
         N+kQ==
X-Gm-Message-State: APjAAAXyOn4r/y14vL40gz8fgMWzf0scZp73TTVWcf+3Y+VGlcprmnl/
	RgNJT/9jqGeeJwgUVH2jDet2z04gcQA85nDLU+eHqOBroXyPazveKuv7ZtbXOVzK7GmfEX0UcJq
	4nlrbN9FSd3yrvA==
X-Received: by 2002:a5d:51c3:: with SMTP id n3mr19968095wrv.5.1571663384174;
        Mon, 21 Oct 2019 06:09:44 -0700 (PDT)
X-Google-Smtp-Source: APXvYqytLyFtPpPM2i15w7ymu372bvM7+DRaj3lXs5OTMyYox0/3wYMBgGh5Ha7SxmZnToc0Kiv2EA==
X-Received: by 2002:a5d:51c3:: with SMTP id n3mr19967936wrv.5.1571663382116;
        Mon, 21 Oct 2019 06:09:42 -0700 (PDT)
Return-Path: <philmd@redhat.com>
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 v20sm12412364wml.26.2019.10.21.06.09.40
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Mon, 21 Oct 2019 06:09:41 -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>
 <6baf8d74-3639-593c-419a-c4e8d4e6b7d0@redhat.com>
 <1a295e8f-a679-0a03-283a-850e93c97bab@akeo.ie>
From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= <philmd@redhat.com>
Message-ID: <c0468063-071e-92d5-1f58-6b45cd8b60e3@redhat.com>
Date: Mon, 21 Oct 2019 15:09:40 +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: <1a295e8f-a679-0a03-283a-850e93c97bab@akeo.ie>
X-MC-Unique: lbGTrbCvPlm5LX5av9EiUA-1
X-Mimecast-Spam-Score: 0
Content-Language: en-US
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable

On 10/21/19 2:52 PM, Pete Batard wrote:
> Hi Philippe,
>=20
> On 2019.10.21 13:28, Philippe Mathieu-Daud=C3=A9 wrote:
>> 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.
>>>
>>> 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.
>>>
>>> No other changes are being applied at this stage.
>>>
>>> Signed-off-by: Pete Batard <pete@akeo.ie>
>>> ---
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ConfigDxe/ConfigDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ConfigDxe/ConfigDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ConfigDxe/ConfigDxeHii.uni=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/ConfigDxe/ConfigDxeHii.vfr=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DisplayDxe/ComponentName.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DisplayDxe/DisplayDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DisplayDxe/DisplayDxe.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DisplayDxe/DisplayDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DisplayDxe/Screenshot.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/ComponentName.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/DriverBinding.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/DwUsbHostDxe/DwcHw.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/FdtDxe/FdtDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/FdtDxe/FdtDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/ComponentName.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0=
 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/GraphicsConsole.c=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/GraphicsConsole.h=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni=C2=A0=C2=A0=
=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/GraphicsConsoleDxe/NewFont.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/ComponentName.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/Diagnostics.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/Mmc.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/Mmc.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/MmcBlockIo.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=
=
=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/MmcDebug.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/MmcDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/MmcDxe/MmcIdentification.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=
=
=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/SdHostDxe/SdHostDxe.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/SdHostDxe/SdHostDxe.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/FileIo.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/FvbInfo.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/VarBlockService.c=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/VarBlockService.h=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Include/IndustryStandard/RpiMbox.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Include/Protocol/DwUsb.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Include/Protocol/ExtendedTextOut.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Include/Protocol/RpiFirmware.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Include/Protocol/RpiMmcHost.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/MemoryInitPeiLib/MemoryInitPeiLib.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformBootManagerLib/PlatformBm.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformBootManagerLib/PlatformBm.h=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |=C2=A0 2 =
+-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformLib/AArch64/RaspberryPiHelper.S=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformLib/PlatformLib.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformLib/RaspberryPi.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformLib/RaspberryPiMem.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformUiAppLib/PlatformUiAppLib.c=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/PlatformUiAppLib/PlatformUiAppLib.inf=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/ResetLib/ResetLib.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=
=
=A0 0
>>> =C2=A0 Platform/RaspberryPi/{RPi3 =3D>=20
>>> }/Library/ResetLib/ResetLib.inf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
>>> Platform/RaspberryPi/RPi3/RPi3.dsc | 34 ++++++++++----------
>>> Platform/RaspberryPi/RPi3/RPi3.fdf | 24 +++++++-------
>>> =C2=A0 Platform/RaspberryPi/{RPi3/RPi3.dec =3D>=20
>>> RaspberryPi.dec}=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 |=C2=A0 2 +-
>>> =C2=A0 69 files changed, 45 insertions(+), 45 deletions(-)
>>>
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.=
c=20
>>> b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.=
h=20
>>> b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.=
inf=20
>>> b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
>>> similarity index 92%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.in=
f
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
>>> index 487b7e3592ab..3f0d7b6b9e9d 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.=
inf=20
>>>
>>> +++ b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.i=
nf
>>> @@ -23,7 +23,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 PcdLib
>>> diff --git a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c=
=20
>>> b/Platform/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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf=20
>>> 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]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 BaseLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h=
=20
>>> b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
>>> rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.=
h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni=20
>>> b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni
>>> similarity index 100%
>>> rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.u=
ni
>>> rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr=20
>>> b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr
>>> similarity index 100%
>>> rename from Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.v=
fr
>>> rename to Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf=20
>>> b/Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
>>> similarity index 93%
>>> rename from Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.in=
f
>>> 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]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/ArmPkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 BaseLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c=20
>>> b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
>>> rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c=20
>>> b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
>>> rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c=20
>>> b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
>>> rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h=20
>>> b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
>>> rename to Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf=20
>>> b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
>>> similarity index 92%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
>>> 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]
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 MemoryAllocationLib
>>> diff --git a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h=20
>>> b/Platform/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=20
>>> 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=20
>>> b/Platform/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]
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 BaseLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c=
 b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c=20
>>>
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
.c=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
.h=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
Dxe.inf=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.i=
nf
>>> similarity index 94%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDx=
e.inf=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
>>> index 51d1eed12ea2..8a8c5a44b6a0 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
Dxe.inf=20
>>>
>>> +++=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.i=
nf
>>> @@ -36,7 +36,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 UefiBootServicesTableLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
Dxe.uni=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.u=
ni
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDx=
e.uni=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole=
DxeExtra.uni=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeEx=
tra.uni=20
>>>
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDx=
eExtra.uni=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtr=
a.uni=20
>>>
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c=20
>>> b/Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/NewFont.c
>>> similarity index 100%
>>> rename from=20
>>> 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=
=20
>>> b/Platform/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=20
>>> b/Platform/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=20
>>> b/Platform/RaspberryPi/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=20
>>> b/Platform/RaspberryPi/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=20
>>> b/Platform/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=20
>>> b/Platform/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=20
>>> b/Platform/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]
>>> =C2=A0=C2=A0=C2=A0 Diagnostics.c
>>> =C2=A0 [Packages]
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0 [LibraryClasses]
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDx=
e.c=20
>>> b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.=
c
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDx=
e.inf=20
>>> b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>> similarity index 93%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.=
inf=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>> index 485450625b54..0bd72c3ba6a1 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDx=
e.inf=20
>>>
>>> +++=20
>>> b/Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>> @@ -26,7 +26,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 ArmPlatformPkg/ArmPlatformPkg.dec
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/ArmPkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 UefiBootServicesTableLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c=20
>>> b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
>>> rename to Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf=
=20
>>> b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
>>> similarity index 91%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
>>> rename to Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.i=
nf
>>> index bba00070764c..87bca98fec28 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
>>> +++ b/Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
>>> @@ -23,7 +23,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 ArmLib
>>> diff --git a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c=
=20
>>> b/Platform/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=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf=20
>>> 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]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 PcdLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
>>> rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
>>> rename to Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService=
.c=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService=
.h=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService=
Dxe.c=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDx=
e.c=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService=
Dxe.inf=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.i=
nf
>>> similarity index 95%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDx=
e.inf=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
>>> index 394a4f61a5b8..ecfb8f85c9c1 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService=
Dxe.inf=20
>>>
>>> +++=20
>>> b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.i=
nf
>>> @@ -36,7 +36,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/ArmPkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 BaseLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h=20
>>> 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=20
>>> b/Platform/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=20
>>> a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h=20
>>> 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=
=20
>>> b/Platform/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=
=20
>>> b/Platform/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=20
>>> a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.=
c=20
>>> b/Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
>>> rename to=20
>>> Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.=
inf=20
>>> b/Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.in=
f
>>> rename to=20
>>> Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.=
c=20
>>> b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.=
h=20
>>> b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.h
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.h
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBoo=
tManagerLib.inf=20
>>> b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootMana=
gerLib.inf=20
>>>
>>> similarity index 94%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootM=
anagerLib.inf=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManage=
rLib.inf=20
>>>
>>> index e1b132a0ae3a..79b75d667f55 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBoo=
tManagerLib.inf=20
>>>
>>> +++=20
>>> b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootMana=
gerLib.inf=20
>>>
>>> @@ -32,7 +32,7 @@ [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 ShellPkg/ShellPkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 BaseLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHel=
per.S=20
>>> b/Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelpe=
r.S=20
>>>
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf=20
>>> b/Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf
>>> similarity index 94%
>>> rename from=20
>>> 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]
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/ArmPkg.dec
>>> =C2=A0=C2=A0=C2=A0 ArmPlatformPkg/ArmPlatformPkg.dec
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Bcm283x.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 ArmLib
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c=20
>>> 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=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c=20
>>> b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
>>> rename to Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.=
c=20
>>> b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.c
>>> similarity index 100%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.c
>>> diff --git=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.=
inf=20
>>> b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf
>>> similarity index 91%
>>> rename from=20
>>> Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.in=
f
>>> rename to=20
>>> Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf
>>> index 27b0c30c3917..ab1a917f7e92 100644
>>> ---=20
>>> a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.=
inf=20
>>>
>>> +++ b/Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.i=
nf
>>> @@ -22,7 +22,7 @@ [Sources]
>>> =C2=A0 [Packages]
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/MdeModulePkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 UefiLib
>>> diff --git a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c=20
>>> b/Platform/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=
=20
>>> b/Platform/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]
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/ArmPkg.dec
>>> =C2=A0=C2=A0=C2=A0 MdePkg/MdePkg.dec
>>> =C2=A0=C2=A0=C2=A0 EmbeddedPkg/EmbeddedPkg.dec
>>> -=C2=A0 Platform/RaspberryPi/RPi3/RPi3.dec
>>> +=C2=A0 Platform/RaspberryPi/RaspberryPi.dec
>>> =C2=A0 [LibraryClasses]
>>> =C2=A0=C2=A0=C2=A0 DebugLib
>>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc=20
>>> b/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> index e3dc2d494f6f..a0365c5cf606 100644
>>> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> @@ -162,7 +162,7 @@ [LibraryClasses.common]
>>> =C2=A0 [LibraryClasses.common.SEC]
>>> =C2=A0=C2=A0=C2=A0 PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull=
.inf
>>> =C2=A0=C2=A0=C2=A0 BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemo=
ryLib.inf
>>> -=20
>>> MemoryInitPeiLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/MemoryI=
nitPeiLib/MemoryInitPeiLib.inf=20
>>>
>>> +=20
>>> MemoryInitPeiLib|Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryI=
nitPeiLib.inf=20
>>>
>>> =C2=A0=C2=A0=C2=A0 PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformP=
eiLib.inf
>>> ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionL=
ib/PrePiExtractGuidedSectionLib.inf=20
>>>
>>> LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCus=
tomDecompressLib.inf=20
>>>
>>> @@ -202,7 +202,7 @@ [LibraryClasses.common.UEFI_DRIVER]
>>> =C2=A0 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>>> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryA=
llocationLib.inf=20
>>>
>>> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in=
f
>>> -=20
>>> EfiResetSystemLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/ResetL=
ib/ResetLib.inf=20
>>>
>>> +=C2=A0 EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetL=
ib.inf
>>> =C2=A0=C2=A0=C2=A0 ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>>> =C2=A0 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE
>>> @@ -332,12 +332,12 @@ [PcdsFixedAtBuild.common]
>>> =C2=A0 [LibraryClasses.common]
>>> =C2=A0=C2=A0=C2=A0 ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
>>> =C2=A0=C2=A0=C2=A0 ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.in=
f
>>> -=20
>>> ArmPlatformLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformL=
ib/PlatformLib.inf=20
>>>
>>> +=20
>>> ArmPlatformLib|Platform/RaspberryPi/Library/PlatformLib/PlatformLib.in=
f
>>> =C2=A0=C2=A0=C2=A0 TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTime=
rLib.inf
>>> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in=
f
>>> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootMan=
agerLib.inf=20
>>>
>>> =C2=A0=C2=A0=C2=A0 BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLo=
goLib.inf
>>> -=20
>>> PlatformBootManagerLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/P=
latformBootManagerLib/PlatformBootManagerLib.inf=20
>>>
>>> +=20
>>> PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManage=
rLib/PlatformBootManagerLib.inf=20
>>>
>>> CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customi=
zedDisplayLib.inf=20
>>>
>>> FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i=
nf
>>> @@ -479,7 +479,7 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/Drivers/CpuDxe/CpuDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/VarBl=
ockServiceDxe.inf=20
>>>
>>> +  
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
>>> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/Variable/RuntimeDxe/Variable=
RuntimeDxe.inf {
>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 <LibraryClasses>
>>> @@ -506,18 +506,18 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/Console/ConPlatformDxe/ConPl=
atformDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/Console/ConSplitterDxe/ConSp=
litterDxe.inf
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/Graph=
icsConsoleDxe.inf=20
>>>
>>> +  
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/Console/TerminalDxe/Terminal=
Dxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDxe.in=
f
>>> +=C2=A0 Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDx=
e.inf
>>> =C2=A0=C2=A0=C2=A0 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
>>> =C2=A0=C2=A0=C2=A0 Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/Inter=
ruptDxe.inf
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFirmwa=
reDxe.inf=20
>>>
>>> -=C2=A0 Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDxe.in=
f
>>> -=C2=A0 Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/Config=
Dxe.inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf
>>> =C2=A0=C2=A0=C2=A0 ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTim=
er.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
>>> @@ -541,7 +541,7 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # SMBIOS Support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/Platfo=
rmSmbiosDxe.inf=20
>>>
>>> +=C2=A0 Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosD=
xe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>> =C2=A0=C2=A0=C2=A0 #
>>> @@ -557,12 +557,12 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowser=
Dxe.inf
>>> MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.i=
nf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
>>> -=C2=A0 Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/LogoDxe.=
inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf
>>
>> This change seems not related to the rest of your refactor.
>=20
> It is. See https://edk2.groups.io/g/devel/message/49288
>=20
> The problem is we have no choice but to break the patch in two sections,=
=
=20
> one that applies to edk2-platforms and the other to edk2-non-osi, since=
=20
> these are separate repos, and the LogoDxe changes belong to non-osi.
>=20
> We need to have part of the non-osi patch that is applied to=20
> edk2-platforms, and it would make little sense to break it down into the=
=
=20
> non-osi related and platforms related, since it still relies on the=20
> non-osi changes having been applied.

I see.

>=20
> If anything, I guess we could consider that the non-osi patch should=20
> come first. Still, whatever we do here, as long as only one of non-osi=
=20
> and platform is applied, builds are going to be broken, and there is no=
=20
> way to fix that unless you do consider the set of platforms + non-osi as=
=
=20
> a single patch.

Agreed, this is a egg/chicken problem.

>=20
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Application/UiApp/UiApp.inf {
>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 <LibraryClasses>
>>> NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 NULL|MdeModulePkg/Library/B=
ootManagerUiLib/BootManagerUiLib.inf
>>> -=20
>>> NULL|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformUiAppLib/Pl=
atformUiAppLib.inf=20
>>>
>>> +=20
>>> NULL|Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.in=
f
>>> NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceM=
anagerUiLib.inf=20
>>>
>>> =C2=A0=C2=A0=C2=A0 }
>>> @@ -575,7 +575,7 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # USB Support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHostDx=
e.inf=20
>>>
>>> +=C2=A0 Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>> =C2=A0=C2=A0=C2=A0 MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStora=
geDxe.inf
>>> @@ -584,9 +584,9 @@ [Components.common]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # SD/MMC support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=C2=A0 Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHost=
Dxe.inf
>>> -=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/ArasanM=
mcHostDxe.inf=20
>>>
>>> -=C2=A0 Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDxe.in=
f
>>> +=C2=A0 Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe=
.inf
>>> +=C2=A0 Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # Networking stack
>>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf=20
>>> b/Platform/RaspberryPi/RPi3/RPi3.fdf
>>> index b06a15fb8ec3..fd4e490fdcdf 100644
>>> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf
>>> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
>>> @@ -189,7 +189,7 @@ [FV.FvMain]
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/SecurityStubDxe/Security=
StubDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/CapsuleRuntimeDxe/Capsul=
eRuntimeDxe.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/VarBl=
ockServiceDxe.inf=20
>>>
>>> +=C2=A0 INF=20
>>> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF=20
>>> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF=20
>>> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>>> =C2=A0 !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE
>>> @@ -206,16 +206,16 @@ [FV.FvMain]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/Console/ConPlatformDxe/C=
onPlatformDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/Console/ConSplitterDxe/C=
onSplitterDxe.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/Graph=
icsConsoleDxe.inf=20
>>>
>>> +=C2=A0 INF=20
>>> Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/Console/TerminalDxe/Term=
inalDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDxe.in=
f
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/I=
nterruptDxe.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFirmwa=
reDxe.inf=20
>>>
>>> -=C2=A0 INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDx=
e.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/ConfigDxe.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe=
.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/WatchdogTimerDxe/Watchdo=
gTimer.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
>>> @@ -247,7 +247,7 @@ [FV.FvMain]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # SMBIOS Support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/Platfo=
rmSmbiosDxe.inf=20
>>>
>>> +=C2=A0 INF=20
>>> Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>> =C2=A0=C2=A0=C2=A0 #
>>> @@ -284,7 +284,7 @@ [FV.FvMain]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # USB Support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHostDx=
e.inf=20
>>>
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>> =C2=A0=C2=A0=C2=A0 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassS=
torageDxe.inf
>>> @@ -293,14 +293,14 @@ [FV.FvMain]
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # SD/MMC support
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHostDxe.inf
>>> -=C2=A0 INF=20
>>> Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/ArasanM=
mcHostDxe.inf=20
>>>
>>> -=C2=A0 INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDx=
e.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf
>>> +=C2=A0 INF=20
>>> Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # Pi logo (splash screen)
>>> =C2=A0=C2=A0=C2=A0 #
>>> -=C2=A0 INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/Logo=
Dxe.inf
>>> +=C2=A0 INF Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf
>>
>> Ditto.
>=20
> Same comment as above. The platforms + non-osi set of patches I sent=20
> should be considered as one, because, if you try to see them as=20
> independent patches, you will introduce platform breakage, no matter=20
> what you do. It's just the byproduct of having to contend with two=20
> separate repos. And even if we may somehow be able to skirt around=20
> platform breakage when applying only one patch, I don't think it would=
=20
> make much sense to do so just for the Logo driver. It really makes no=20
> sense to me to go great length to consider Platforms and non-OSI as to=
=20
> independent entities, when the only reason we have this split in the=20
> first place is for licensing issues, and absolutely nothing else. In=20
> other words, it is in my opinion a complete waste of time to go out of=
=20
> our ways to pretend the repos are independent, when they are very much=
=20
> intertwined.

I understand.

>=20
> Also, IIRC, last time I tried to present a platforms + non-osi patchset=
=20
> as 1/2, 2/2, I got some pushback on account that these were separate=20
> repos, which is why I send these as 1/1, 1/1.

Fine by me.

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

>=20
> Regards,
>=20
> /Pete
>=20
>>
>> The rest of the patch looks OK.
>>
>>> =C2=A0=C2=A0=C2=A0 #
>>> =C2=A0=C2=A0=C2=A0 # Device Tree support (used by FdtDxe)
>>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dec=20
>>> b/Platform/RaspberryPi/RaspberryPi.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 @@
>>> =C2=A0 [Defines]
>>> =C2=A0=C2=A0=C2=A0 DEC_SPECIFICATION=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 0x0001001A
>>> -=C2=A0 PACKAGE_NAME=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D RPi3Pkg
>>> +=C2=A0 PACKAGE_NAME=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D Raspberry=
Pi
>>> =C2=A0=C2=A0=C2=A0 PACKAGE_GUID=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D=
=20
>>> DFA0CA8B-F3AC-4607-96AC-46FA04B84DCC
>>> =C2=A0=C2=A0=C2=A0 PACKAGE_VERSION=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1.0
>>>
>>
>=20
>=20
>=20
>=20