arm-bsp: Migrate a5ds to meta-kernel for stable kernels
PATCH 1/4 arm-bsp: Migrate a5ds to meta-kernel for stable kernels
a5ds is having issues building its stable kernel on master. Migrate to meta-kernel to fix the build break. This has the benefit of meta-arm not having a unique stable kernel recipe to maintain and support.
Also, change the name of linux-yocto-arm-platforms to be more generic, as it doesn't accurately reflect where it is currently being used and can be used by different kernels going forward.
---
meta-arm-bsp/conf/layer.conf | 2 +-
meta-arm-bsp/conf/machine/a5ds.conf | 4 ++--
...-platforms.inc => linux-arm-platforms.inc} | 6 +++++
.../linux/linux-stable_%.bbappend | 3 +++
.../linux/linux-upstream-arm-platforms.inc | 24 -------------------
.../linux/linux-upstream-arm_5.3.bb | 8 -------
6 files changed, 12 insertions(+), 35 deletions(-)
rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto-arm-platforms.inc => linux-arm-platforms.inc} (91%)
create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm-platforms.inc
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm_5.3.bbmeta-arm-bsp/conf/layer.conf +1 -1
@@ -9,5 +9,5 @@ BBFILE_COLLECTIONS += "meta-arm-bsp" BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-arm-bsp = "6" -LAYERDEPENDS_meta-arm-bsp = "core meta-arm" +LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel" LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
meta-arm-bsp/conf/machine/a5ds.conf +2 -2
@@ -6,8 +6,8 @@ require conf/machine/include/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-upstream-arm" -PREFERRED_VERSION_linux-upstream-arm ?= "5.3%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" +PREFERRED_VERSION_linux-stable ?= "5.3%" KBUILD_DEFCONFIG = "multi_v7_defconfig" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc renamed from meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +6 -0
@@ -15,6 +15,12 @@ SRC_URI_append_juno = " ${SRC_URI_KMETA}" SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" +# +# Cortex-A5 DesignStart KMACHINE +# +COMPATIBLE_MACHINE_a5ds = "a5ds" +KMACHINE_a5ds = "a5ds" + # # FVP FOUNDATION KMACHINE #
meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +# Add support for Arm Platforms (boards or simulators) + +require linux-arm-platforms.inc
meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm-platforms.inc deleted +0 -24
@@ -1,24 +0,0 @@ -DESCRIPTION = "Linux Kernel based on upstream tree" -SECTION = "kernel" -LICENSE = "GPLv2" -SRCREV_FORMAT = "kernel" - -require recipes-kernel/linux/linux-yocto.inc - -KERNEL_VERSION_SANITY_SKIP = "1" - -S = "${WORKDIR}/git" - -# Override do_kernel_configme to avoid kernel being assembled into a linux-yocto -# style kernel -# https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#ref-tasks-kernel_configme -do_kernel_configme[noexec] = "1" - -# Make sure no branch is defined since here we track a specific version -KBRANCH = "" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux;protocol=git;nobranch=1 \ - "
meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm_5.3.bb deleted +0 -8
@@ -1,8 +0,0 @@ -# Add support for Upstream Kernel for Arm Platforms (boards or simulators) - -SUMMARY = "Linux Kernel Upstream, supported by Arm/Linaro" - -require recipes-kernel/linux/linux-upstream-arm-platforms.inc - -SRCREV = "v${PV}" -LINUX_VERSION ?= "${PV}"
Signature · 1 line
2.17.1
PATCH 2/4 arm-bsp: Fix tc0 compile
TC0 does not compile on the latest master branch. Clean-up the recipe and get it compiling again.
--- .../recipes-kernel/linux/linux-arm-platforms.inc | 13 +++++++++++++ .../recipes-kernel/linux/linux-arm64-ack-tc0.inc | 15 --------------- .../linux/linux-arm64-ack_4.19.bbappend | 5 ++--- .../recipes-kernel/linux/linux-arm64-ack_4.19.bb | 1 - 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc
meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +13 -0
@@ -38,3 +38,16 @@ KMACHINE_fvp-base = "fvp" # COMPATIBLE_MACHINE_juno = "juno" KMACHINE_juno = "juno" + +# +# Total Compute KMACHINE +# +COMPATIBLE_MACHINE_tc0 = "tc0" +KMACHINE_tc0 = "tc0" +KBUILD_DEFCONFIG_tc0 = "defconfig" +KCONFIG_MODE_tc0 = "--alldefconfig" +SRC_URI_append_tc0 = " \ + file://0001-drm-Add-component-aware-simple-encoder.patch \ + file://0002-swap-red-and-blue-colors-in-HDLCD-driver.patch \ + file://defconfig \ + "
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-tc0.inc deleted +0 -15
@@ -1,15 +0,0 @@ -# -# TC0 MACHINE specific configurations -# - -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-arm64-ack-4.19:${THISDIR}/files:" - -SRC_URI_append = " \ - file://defconfig \ - file://0001-drm-Add-component-aware-simple-encoder.patch \ - file://0002-swap-red-and-blue-colors-in-HDLCD-driver.patch \ - " - -KCONFIG_MODE = "--alldefconfig" - -COMPATIBLE_MACHINE = "tc0"
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_4.19.bbappend +2 -3
@@ -1,6 +1,5 @@ # Machine specific configurations -MACHINE_ACK_REQUIRE ?= "" -MACHINE_ACK_REQUIRE_tc0 = "linux-arm64-ack-tc0.inc" +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-arm64-ack-4.19:${THISDIR}/files:" -require ${MACHINE_ACK_REQUIRE} +require linux-arm-platforms.inc
meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb +0 -1
@@ -3,7 +3,6 @@ # Copyright (c) 2020 Arm Limited # - DESCRIPTION = "Linux Android Common Kernel" SECTION = "kernel" LICENSE = "GPLv2"
Signature · 1 line
2.17.1
PATCH 3/4 arm-bsp: Prepare to migrate linaro kernels to meta-kernel
In reply to Jon MasonReorganize and clean-up the Linaro kernel recipes for migration to meta-kernel.
--- .../recipes-kernel/linux/linux-linaro-arm.inc | 19 +++++++++++ .../linux/linux-linaro-arm_4.19.bb | 33 +++---------------- .../linux/linux-linaro-arm_4.19.bbappend | 10 +++++- .../linux/linux-linaro-arm_5.4.bb | 26 ++++----------- .../linux/linux-linaro-arm_5.4.bbappend | 2 +- 5 files changed, 40 insertions(+), 50 deletions(-) create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc
meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc new file +19 -0
@@ -0,0 +1,19 @@ +# Recipe for building linaro kernel + +SUMMARY = "Linux Kernel Upstream, supported by Arm/Linaro" +SECTION = "kernel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" + +inherit kernel +inherit kernel-yocto + +SRC_URI = "git://git.linaro.org/landing-teams/working/arm/kernel-release.git;branch=${KBRANCH} \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=kernel-meta \ + file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +LINUX_VERSION ?= "${PV}" +S = "${WORKDIR}/git"
meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bb +4 -29
@@ -1,32 +1,7 @@ -# Recipe for building linaro provided kernel +SRCREV ?= "e97e8d868aba53467039dbef3b7436c857433ae3" +SRCREV_meta ?= "69022e62eb6c7046c84dace4af66ee8a30865865" KBRANCH ?= "latest-4.19-armlt-19.01" +KMETA_BRANCH ?= "yocto-4.19" -require recipes-kernel/linux/linux-yocto.inc - - -SRCREV_machine ?= "e97e8d868aba53467039dbef3b7436c857433ae3" - -SRCREV_meta ?= "ad6f8b357720ca8167a090713b7746230cf4b314" - -SRC_URI = "git://git.linaro.org/landing-teams/working/arm/kernel-release.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ - file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.0" - -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" -DEPENDS += "openssl-native util-linux-native" - -PV = "${LINUX_VERSION}+git${SRCPV}" - -KMETA = "kernel-meta" -KCONF_BSP_AUDIT_LEVEL = "2" - -# Functionality flags -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}" +require linux-linaro-arm.inc
meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bbappend +9 -1
@@ -1,3 +1,11 @@ # Add support for Arm Platforms (boards or simulators) -require linux-yocto-arm-platforms.inc +require linux-arm-platforms.inc + +KCONF_BSP_AUDIT_LEVEL = "2" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bb +7 -19
@@ -1,22 +1,10 @@ -# Add support for Arm Linaro Kernel 5.4 for Arm Platforms (boards or simulators) +SRCREV ?= "41e8d7be674f98a0f3bef67b16ea2162109fd522" +SRCREV_meta ?= "e32057eca987b7abbe3eb47ba36f06af8711278a" -SUMMARY = "Linux Kernel Upstream, supported by Arm/Linaro" -LICENSE = "GPLv2" -SECTION = "kernel" +# KBRANCH is set to n1sdp by default as there is no master or 5.4 branch on the repository +KBRANCH ?= "n1sdp" +KMETA_BRANCH ?= "yocto-5.4" -require recipes-kernel/linux/linux-yocto.inc +SRC_URI_append = " file://fix-bfd-link.patch" -COMPATIBLE_MACHINE ?= "invalid" - -# KBRANCH is set to n1sdp by default as there is no master branch on the repository -KBRANCH = "n1sdp" - -SRC_URI = "git://git.linaro.org/landing-teams/working/arm/kernel-release.git;nobranch=1 \ - file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \ - file://fix-bfd-link.patch \ - " -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -# Refer to commit TAG N1SDP-2020.03.26 since it will not get force pushed -SRCREV = "137cccb0843e63b031acf67d1ca4f6447b8c417c" -LINUX_VERSION ?= "${PV}" +require linux-linaro-arm.inc
meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend +1 -1
@@ -15,7 +15,7 @@ SRC_URI_append_n1sdp = " \ " # Referring to commit TAG N1SDP-2020.03.26 -SRCREV_n1sdp = "137cccb0843e63b031acf67d1ca4f6447b8c417c" +SRCREV_n1sdp = "41e8d7be674f98a0f3bef67b16ea2162109fd522" SRCREV_dts_n1sdp = "3209a868152f348194cc1f20fd87c759d3a97d45" # Use intree defconfig
Signature · 1 line
2.17.1
PATCH 4/4 arm-bsp: remove unused bbappend
In reply to Jon Masonlinux-yocto_5.4.bbappend is currently referencing a non-existing file. It's not breaking the build because no one is using it. Instead of fixing it, it is better to remove it and re-add if/when it is used again.
--- meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend deleted +0 -3
@@ -1,3 +0,0 @@ -# Add support for Arm Platforms (boards or simulators) - -require linux-yocto-arm-platforms.inc
Signature · 1 line
2.17.1
Re: [meta-arm] [PATCH 4/4] arm-bsp: remove unused bbappend
Quoted 7 lines · Jon Mason
linux-yocto_5.4.bbappend is currently referencing a non-existing file. It's not breaking the build because no one is using it. Instead of fixing it, it is better to remove it and re-add if/when it is used again.
Change-Id Icc6d4b2a3d42981dac884600a351c267ac346246Signed-off-by Jon Mason <[email protected]>
This is now being used by Anders' most recent patch. Dropping.
Thanks,
Jon
Quoted 19 lines
--- meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappendmeta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend deleted +0
-3@@ -1,3 +0,0 @@ -# Add support for Arm Platforms (boards or simulators) - -require linux-yocto-arm-platforms.incSignature · 1 line
2.17.1
Quoted 10 lines · Jon Mason
a5ds is having issues building its stable kernel on master. Migrate to meta-kernel to fix the build break. This has the benefit of meta-arm not having a unique stable kernel recipe to maintain and support.
Also, change the name of linux-yocto-arm-platforms to be more generic, as it doesn't accurately reflect where it is currently being used and can be used by different kernels going forward.
Change-Id I4e76c7f1ee4b84641279a389820940fac7130df1Signed-off-by Jon Mason <[email protected]>
Series pulled into master.
Thanks,
Jon
Quoted 117 lines
--- meta-arm-bsp/conf/layer.conf | 2 +- meta-arm-bsp/conf/machine/a5ds.conf | 4 ++-- ...-platforms.inc => linux-arm-platforms.inc} | 6 +++++ .../linux/linux-stable_%.bbappend | 3 +++ .../linux/linux-upstream-arm-platforms.inc | 24 ------------------- .../linux/linux-upstream-arm_5.3.bb | 8 ------- 6 files changed, 12 insertions(+), 35 deletions(-) rename meta-arm-bsp/recipes-kernel/linux/{linux-yocto-arm-platforms.inc => linux-arm-platforms.inc} (91%) create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm-platforms.inc delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm_5.3.bbmeta-arm-bsp/conf/layer.conf +1
-1@@ -9,5 +9,5 @@ BBFILE_COLLECTIONS += "meta-arm-bsp" BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-arm-bsp = "6" -LAYERDEPENDS_meta-arm-bsp = "core meta-arm" +LAYERDEPENDS_meta-arm-bsp = "core meta-arm meta-kernel" LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"meta-arm-bsp/conf/machine/a5ds.conf +2
-2@@ -6,8 +6,8 @@ require conf/machine/include/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-upstream-arm" -PREFERRED_VERSION_linux-upstream-arm ?= "5.3%" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable" +PREFERRED_VERSION_linux-stable ?= "5.3%" KBUILD_DEFCONFIG = "multi_v7_defconfig" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc renamed from meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +6
-0@@ -15,6 +15,12 @@ SRC_URI_append_juno = " ${SRC_URI_KMETA}" SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" +# +# Cortex-A5 DesignStart KMACHINE +# +COMPATIBLE_MACHINE_a5ds = "a5ds" +KMACHINE_a5ds = "a5ds" + # # FVP FOUNDATION KMACHINE #meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend new file +3
-0@@ -0,0 +1,3 @@ +# Add support for Arm Platforms (boards or simulators) + +require linux-arm-platforms.incmeta-arm-bsp/recipes-kernel/linux/linux-upstream-arm-platforms.inc deleted +0
-24@@ -1,24 +0,0 @@ -DESCRIPTION = "Linux Kernel based on upstream tree" -SECTION = "kernel" -LICENSE = "GPLv2" -SRCREV_FORMAT = "kernel" - -require recipes-kernel/linux/linux-yocto.inc - -KERNEL_VERSION_SANITY_SKIP = "1" - -S = "${WORKDIR}/git" - -# Override do_kernel_configme to avoid kernel being assembled into a linux-yocto -# style kernel -# https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html#ref-tasks-kernel_configme -do_kernel_configme[noexec] = "1" - -# Make sure no branch is defined since here we track a specific version -KBRANCH = "" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux;protocol=git;nobranch=1 \ - "meta-arm-bsp/recipes-kernel/linux/linux-upstream-arm_5.3.bb deleted +0
-8@@ -1,8 +0,0 @@ -# Add support for Upstream Kernel for Arm Platforms (boards or simulators) - -SUMMARY = "Linux Kernel Upstream, supported by Arm/Linaro" - -require recipes-kernel/linux/linux-upstream-arm-platforms.inc - -SRCREV = "v${PV}" -LINUX_VERSION ?= "${PV}"Signature · 1 line
2.17.1