From 25e649f67ee61067f8e5dffeacc5d3a1c371f514 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 26 Oct 2021 14:25:22 -0400 Subject: linux-yocto/5.14: common-pc: enable CONFIG_ATA_PIIX as built-in Jacob Kroon reported that generic/custom x86 kernels would no longer boot out of the box since the IDE options were removed and the PATA migration happened. To re-enable that use case, we grab the following kernel configuration change: common-pc*/qemux86*: set CONFIG_ATA_PIIX as built-in Since the IDE options were made obselete in the kernel, and the PATA driver is the replacement, we haven't had one of the commonly used qemu boot devices enabled in our kernel by default. We change CONFIG_ATA_PIIX to built-in, to re-enable use cases that boot from default qemu 'hardware'. Signed-off-by: Bruce Ashfield Reported-by: Jacob Kroon (From OE-Core rev: 32f484d445eedadb9d1f2428398a4ec64ac7e4eb) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 341707513a7c3cfcd797f6631b8daf09ddf5bae8) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.14.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb index 245ea46ceb..3d53a32d40 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "cddeec4e197612a11f5a3d746a15825c66040830" -SRCREV_meta ?= "6f8d397886b014e8c7ef4ffb08a489fd7b6a0a3f" +SRCREV_meta ?= "dc308bdf001acd203ed912852bafbf779696d507" 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.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb index c98a5fa428..0683912eb2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine:qemuarm ?= "ace292aaba53e26d1888bebda95bbadfd417c2a5" SRCREV_machine ?= "ca50fa43acc878c2590a7f5cb93aef0ba17591aa" -SRCREV_meta ?= "6f8d397886b014e8c7ef4ffb08a489fd7b6a0a3f" +SRCREV_meta ?= "dc308bdf001acd203ed912852bafbf779696d507" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.14.bb index fe7244399a..2d4600746c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "ca50fa43acc878c2590a7f5cb93aef0ba17591aa" SRCREV_machine:qemux86-64 ?= "ca50fa43acc878c2590a7f5cb93aef0ba17591aa" SRCREV_machine:qemumips64 ?= "b8f18794a5a6bb9c6d0190a2006dfbd82f0f5916" SRCREV_machine ?= "ca50fa43acc878c2590a7f5cb93aef0ba17591aa" -SRCREV_meta ?= "6f8d397886b014e8c7ef4ffb08a489fd7b6a0a3f" +SRCREV_meta ?= "dc308bdf001acd203ed912852bafbf779696d507" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf