summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-12-22 09:28:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-24 08:21:23 +0000
commit1778e9ecb4edb43c0239dfb6b168c4b26f9c3e58 (patch)
tree7bc929854cdb8d37d494429ea8bb357ecae3778c /meta/recipes-kernel
parent82a6c9742988821d40e91492b55c7d2b3324a49d (diff)
downloadpoky-1778e9ecb4edb43c0239dfb6b168c4b26f9c3e58.tar.gz
linux-yocto/5.4/cfg: fix -tiny warnings
Integrating the following commit(s) to fixup warnings when -tiny is build with the latest kern-tools: b721178c41a drm: change CONFIG_DRM_KMS_HELPER to =m d9ac6174eaf tiny: enable CONFIG_FW_LOADER on a per-BSP basis a135c720bc7 i915: adust helper to 'm' (From OE-Core rev: 9227facf178e7bc56cce2522cd63ffd18dd900aa) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 3754abbc66..f35de787e1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "7bc8ae3fc04fdc06192d39d725cb18d4c0b78d9f" 14SRCREV_machine ?= "7bc8ae3fc04fdc06192d39d725cb18d4c0b78d9f"
15SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" 15SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index b06db10f9f..2c7ce3621f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "2b6db4fbe53a1986c0249bc663d8ce7d99cbf19c" 18SRCREV_machine_qemuarm ?= "2b6db4fbe53a1986c0249bc663d8ce7d99cbf19c"
19SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" 19SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1"
20SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" 20SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 21935ac171..475efbfc93 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1"
21SRCREV_machine_qemux86-64 ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" 21SRCREV_machine_qemux86-64 ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1"
22SRCREV_machine_qemumips64 ?= "75c7340de480587c3a6650b46be7b1a2f71501a9" 22SRCREV_machine_qemumips64 ?= "75c7340de480587c3a6650b46be7b1a2f71501a9"
23SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" 23SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1"
24SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" 24SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9"
25 25
26# remap qemuarm to qemuarma15 for the 5.4 kernel 26# remap qemuarm to qemuarma15 for the 5.4 kernel
27# KMACHINE_qemuarm ?= "qemuarma15" 27# KMACHINE_qemuarm ?= "qemuarma15"