[honister,2/3] arm/fvp-base-r-aem: Update to version 11.17.21

Message ID 20220304095611.217114-2-peter.hoyes@arm.com
State New
Headers show
Series [honister,1/3] arm-bsp/docs: Improve fvp-baser-aemv864 limitation | expand

Commit Message

Peter Hoyes March 4, 2022, 9:56 a.m. UTC
From: Peter Hoyes <Peter.Hoyes@arm.com>

Also update version and download link in meta-arm-bsp fvp-baser-aemv8r64
documentation

Issue-Id: SCM-3871
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: I92ec616d25703ff74ed063918a1e4811bac9ff3f
---
 meta-arm-bsp/documentation/fvp-baser-aemv8r64.md | 12 ++++++------
 meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb  |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

Patch

diff --git a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md
index 4f207ba..6fc7152 100644
--- a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md
+++ b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md
@@ -106,18 +106,18 @@  For more details on kas, see https://kas.readthedocs.io/.
 
 To build the images for fvp-base machine, you also need to:
 
- - download the ``FVP_Base_AEMv8R_11.15_14.tgz`` image AEM V8-R FVP Installer
+ - download the ``FVP_Base_AEMv8R_11.17_21.tgz`` image AEM V8-R FVP Installer
   (Linux) package from Arm's website:
-  https://silver.arm.com/download/download.tm?pv=4858045&p=4029857. You need
+  https://silver.arm.com/download/download.tm?pv=4865959&p=4029857. You need
    to have an account and be logged in to be able to download it
- - set absolute path to the ``FVP_Base_AEMv8R_11.15_14.tgz`` downloaded
+ - set absolute path to the ``FVP_Base_AEMv8R_11.17_21.tgz`` downloaded
    package in ``FVP_BASE_R_AEM_TARBALL_URI``
  - accept EULA in ``FVP_BASE_R_ARM_EULA_ACCEPT``
 
 
 The variables should be set like so:
 
-    FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.15_14.tgz"
+    FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.17_21.tgz"
     FVP_BASE_R_ARM_EULA_ACCEPT="True"
 
 **Note:** The host machine should have at least 50 GBytes of free disk space
@@ -142,14 +142,14 @@  Fetch the meta-arm repository into a build directory:
 Building with the standard Linux kernel:
 
     cd ~/fvp-baser-aemv8r64-build
-    export FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.15_14.tgz"
+    export FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.17_21.tgz"
     export FVP_BASE_R_ARM_EULA_ACCEPT="True"
     kas build meta-arm/kas/fvp-baser-aemv8r64-bsp.yml
 
 Building with the Real-Time Linux kernel (PREEMPT\_RT):
 
     cd ~/fvp-baser-aemv8r64-build
-    export FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.15_14.tgz"
+    export FVP_BASE_R_AEM_TARBALL_URI="file:///absolute/path/to/FVP_Base_AEMv8R_11.17_21.tgz"
     export FVP_BASE_R_ARM_EULA_ACCEPT="True"
     kas build meta-arm/kas/fvp-baser-aemv8r64-rt-bsp.yml
 
diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
index 6c612ab..911cc00 100644
--- a/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
+++ b/meta-arm/recipes-devtools/fvp/fvp-base-r-aem.bb
@@ -2,13 +2,14 @@  require fvp-envelope.inc
 
 SUMMARY = "Arm Fixed Virtual Platform - Armv8-R Base Architecture Envelope Model FVP"
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \
-                    file://license_terms/third_party_licenses.txt;md5=3db0c4947b7e3405c40b943672d8de2f"
+                    file://license_terms/third_party_licenses.txt;md5=41029e71051b1c786bae3112a29905a7"
 
 # This FVP cannot be downloaded directly, so download the Armv8-R Base AEM FVP
 # yourself from the homepage and set FVP_BASE_R_AEM_TARBALL_URI appropriately
-# (for example, file:///home/user/FVP_Base_AEMv8R_11.15_14.tgz).
+# (for example, file:///home/user/FVP_Base_AEMv8R_11.17_21.tgz).
 FVP_BASE_R_AEM_TARBALL_URI ?= ""
-PV = "11.15.14"
+PV = "11.17.21"
+FVP_ARCH = "Linux64_GCC-9.3"
 
 SRC_URI = "${FVP_BASE_R_AEM_TARBALL_URI};subdir=${BP}"
 python() {