[PATCH 1/2] gem5: use GEM5_RUN_PROFILE in DTB generation

[PATCH 1/2] gem5: use GEM5_RUN_PROFILE in DTB generation

[Ross Burton]

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

Allows to generate DTBs from profiles other than baremetal.py, which is
the default established by the layer.

Signed-off-by: Adrian Herrera <adrian.herrera@arm.com>
Change-Id: Ic990bd6751e473756d0739f421dce4b8f98248d7
---
 meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
index b97a1b2..50ac030 100644
--- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
+++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
@@ -11,7 +11,7 @@ do_configure[noexec] = "1"
 do_compile() {
     # generate a dtb using gem5
     gem5.opt \
-        ${STAGING_DATADIR_NATIVE}/gem5/configs/example/arm/baremetal.py \
+        ${STAGING_DATADIR_NATIVE}/gem5/${GEM5_RUN_PROFILE} \
         --dtb-gen
 
     if [ ! -f m5out/system.dtb ]; then
-- 
2.25.1

[PATCH 2/2] gem5: centralise v20 sources

[Ross Burton]

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

Re: [meta-arm] [PATCH 1/2] gem5: use GEM5_RUN_PROFILE in DTB generation

[Jon Mason]

On Thu, Jan 14, 2021 at 11:16:18AM +0000, Ross Burton wrote:
> From: Adrian Herrera <adrian.herrera@arm.com>
> 
> Allows to generate DTBs from profiles other than baremetal.py, which is
> the default established by the layer.
> 
> Signed-off-by: Adrian Herrera <adrian.herrera@arm.com>
> Change-Id: Ic990bd6751e473756d0739f421dce4b8f98248d7
> ---

Series pulled into master.

Thanks,
Jon

>  meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
> index b97a1b2..50ac030 100644
> --- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
> +++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-dtb.bb
> @@ -11,7 +11,7 @@ do_configure[noexec] = "1"
>  do_compile() {
>      # generate a dtb using gem5
>      gem5.opt \
> -        ${STAGING_DATADIR_NATIVE}/gem5/configs/example/arm/baremetal.py \
> +        ${STAGING_DATADIR_NATIVE}/gem5/${GEM5_RUN_PROFILE} \
>          --dtb-gen
>  
>      if [ ! -f m5out/system.dtb ]; then
> -- 
> 2.25.1
> 

> 
> 
>