mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-07-16 03:47:19 +00:00
Code Issues Projects Releases Wiki Activity

arm/gem5/boot-wrapper-aarch64: Move main recipe to meta-arm

Browse Source 
Move boot-wrapper-aarch64 recipe from meta-gem5 to meta-arm and merge the
contents of the .bb and .inc into a single recipe file.

Also, create a boot-wrapper-aarch64_%.bbappend for the gem5-arm64 machine.

Updated documentation for gem5-arm64 where meta-arm-toolchain and meta-arm
layers need to be included in the bblayers.conf.

Change-Id: Ia8193f4f0bf98069edcbf1661cb3e9b2105d12a3
Issue-Id: SCM-2080
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Diego Sueiro
2021-02-11 08:26:54 +00:00
committed by Jon Mason
parent aa63e31b6e
commit 0cec3e584d
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gem5/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64.inc → meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb
+10 -5
View File
@@ -1,14 +1,20 @@
SUMMARY = "Linux aarch64 boot wrapper with FDT support" SUMMARY = "Linux aarch64 boot wrapper with FDT support"
LICENSE = "BSD" LICENSE = "BSD"
inherit autotools deploy LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c"
PROVIDES = "virtual/gem5-bootloader boot-wrapper-aarch64" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git"
SRCREV = "fd74c8cbd0e17483d2299208cad9742bee605ca7"
PV = "git${SRCPV}"
S = "${WORKDIR}/git"
inherit autotools deploy
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE ?= "" COMPATIBLE_MACHINE ?= "invalid"
# Device tree to put in the image # Device tree to put in the image
# by default use the standard kernel devicetree # by default use the standard kernel devicetree
@@ -84,4 +90,3 @@ do_deploy() {
${DEPLOYDIR}/linux-system.axf ${DEPLOYDIR}/linux-system.axf
} }
addtask deploy before do_build after do_compile addtask deploy before do_build after do_compile
meta-gem5/conf/layer.conf
+2 -1
View File
@@ -9,5 +9,6 @@ BBFILE_COLLECTIONS += "meta-gem5"
BBFILE_PATTERN_meta-gem5 = "^${LAYERDIR}/" BBFILE_PATTERN_meta-gem5 = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-gem5 = "5" BBFILE_PRIORITY_meta-gem5 = "5"
LAYERDEPENDS_meta-gem5 = "core openembedded-layer" LAYERDEPENDS_meta-gem5 = "core openembedded-layer meta-arm"
LAYERSERIES_COMPAT_meta-gem5 = "gatesgarth" LAYERSERIES_COMPAT_meta-gem5 = "gatesgarth"
meta-gem5/documentation/gem5-arm64.md
+4 -1
View File
@@ -6,10 +6,13 @@
In the local.conf file, MACHINE should be set as follow: In the local.conf file, MACHINE should be set as follow:
MACHINE ?= "gem5-arm64" MACHINE ?= "gem5-arm64"
And in the bblayers.conf the following layers need to be added:
##OEROOT##/meta-arm/meta-arm-toolchain
##OEROOT##/meta-arm/meta-arm
### Build: ### Build:
```bash$ bitbake core-image-minimal``` ```bash$ bitbake core-image-minimal```
### Run: ### Run:
After compilation of an image, you can execute it using the compiled gem5 After compilation of an image, you can execute it using the compiled gem5
with the followin command: with the followin command:
meta-gem5/recipes-bsp/boot-wrapper-aaarch64/boot-wrapper-aarch64_git.bb → meta-gem5/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
+3 -17
View File
@@ -1,20 +1,7 @@
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git"
PV = "git${SRCPV}"
S = "${WORKDIR}/git"
SRCREV = "fd74c8cbd0e17483d2299208cad9742bee605ca7"
BPN = "boot-wrapper-aarch64"
require boot-wrapper-aarch64.inc
# Gem5 aarch64 support # Gem5 aarch64 support
COMPATIBLE_MACHINE_gem5_arm64 = "gem5-arm64" COMPATIBLE_MACHINE_gem5-arm64 = "gem5-arm64"
PROVIDES_gem5-arm64 += "virtual/gem5-bootloader"
# For gem5 we use the dtb generated by gem5 directly # For gem5 we use the dtb generated by gem5 directly
DEPENDS_append_gem5-arm64 = " gem5-aarch64-dtb" DEPENDS_append_gem5-arm64 = " gem5-aarch64-dtb"
@@ -24,4 +11,3 @@ BOOT_WRAPPER_AARCH64_DEVICETREE_gem5-arm64 = "gem5-aarch64.dtb"
DEPLOY_DEPEND_LIST ?= "" DEPLOY_DEPEND_LIST ?= ""
DEPLOY_DEPEND_LIST_gem5-arm64 = " gem5-aarch64-dtb:do_deploy" DEPLOY_DEPEND_LIST_gem5-arm64 = " gem5-aarch64-dtb:do_deploy"
do_deploy[depends] += "${DEPLOY_DEPEND_LIST}" do_deploy[depends] += "${DEPLOY_DEPEND_LIST}"