Update for v2.2 release

* Also add Raspberry Pi 4 BL31 binary

Readme.md

@@ -1,13 +1,13 @@
-Raspberry Pi3 - Arm Trusted Firmware binaries
-=============================================
+Raspberry Pi - Arm Trusted Firmware binaries
+============================================
 
 [![Build status](https://img.shields.io/appveyor/ci/pbatard/pitf.svg?style=flat-square)](https://ci.appveyor.com/project/pbatard/pitf)
 [![Github stats](https://img.shields.io/github/downloads/pbatard/pitf/total.svg?style=flat-square)](https://github.com/pbatard/pitf/releases)
 
 # Summary
 
 This repository is meant to host builds of the Arm Trusted Firmware for use with
-the [EDK2 Raspberry Pi 3 UEFI firmwware](https://github.com/tianocore/edk2-platforms/tree/master/Platform/RaspberryPi/RPi3).
+the [EDK2 Raspberry Pi UEFI firmware](https://github.com/tianocore/edk2-platforms/tree/master/Platform/RaspberryPi/RPi3).
 
 Because of the sensitive nature of these firmware blobs, this process is
 accomplished in a fully transparent manner, through AppVeyor, and in a way that
@@ -16,7 +16,7 @@ altered from the ones one would build locally using the official ATF source.
 
 # Current version
 
-The version of ATF being built is 2.1, which was released on 2019.03.29.
+The version of ATF being built is 2.2, which was released on 2019.10.22.
 
 # Binary validation
 

appveyor.yml

@@ -9,36 +9,41 @@ skip_commits:
     - '**/*.txt'
 
 environment:
-  ATF_VERSION: 2.1
+  ATF_VERSION: 2.2
 
 install:
   - sh: sudo apt-get update -qq
   - sh: sudo -E apt-get install -y gcc-aarch64-linux-gnu
 
 before_build:
-  - ps: Start-FileDownload https://github.com/ARM-software/arm-trusted-firmware/archive/v$env:ATF_VERSION.tar.gz
-  - sh: tar -xzf v$ATF_VERSION.tar.gz
+  - ps: Start-FileDownload https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$env:ATF_VERSION.tar.gz
+  - sh: tar -xzf trusted-firmware-a-$ATF_VERSION.tar.gz
 
 build_script:
-  - sh: cd arm-trusted-firmware-$ATF_VERSION
+  - sh: cd trusted-firmware-a-$ATF_VERSION
   - sh: export CROSS_COMPILE=/usr/bin/aarch64-linux-gnu-
-  - sh: make PLAT=rpi3 PRELOADED_BL33_BASE=0x30000 RPI3_PRELOADED_DTB_BASE=0x10000 SUPPORT_VFP=1 RPI3_USE_UEFI_MAP=1 fip all
+  - sh: make PLAT=rpi3 RPI3_PRELOADED_DTB_BASE=0x10000 PRELOADED_BL33_BASE=0x30000 SUPPORT_VFP=1 RPI3_USE_UEFI_MAP=1 fip all
+  - sh: make PLAT=rpi4 RPI3_PRELOADED_DTB_BASE=0x20000 PRELOADED_BL33_BASE=0x30000 SUPPORT_VFP=1 DEBUG=0 all
 
 after_build:
   - sh: sha256sum build/rpi3/release/bl1.bin
   - sh: sha256sum build/rpi3/release/fip.bin
+  - sh: sha256sum build/rpi4/release/bl31.bin
 
 artifacts:
-  - path: arm-trusted-firmware-$(ATF_VERSION)/build/rpi3/release/bl1.bin
-    name: BL1 image
+  - path: trusted-firmware-a-$(ATF_VERSION)/build/rpi3/release/bl1.bin
+    name: Raspberry Pi 3 BL1 image
     type: file
-  - path: arm-trusted-firmware-$(ATF_VERSION)/build/rpi3/release/fip.bin
-    name: FIP image
+  - path: trusted-firmware-a-$(ATF_VERSION)/build/rpi3/release/fip.bin
+    name: Raspberry Pi 3 FIP image
+    type: file
+  - path: trusted-firmware-a-$(ATF_VERSION)/build/rpi4/release/bl31.bin
+    name: Raspberry Pi 4 BL31 image
     type: file
 
 deploy:
   release: v$(ATF_VERSION)
-  description: Raspberry Pi 3 Arm Trusted Firmware v$(ATF_VERSION)
+  description: Raspberry Pi Arm Trusted Firmware v$(ATF_VERSION)
   provider: GitHub
   auth_token:
     secure: w5YuQOim+G+U7FxxrL0BH6t0trCWKCs9DMZlF4xqF2XGC6SymzwaJrPWrKeeJHPK