mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-05 02:20:30 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp: Migrate a5ds to meta-kernel for stable kernels

Browse Source 
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: I4e76c7f1ee4b84641279a389820940fac7130df1
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2020-07-14 08:58:31 -04:00
committed by Jon Mason
parent 20da562210
commit 5990cd6259
8 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/conf/layer.conf
+1 -1
View File
@@ -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
View File
@@ -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-yocto-arm-platforms.inc → meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+6
View File
@@ -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-linaro-arm_4.19.bbappend
+1 -1
View File
@@ -1,3 +1,3 @@
# Add support for Arm Platforms (boards or simulators)
require linux-yocto-arm-platforms.inc
require linux-arm-platforms.inc
meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
+3
View File
@@ -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
-24
View File
@@ -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
-8
View File
@@ -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}"
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
+1 -1
View File
@@ -1,3 +1,3 @@
# Add support for Arm Platforms (boards or simulators)
require linux-yocto-arm-platforms.inc
require linux-arm-platforms.inc