From a8f32f990a0d9dc1db310892c70d5a994c698b32 Mon Sep 17 00:00:00 2001
From: Adrian Herrera <adrian.herrera@arm.com>
Date: Thu, 14 Jan 2021 11:16:19 +0000
Subject: [PATCH] gem5: centralise v20 sources

Both simulator and bootloader now fetch from a single include file
defining the sources. This is in preparation for m5term recipe.

Signed-off-by: Adrian Herrera <adrian.herrera@arm.com>
Change-Id: Ia4f6b6d99401ddb0c726d913ceff4ced90f41f6b
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../gem5/gem5-aarch64-bootloader_20.bb        | 11 +---------
 .../gem5/gem5-aarch64-native_20.bb            | 20 +++++--------------
 .../recipes-devtools/gem5/gem5-source_20.inc  | 12 +++++++++++
 3 files changed, 18 insertions(+), 25 deletions(-)
 create mode 100644 meta-gem5/recipes-devtools/gem5/gem5-source_20.inc

diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-bootloader_20.bb b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-bootloader_20.bb
index d960e6cd..67570f63 100644
--- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-bootloader_20.bb
+++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-bootloader_20.bb
@@ -1,15 +1,6 @@
 # gem5 custom bootloader
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d9514d69d8abf88b6e9125e759bf0ab \
-                    file://LICENSE;md5=a585e2893cee63d16a1d8bc16c6297ec"
-
-SRC_URI = "git://gem5.googlesource.com/public/gem5;protocol=https;nobranch=1"
-RELEASE_TAG = "v20.0.0.1"
-SRCREV = "332a9de33db603e0aefedae1e05134db4257ea3e"
-
-PV = "${RELEASE_TAG}"
-
-S = "${WORKDIR}/git"
+require gem5-source_20.inc
 
 BPN = "gem5-aarch64-bootloader"
 
diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native_20.bb b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native_20.bb
index ce36514e..a2227659 100644
--- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native_20.bb
+++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native_20.bb
@@ -1,19 +1,9 @@
-# gem5 simulator source and checksum information
+require gem5-source_20.inc
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d9514d69d8abf88b6e9125e759bf0ab \
-                    file://LICENSE;md5=a585e2893cee63d16a1d8bc16c6297ec"
-
-SRC_URI = "git://gem5.googlesource.com/public/gem5;protocol=https;nobranch=1 \
-           file://0001-scons-Add-MARSHAL_XXFLAGS_EXTRA-for-the-marshal-object.patch \
-           file://0002-arch-arm-Introduce-HavePACExt-helper.patch \
-           file://0003-arch-arm-Check-if-PAC-is-implemented-before-executing-insts.patch \
-          "
-RELEASE_TAG = "v20.0.0.3"
-SRCREV = "fa70478413e4650d0058cbfe81fd5ce362101994"
-
-PV = "${RELEASE_TAG}"
-
-S = "${WORKDIR}/git"
+SRC_URI += "file://0001-scons-Add-MARSHAL_XXFLAGS_EXTRA-for-the-marshal-object.patch \
+            file://0002-arch-arm-Introduce-HavePACExt-helper.patch \
+            file://0003-arch-arm-Check-if-PAC-is-implemented-before-executing-insts.patch \
+           "
 
 BPN = "gem5-aarch64-native"
 
diff --git a/meta-gem5/recipes-devtools/gem5/gem5-source_20.inc b/meta-gem5/recipes-devtools/gem5/gem5-source_20.inc
new file mode 100644
index 00000000..c4484667
--- /dev/null
+++ b/meta-gem5/recipes-devtools/gem5/gem5-source_20.inc
@@ -0,0 +1,12 @@
+# gem5 sources v20.0.0.3
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d9514d69d8abf88b6e9125e759bf0ab \
+                    file://LICENSE;md5=a585e2893cee63d16a1d8bc16c6297ec"
+
+SRC_URI = "git://gem5.googlesource.com/public/gem5;protocol=https;nobranch=1"
+RELEASE_TAG = "v20.0.0.3"
+SRCREV = "fa70478413e4650d0058cbfe81fd5ce362101994"
+
+PV = "${RELEASE_TAG}"
+
+S = "${WORKDIR}/git"