Skip to contentSkip to conversation

arm-bsp: switch to linux-yocto for a5ds

PATCH In review Jon Mason 2 participants 4 messages Dec 10, 2020

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/3 arm-bsp: switch to linux-yocto for a5ds

Keeping with what is being done on the master branch, switch to using linux-yocto for the 5.3 kernel.

Change-Id Ic327c6ea6e22d6fc0dd41dfb30755c677e5defff
---
 meta-arm-bsp/conf/layer.conf                      |  2 +-
 meta-arm-bsp/conf/machine/a5ds.conf               |  5 +++--
 .../recipes-kernel/linux/linux-stable_%.bbappend  |  3 ---
 .../recipes-kernel/linux/linux-yocto_5.3.bb       | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
meta-arm-bsp/conf/layer.conf +1 -1
index 0b6985c..1a54ddc 100644
@@ -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 openembedded-layer meta-arm meta-kernel"
+LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
 LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
meta-arm-bsp/conf/machine/a5ds.conf +3 -2
index e7180e9..331d298 100644
@@ -6,9 +6,10 @@
 
 require conf/machine/include/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
-PREFERRED_VERSION_linux-stable ?= "5.3%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
+KCONFIG_MODE = "--alldefconfig"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend deleted +0 -3
deleted file mode 100644
index db850ea..0000000
@@ -1,3 +0,0 @@
-# Add support for Arm Platforms (boards or simulators)
-
-require linux-arm-platforms.inc
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb new file +15 -0
new file mode 100644
index 0000000..9d5e9ce
@@ -0,0 +1,15 @@
+KBRANCH = "v5.3/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+SRCREV_machine = "d4f3318ed8fab6316cb7a269b8f42306632a3876"
+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"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+KMETA = "kernel-meta"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/3 arm-bsp: Fix Juno kernel config warnings

Juno kernel compilation is displaying warnings due to missing dependencies. Add the missing dependencies and the warnings go away.

Change-Id I78471cdfa826c8a528d13f344fb88c1baa55d3b1
---
 .../arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg      | 1 +
 .../arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sound.cfg    | 1 +
 2 files changed, 2 insertions(+)
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg +1 -0
index 295d190..c36ab4e 100644
@@ -1,5 +1,6 @@
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
+CONFIG_PCI_IOV=y
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sound.cfg +1 -0
index 399c77d..d3419ef 100644
@@ -2,6 +2,7 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SEQUENCER=y
 CONFIG_SND_SEQ_DUMMY=y
+CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=y
 CONFIG_SND_PCM_OSS=y
 CONFIG_SND_SEQUENCER_OSS=y
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 arm-bsp: Fix FVP kernel warning

In reply to Jon Mason

ARM_TIMER_SP804 config entry is not being found. Add COMPILE_TEST to allow for it to show up.

Change-Id Ie10dc80dfe32334549680d7154c5c62fee9ef492
---
 .../arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg      | 1 +
 1 file changed, 1 insertion(+)
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg +1 -0
index 144977f..b33c65c 100644
@@ -1,3 +1,4 @@
 # Dual timer module
+CONFIG_COMPILE_TEST=y
 CONFIG_ARM_TIMER_SP804=y
 CONFIG_CLK_SP810=y
Signature · 1 line
2.17.1
#3 lore raw
In reply to Jon Mason
Quoted 5 lines · Jon Mason

Keeping with what is being done on the master branch, switch to using linux-yocto for the 5.3 kernel.

Change-Id Ic327c6ea6e22d6fc0dd41dfb30755c677e5defff

Series added to dunfell branch

Quoted 74 lines
---
 meta-arm-bsp/conf/layer.conf                      |  2 +-
 meta-arm-bsp/conf/machine/a5ds.conf               |  5 +++--
 .../recipes-kernel/linux/linux-stable_%.bbappend  |  3 ---
 .../recipes-kernel/linux/linux-yocto_5.3.bb       | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb
meta-arm-bsp/conf/layer.conf +1 -1
index 0b6985c..1a54ddc 100644
@@ -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 openembedded-layer meta-arm meta-kernel"
+LAYERDEPENDS_meta-arm-bsp = "core openembedded-layer meta-arm"
 LAYERSERIES_COMPAT_meta-arm-bsp = "warrior zeus dunfell"
meta-arm-bsp/conf/machine/a5ds.conf +3 -2
index e7180e9..331d298 100644
@@ -6,9 +6,10 @@
 
 require conf/machine/include/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
-PREFERRED_VERSION_linux-stable ?= "5.3%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
+KCONFIG_MODE = "--alldefconfig"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
meta-arm-bsp/recipes-kernel/linux/linux-stable_%.bbappend deleted +0 -3
deleted file mode 100644
index db850ea..0000000
@@ -1,3 +0,0 @@
-# Add support for Arm Platforms (boards or simulators)
-
-require linux-arm-platforms.inc
meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.3.bb new file +15 -0
new file mode 100644
index 0000000..9d5e9ce
@@ -0,0 +1,15 @@
+KBRANCH = "v5.3/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+SRCREV_machine = "d4f3318ed8fab6316cb7a269b8f42306632a3876"
+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"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+KMETA = "kernel-meta"
Signature · 1 line
2.17.1