Dunfell compatibility patches
cover Dunfell compatibility patches
The following two patches add dunfell compatibility to foundation-armv8, fvp-base, juno, and gem5 in meta-arm-bsp and meta-arm-autonomy.
Please note that though gem5 now builds with kernel 5.4 (Dunfell default), it's not compiling due to python2 dependency.
Vineeth Raveendran (2):
[arm-bsp] add dunfell support for fvps, juno and gem5 [arm-autonomy] Move to dunfell
meta-arm-autonomy/conf/layer.conf | 2 +-
.../conf/machine/arm64-autonomy-guest.conf | 2 +-
.../images/arm-autonomy-host-image-minimal.bb | 4 +-
.../0001-trace-fix-build-with-gcc9.patch | 56 -------------------
...e-number-of-interrupt-lines-for-dom0.patch | 0
.../xen/{xen_4.%.bbappend => xen_%.bbappend} | 4 ++
.../recipes-extended/xen/xen_4.12.0.bbappend | 10 ----
.../xenguest/xenguest-manager.bb | 2 +-
meta-arm-bsp/conf/machine/fvp-common/fvp.inc | 4 +-
meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 +-
.../fvp-common/u-boot_vexpress_fvp.patch | 13 +++++
.../recipes-bsp/u-boot/u-boot_2019.%.bbappend | 9 ---
.../recipes-bsp/u-boot/u-boot_2020.%.bbappend | 13 +++++
...4.19.bbappend => linux-yocto_5.4.bbappend} | 0
14 files changed, 39 insertions(+), 82 deletions(-)
delete mode 100644 meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch
rename meta-arm-autonomy/recipes-extended/xen/files/{4.12.0 => 4.12}/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch (100%)
rename meta-arm-autonomy/recipes-extended/xen/{xen_4.%.bbappend => xen_%.bbappend} (83%)
delete mode 100644 meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto_4.19.bbappend => linux-yocto_5.4.bbappend} (100%)Signature · 1 line
2.17.1
PATCH 1/2 add dunfell support for fvps, juno and gem5
Make following machines compatible with dunfell:
- foundation-armv8
- fvp-base
- juno
- gem5
Major changes include moving kernel version to 5.4 and U-BOOT version to v2020
Change-Id: Ia59ac874de4e4c4ea02c7a4f976e39a9b6996f75
Issue-Id: SCM-833
---
meta-arm-bsp/conf/machine/fvp-common/fvp.inc | 4 ++--
meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 +-
.../files/fvp-common/u-boot_vexpress_fvp.patch | 13 +++++++++++++
.../recipes-bsp/u-boot/u-boot_2019.%.bbappend | 9 ---------
.../recipes-bsp/u-boot/u-boot_2020.%.bbappend | 13 +++++++++++++
...yocto_4.19.bbappend => linux-yocto_5.4.bbappend} | 0
6 files changed, 29 insertions(+), 12 deletions(-)
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch
delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto_4.19.bbappend => linux-yocto_5.4.bbappend} (100%)meta-arm-bsp/conf/machine/fvp-common/fvp.inc +2 -2
@@ -35,9 +35,9 @@ DISK_IMG_PARTITION3_CONTENT = "" SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot" # FVP u-boot configuration -UBOOT_MACHINE = "vexpress_aemv8a_dram_defconfig" +UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
meta-arm-bsp/conf/machine/gem5-arm64.conf +1 -1
@@ -20,7 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" EXTRA_IMAGEDEPENDS += "virtual/gem5-bootloader" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" # Uncomment the following if you need to build gem5 provided bootloader, else
meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch new file +13 -0
@@ -0,0 +1,13 @@ +diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig +index c9cec8322c..3a339be6a2 100644 +--- a/configs/vexpress_aemv8a_semi_defconfig ++++ b/configs/vexpress_aemv8a_semi_defconfig +@@ -9,7 +9,7 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a" + CONFIG_DISTRO_DEFAULTS=y + CONFIG_BOOTDELAY=1 + CONFIG_USE_BOOTARGS=y +-CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 loglevel=9" ++CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9" + # CONFIG_USE_BOOTCOMMAND is not set + # CONFIG_DISPLAY_CPUINFO is not set + # CONFIG_DISPLAY_BOARDINFO is not set
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend deleted +0 -9
@@ -1,9 +0,0 @@ -# u-boot_2019 patch for Juno board (Adding boot env) - -# -# Patch u-boot to add environment variables from Flash -# - -FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:" - -SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend new file +13 -0
@@ -0,0 +1,13 @@ +# u-boot_2020 patch for fvp machinesboard + +# +# Patch u-boot to change kernel command line +# + +FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:" +FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:" +FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files:" + +SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch" +SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch" +SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend renamed from meta-arm-bsp/recipes-kernel/linux/linux-yocto_4.19.bbappend +0 -0
Signature · 1 line
2.17.1
PATCH 2/2 Move to dunfell
In reply to Vineeth Raveendran- make xenguest-manage rdepend on xen-tools to adapt to recipe modifications in meta-virtualization
- add xen to IMAGE_EXTRADEPENDS to build xen binary when build autonomy-host-image
- switch arm64-autonomy-machine to use Linux 5.4
- remove trace patch for xen as meta-virtualization is now using a xen release which has this fixed
- rework xen bbappends to adapt to changes done in xen recipes
Change-Id: I439bde0df2c0a16f529436b65f1a96af5a2981af
Issue-Id: SCM-833
---
meta-arm-autonomy/conf/layer.conf | 2 +-
.../conf/machine/arm64-autonomy-guest.conf | 2 +-
.../images/arm-autonomy-host-image-minimal.bb | 4 +-
.../0001-trace-fix-build-with-gcc9.patch | 56 -------------------
...e-number-of-interrupt-lines-for-dom0.patch | 0
.../xen/{xen_4.%.bbappend => xen_%.bbappend} | 4 ++
.../recipes-extended/xen/xen_4.12.0.bbappend | 10 ----
.../xenguest/xenguest-manager.bb | 2 +-
8 files changed, 10 insertions(+), 70 deletions(-)
delete mode 100644 meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch
rename meta-arm-autonomy/recipes-extended/xen/files/{4.12.0 => 4.12}/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch (100%)
rename meta-arm-autonomy/recipes-extended/xen/{xen_4.%.bbappend => xen_%.bbappend} (83%)
delete mode 100644 meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappendmeta-arm-autonomy/conf/layer.conf +1 -1
@@ -16,7 +16,7 @@ LAYERDEPENDS_meta-arm-autonomy = " \ openembedded-layer \ virtualization-layer \ " -LAYERSERIES_COMPAT_meta-arm-autonomy = "zeus" +LAYERSERIES_COMPAT_meta-arm-autonomy = "dunfell" # We don't activate virtualization feature from meta-virtualization as it # brings in lots of stuff we don't need. We need to disable the sanity check
meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf +1 -1
@@ -11,7 +11,7 @@ KERNEL_IMAGETYPE = "Image" IMAGE_FSTYPES += "tar.bz2" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" DISTRO_FEATURES += "arm-autonomy-guest"
meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb +3 -1
@@ -39,12 +39,14 @@ IMAGE_INSTALL += " \ packagegroup-core-boot \ packagegroup-core-ssh-openssh \ kernel-modules \ - xen-base \ qemu \ xenguest-manager \ xenguest-network-bridge \ " +# Build xen binary +EXTRA_IMAGEDEPENDS += "xen" + # Build xen-devicetree to produce a xen ready devicetree EXTRA_IMAGEDEPENDS += "xen-devicetree"
meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch deleted +0 -56
56 lines not on this page · raw message
meta-arm-autonomy/recipes-extended/xen/files/4.12/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch renamed from meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch +0 -0
meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend renamed from meta-arm-autonomy/recipes-extended/xen/xen_4.%.bbappend +4 -0
@@ -31,3 +31,7 @@ SRC_URI_append_fvp-base = " file://fvp/defconfig" COMPATIBLE_MACHINE_juno = "juno" SRC_URI_append_juno = " file://juno/defconfig" + +# Gem5 support +# Fix problem with number of interrupts on gem5 +SRC_URI_append_gem5-arm64 = " file://${XEN_REL}/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch"
meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend deleted +0 -10
@@ -1,10 +0,0 @@ -# xen version specific patch information - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -# Solve trace.c compilation error on 4.12.0 -# This should only be applied for 4.12.0 (solved in greater versions) -SRC_URI += "file://4.12.0/0001-trace-fix-build-with-gcc9.patch" - -# Fix problem with number of interrupts on gem5 -SRC_URI_append_gem5-arm64 = " file://4.12.0/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch"
meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb +1 -1
@@ -46,7 +46,7 @@ do_install() { } # Things that we need on the target -RDEPENDS_${PN} += "bash tar xenguest-mkimage lvm2 xen-xl parted e2fsprogs" +RDEPENDS_${PN} += "bash tar xenguest-mkimage lvm2 xen-tools parted e2fsprogs" FILES_${PN} += "${bindir}/xenguest-manager \ ${sysconfdir}/xenguest"
Signature · 1 line
2.17.1
Quoted 9 lines · Vineeth Raveendran
The following two patches add dunfell compatibility to foundation-armv8, fvp-base, juno, and gem5 in meta-arm-bsp and meta-arm-autonomy.
Please note that though gem5 now builds with kernel 5.4 (Dunfell default), it's not compiling due to python2 dependency.
Vineeth Raveendran (2):
[arm-bsp] add dunfell support for fvps, juno and gem5 [arm-autonomy] Move to dunfell
Series pulled into the master branch.
NOTE: GEM5 does not compile against dunfell, due to a python2 issue. I believe this is a known issue which can be addressed when gem5 is released in the next couple of weeks.
Thanks,
Jon
Quoted 30 lines
meta-arm-autonomy/conf/layer.conf | 2 +- .../conf/machine/arm64-autonomy-guest.conf | 2 +- .../images/arm-autonomy-host-image-minimal.bb | 4 +- .../0001-trace-fix-build-with-gcc9.patch | 56 ------------------- ...e-number-of-interrupt-lines-for-dom0.patch | 0 .../xen/{xen_4.%.bbappend => xen_%.bbappend} | 4 ++ .../recipes-extended/xen/xen_4.12.0.bbappend | 10 ---- .../xenguest/xenguest-manager.bb | 2 +- meta-arm-bsp/conf/machine/fvp-common/fvp.inc | 4 +- meta-arm-bsp/conf/machine/gem5-arm64.conf | 2 +- .../fvp-common/u-boot_vexpress_fvp.patch | 13 +++++ .../recipes-bsp/u-boot/u-boot_2019.%.bbappend | 9 --- .../recipes-bsp/u-boot/u-boot_2020.%.bbappend | 13 +++++ ...4.19.bbappend => linux-yocto_5.4.bbappend} | 0 14 files changed, 39 insertions(+), 82 deletions(-) delete mode 100644 meta-arm-autonomy/recipes-extended/xen/files/4.12.0/0001-trace-fix-build-with-gcc9.patch rename meta-arm-autonomy/recipes-extended/xen/files/{4.12.0 => 4.12}/0001-xen-arm-Cap-the-number-of-interrupt-lines-for-dom0.patch (100%) rename meta-arm-autonomy/recipes-extended/xen/{xen_4.%.bbappend => xen_%.bbappend} (83%) delete mode 100644 meta-arm-autonomy/recipes-extended/xen/xen_4.12.0.bbappend create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/files/fvp-common/u-boot_vexpress_fvp.patch delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2019.%.bbappend create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto_4.19.bbappend => linux-yocto_5.4.bbappend} (100%)Signature · 1 line
2.17.1