All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ross Burton" <ross@burtonini.com>
To: meta-arm@lists.yoctoproject.org
Subject: [PATCH 2/2] gem5: centralise v20 sources
Date: Thu, 14 Jan 2021 11:16:19 +0000	[thread overview]
Message-ID: <20210114111619.2170401-2-ross.burton@arm.com> (raw)
In-Reply-To: <20210114111619.2170401-1-ross.burton@arm.com>

From: Adrian Herrera <adrian.herrera@arm.com>

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
---
 .../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 d960e6c..67570f6 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 ce36514..a222765 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 0000000..c448466
--- /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"
-- 
2.25.1


  reply	other threads:[~2021-01-14 11:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14 11:16 [PATCH 1/2] gem5: use GEM5_RUN_PROFILE in DTB generation Ross Burton
2021-01-14 11:16 ` Ross Burton [this message]
2021-01-14 19:25 ` [meta-arm] " Jon Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210114111619.2170401-2-ross.burton@arm.com \
    --to=ross@burtonini.com \
    --cc=meta-arm@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.