[edk2-platforms][PATCH 1/2] Platform/RPi4: Update DSC to reflect switch to single TF-A binary

[edk2-platforms][PATCH 1/2] Platform/RPi4: Update DSC to reflect switch to single TF-A binary

[Pete Batard]

Note: This commit depends on an "Update TF-A binaries to v2.3" patch
having been applied to edk2-non-osi.

With the update of non-osi TF-A binaries to latest, we can switch to
using the single bl31.bin instead of the now removed bl31_pl011.bin.

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index de32aab2df3c..c401533a4abc 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -37,7 +37,7 @@ [Defines]
   #
   # Default TF-A binary checked into edk2-non-osi.
   #
-  DEFINE TFA_BUILD_BL31 = Platform/RaspberryPi/$(PLATFORM_NAME)/TrustedFirmware/bl31_pl011.bin
+  DEFINE TFA_BUILD_BL31 = Platform/RaspberryPi/$(PLATFORM_NAME)/TrustedFirmware/bl31.bin
 !else
   #
   # Usually we use the checked-in binaries, but for developers working
-- 
2.21.0.windows.1

[edk2-platforms][PATCH 2/2] Platform/RPi: Fix Readme issues

[Pete Batard]

* device_tree_address/end was incorrect for RPi3.
* Link to TF-A Readme.md in non-osi was broken.
* RPi4 now uses TF-A binaries built from official source.

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 Platform/RaspberryPi/RPi3/Readme.md | 15 ++++++++-------
 Platform/RaspberryPi/RPi4/Readme.md | 13 +++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/Readme.md b/Platform/RaspberryPi/RPi3/Readme.md
index 58c0124ef75e..05f498ee50a7 100644
--- a/Platform/RaspberryPi/RPi3/Readme.md
+++ b/Platform/RaspberryPi/RPi3/Readme.md
@@ -54,8 +54,8 @@ Build instructions from the top level edk2-platforms Readme.md apply.
   ```
   Additionally, if you want to use PL011 instead of the miniUART, you can add the lines:
   ```
-  device_tree_address=0x20000
-  device_tree_end=0x30000
+  device_tree_address=0x10000
+  device_tree_end=0x20000
   device_tree=bcm2710-rpi-3-b[-plus].dtb
   dtoverlay=miniuart-bt
   ```
@@ -67,13 +67,14 @@ you may also be able to boot from a FAT32 USB driver rather than uSD.
 
 # Notes
 
-## ARM Trusted Firmware (ATF)
+## ARM Trusted Firmware (TF-A)
 
-The ATF binaries being used were compiled from the latest ATF source.
-No aleration to the official source have been applied.
+The TF-A binary files were compiled from the latest TF-A release.
+No aleration to the official source has been applied.
 
-For more details on the ATF compilation, see the [Readme](./TrustedFirmware/Readme.md)
-in the `TrustedFirmware/` directory.
+For more details on the TF-A compilation, see the relevant
+[Readme](https://github.com/tianocore/edk2-non-osi/blob/master/Platform/RaspberryPi/RPi3/TrustedFirmware/Readme.md)
+in the `TrustedFirmware/` directory from `edk2-non-osi`.
 
 ## Custom Device Tree
 
diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi4/Readme.md
index e2f0d6986bfd..fa9b31464d58 100644
--- a/Platform/RaspberryPi/RPi4/Readme.md
+++ b/Platform/RaspberryPi/RPi4/Readme.md
@@ -63,15 +63,12 @@ Build instructions from the top level edk2-platforms Readme.md apply.
 
 ## ARM Trusted Firmware (TF-A)
 
-The TF-A binaries were compiled from a TF-A source over which 2 serial-output related
-patches were applied, the first one to fix the miniUART baud rate not being properly
-set to 115200 bauds with recent versions of `start4.elf` and the second one to allow
-the use of the PL011 UART.
+The TF-A binary was compiled from the latest TF-A release.
+No aleration to the official source has been applied.
 
-No other alterations to the official source have been applied.
-
-For more details on the TF-A compilation, see the [Readme](./TrustedFirmware/Readme.md)
-in the `TrustedFirmware/` directory.
+For more details on the TF-A compilation, see the relevant
+[Readme](https://github.com/tianocore/edk2-non-osi/blob/master/Platform/RaspberryPi/RPi4/TrustedFirmware/Readme.md)
+in the `TrustedFirmware/` directory from `edk2-non-osi`.
 
 ## Device Tree
 
-- 
2.21.0.windows.1

Re: [edk2-platforms][PATCH 1/2] Platform/RPi4: Update DSC to reflect switch to single TF-A binary

[Ard Biesheuvel]

On 4/21/20 1:30 PM, Pete Batard wrote:
> Note: This commit depends on an "Update TF-A binaries to v2.3" patch
> having been applied to edk2-non-osi.
> 
> With the update of non-osi TF-A binaries to latest, we can switch to
> using the single bl31.bin instead of the now removed bl31_pl011.bin.
> 
> Signed-off-by: Pete Batard <pete@akeo.ie>
> ---
>   Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
> index de32aab2df3c..c401533a4abc 100644
> --- a/Platform/RaspberryPi/RPi4/RPi4.dsc
> +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
> @@ -37,7 +37,7 @@ [Defines]
>     #
>     # Default TF-A binary checked into edk2-non-osi.
>     #
> -  DEFINE TFA_BUILD_BL31 = Platform/RaspberryPi/$(PLATFORM_NAME)/TrustedFirmware/bl31_pl011.bin
> +  DEFINE TFA_BUILD_BL31 = Platform/RaspberryPi/$(PLATFORM_NAME)/TrustedFirmware/bl31.bin
>   !else
>     #
>     # Usually we use the checked-in binaries, but for developers working
> 

For the series

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

Pushed as 0217d1e21aa9..2aace58ce553