Skip to contentSkip to conversation

arm-bsp: Update kernel recipes to match upstream format

PATCH New Jon Mason 1 participant 6 messages Aug 10, 2021

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/6 arm-bsp: Update kernel recipes to match upstream format

Using recipes-kernel/linux/linux-yocto_5.4.bb as a guide, format the kernel recipes to match. This enables easier diffing and updating.

---
 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb | 11 +++++++++--
 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb | 11 +++++++++--
 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb | 10 ++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb +9 -2
index 9d5e9ce..036cb00 100644
@@ -1,4 +1,4 @@
-KBRANCH = "v5.3/base"
+KBRANCH ?= "v5.3/standard/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
@@ -8,8 +8,15 @@ SRCREV_meta = "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION = "5.3.18"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LINUX_VERSION = "5.3.18"
+
+DEPENDS += "openssl-native util-linux-native"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
+
 KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "1"
+
+# Functionality flags
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb +9 -2
index d17cb30..33e6dd9 100644
@@ -1,4 +1,4 @@
-KBRANCH = "v5.6/base"
+KBRANCH ?= "v5.6/standard/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
@@ -8,8 +8,15 @@ SRCREV_meta = "b152cd93ea7046a835c869a76085aefdb6ce7421"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.6;destsuffix=${KMETA}"
 
-LINUX_VERSION = "5.6.14"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION = "5.6.14"
+
+DEPENDS += "openssl-native util-linux-native"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
+
 KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "1"
+
+# Functionality flags
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.7.bb +8 -2
index 12eaa59..81b602d 100644
@@ -1,4 +1,4 @@
-KBRANCH = "v5.7/base"
+KBRANCH ?= "v5.7/standard/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
@@ -8,9 +8,15 @@ SRCREV_meta = "b9e6fd082dc5bfb51699809d7119d4b20d280c0b"
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.7;destsuffix=${KMETA}"
 
-LINUX_VERSION = "5.7.19"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION = "5.7.19"
+
+DEPENDS += "openssl-native util-linux-native"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
+
 KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "1"
 
+# Functionality flags
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/6 arm-bsp: update 5.6 Linux kernel recipe to 5.6.19

---
 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6.bb +2 -2
index 33e6dd9..9b536c9 100644
@@ -2,14 +2,14 @@ KBRANCH ?= "v5.6/standard/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine = "e3ac9117b18596b7363d5b7904ab03a7d782b40c"
+SRCREV_machine = "cd5b55b99dab4da10ffd084f00f2ba088a74f45f"
 SRCREV_meta = "b152cd93ea7046a835c869a76085aefdb6ce7421"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.6;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION = "5.6.14"
+LINUX_VERSION = "5.6.19"
 
 DEPENDS += "openssl-native util-linux-native"
 
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/6 sgi575: remove redundant entry

In reply to Jon Mason

sgi575 already has the defconfig entry in the include file. Remove the redundant entry from the machine config file.

---
 meta-arm-bsp/conf/machine/sgi575.conf | 2 --
 1 file changed, 2 deletions(-)
meta-arm-bsp/conf/machine/sgi575.conf +0 -2
index 82009f3..4f91710 100644
@@ -12,11 +12,9 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 
-# Use kernel provided by linaro
 KERNEL_IMAGETYPE ?= "Image"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.7%"
-KCONFIG_MODE = "--alldefconfig"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 #grub-efi
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 4/6 n1sdp: use upstream tunes file

In reply to Jon Mason
---
 .../conf/machine/include/tune-neoversen1.inc       | 14 --------------
 meta-arm-bsp/conf/machine/n1sdp.conf               |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 meta-arm-bsp/conf/machine/include/tune-neoversen1.inc
meta-arm-bsp/conf/machine/include/tune-neoversen1.inc deleted +0 -14
deleted file mode 100644
index 6999805..0000000
@@ -1,14 +0,0 @@
-DEFAULTTUNE ?= "neoversen1"
-
-TUNEVALID[neoversen1] = "Enable Neoverse-N1 specific processor optimizations"
-# Note: Neoverse was called Ares, and GCC will accept "ares" in place of "neoverse-n1"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'neoversen1', ' -mcpu=neoverse-n1', '', d)}"
-
-require conf/machine/include/arm/arch-armv8-2a.inc
-
-# Little Endian base configs
-AVAILTUNES += "neoversen1"
-ARMPKGARCH:tune-neoversen1             = "neoversen1"
-TUNE_FEATURES:tune-neoversen1          = "aarch64 neoversen1 crc crypto"
-PACKAGE_EXTRA_ARCHS:tune-neoversen1    = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} neoversen1"
-BASE_LIB:tune-neoversen1               = "lib64"
meta-arm-bsp/conf/machine/n1sdp.conf +1 -1
index e80580d..b0d97f8 100644
@@ -4,7 +4,7 @@
 #@NAME: N1SDP machine
 #@DESCRIPTION: Machine configuration for N1SDP
 
-require conf/machine/include/tune-neoversen1.inc
+require conf/machine/include/arm/armv8-2a/tune-neoversen1.inc
 
 KERNEL_IMAGETYPE = "Image"
 
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 5/6 arm: remove support for hardknott and older

In reply to Jon Mason

No testing is being done against older branches. Only have the compatibility set to honister to prevent any issues.

---
 meta-arm-autonomy/conf/layer.conf | 2 +-
 meta-arm-bsp/conf/layer.conf      | 2 +-
 meta-arm/conf/layer.conf          | 2 +-
 meta-atp/conf/layer.conf          | 2 +-
 meta-gem5/conf/layer.conf         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
meta-arm-autonomy/conf/layer.conf +1 -1
index 47aeee0..a77e802 100644
@@ -17,7 +17,7 @@ LAYERDEPENDS_meta-arm-autonomy = " \
    networking-layer \
    virtualization-layer \
 "
-LAYERSERIES_COMPAT_meta-arm-autonomy = "hardknott honister"
+LAYERSERIES_COMPAT_meta-arm-autonomy = "honister"
 
 # 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-bsp/conf/layer.conf +1 -1
index d207930..f4306a6 100644
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arm-bsp = "5"
 
-LAYERSERIES_COMPAT_meta-arm-bsp = "hardknott honister"
+LAYERSERIES_COMPAT_meta-arm-bsp = "honister"
 
 LAYERDEPENDS_meta-arm-bsp = "core meta-arm"
 # This won't be used by layerindex-fetch, but works everywhere else
meta-arm/conf/layer.conf +1 -1
index 4c3b58e..24d9091 100644
@@ -13,4 +13,4 @@ LAYERDEPENDS_meta-arm = " \
     core \
     arm-toolchain \
 "
-LAYERSERIES_COMPAT_meta-arm = "hardknott honister"
+LAYERSERIES_COMPAT_meta-arm = "honister"
meta-atp/conf/layer.conf +1 -1
index 40c46c5..f749e4a 100644
@@ -6,4 +6,4 @@ BBFILE_COLLECTIONS += "meta-atp"
 BBFILE_PATTERN_meta-atp = "^${LAYERDIR}/"
 
 LAYERDEPENDS_meta-atp = "core openembedded-layer meta-gem5"
-LAYERSERIES_COMPAT_meta-atp = "gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_meta-atp = "honister"
meta-gem5/conf/layer.conf +1 -1
index 0ab704f..0b699b2 100644
@@ -10,7 +10,7 @@ BBFILE_PATTERN_meta-gem5 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-gem5 = "5"
 
 LAYERDEPENDS_meta-gem5 = "core openembedded-layer meta-arm"
-LAYERSERIES_COMPAT_meta-gem5 = "hardknott honister"
+LAYERSERIES_COMPAT_meta-gem5 = "honister"
 
 BBFILES_DYNAMIC += " \
     virtualization-layer:${LAYERDIR}/dynamic-layers/meta-virtualization/*/*/*.bbappend \
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 6/6 CI: Remove qemuarmv5 parselog workaround

In reply to Jon Mason

qemuarmv5 parselog fix is now upstream. Remove the workaround.

---
 ci/qemuarmv5.yml | 5 -----
 1 file changed, 5 deletions(-)
ci/qemuarmv5.yml +0 -5
index 4081124..b1ff446 100644
@@ -4,8 +4,3 @@ header:
     - base.yml
 
 machine: qemuarmv5
-
-local_conf_header:
-  bugs: |
-    # Remove parselogs until errors can be resolved
-    TEST_SUITES:remove = "parselogs"
Signature · 1 line
2.17.1