From 90e5a7a917e4e87bdf23a7a8ea4e2bd28cfdf4cb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Dec 2020 09:28:24 -0500 Subject: 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' Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 9227facf178e7bc56cce2522cd63ffd18dd900aa) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel') 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 () { } SRCREV_machine ?= "7bc8ae3fc04fdc06192d39d725cb18d4c0b78d9f" -SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" +SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" SRCREV_machine_qemuarm ?= "2b6db4fbe53a1986c0249bc663d8ce7d99cbf19c" SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" -SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" +SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemux86-64 ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" SRCREV_machine_qemumips64 ?= "75c7340de480587c3a6650b46be7b1a2f71501a9" SRCREV_machine ?= "21f1b92bddf5f6678f2c28da8d1a8a8160e39cf1" -SRCREV_meta ?= "cd9826707f887241a661ea886cfa19f8d282438c" +SRCREV_meta ?= "b721178c41a2bffd19cc9be9e33af23b7a4affd9" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg