[meta-arm,3/4] arm-bsp: Prepare to migrate linaro kernels to meta-kernel

Submitted by Jon Mason on July 14, 2020, 12:58 p.m. | Patch ID: 174433

Details

Message ID 20200714125834.31338-3-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason July 14, 2020, 12:58 p.m.
Reorganize and clean-up the Linaro kernel recipes for migration to
meta-kernel.

Change-Id: I4291ae01b5679ee2c110b1deb38c963bde254177
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../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

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc
new file mode 100644
index 0000000..1b8d4b2
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm.inc
@@ -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"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bb b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bb
index 089f6cb..df8ba4d 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bb
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bb
@@ -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
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bbappend
index ed6fbc3..b1bc72e 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_4.19.bbappend
@@ -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)}"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bb b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bb
index 516573a..feed922 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bb
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bb
@@ -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
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend
index 0f516c7..dcc6e47 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm_5.4.bbappend
@@ -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