linux-yocto/qemuarmv5: fix configuration warning

Integrating the following commit(s) to linux-yocto:

    8c8f6a791be qemuarm: inhibit optimize for size

To fix the following warning:

    [NOTE]: 'CONFIG_CC_OPTIMIZE_FOR_SIZE' last val (y) and .config val (n) do not match
    [INFO]: CONFIG_CC_OPTIMIZE_FOR_SIZE : n ## .config: 159 :configs/v5.10/standard/ktypes/standard/standard.cfg (n) configs/v5.10/standard/arch/arm/arm.cfg (y)
    [INFO]: raw config text:
            config CC_OPTIMIZE_FOR_SIZE
        	    bool "Optimize for size (-Os)"
        	    depends on <choice>
        	    help
        	      Choosing this option will pass "-Os" to your compiler resulting
        	      in a smaller kernel.
            Config 'CC_OPTIMIZE_FOR_SIZE' has the following Direct dependencies (CC_OPTIMIZE_FOR_SIZE=y):
                    <choice>
            Parent dependencies are:
                 choice [y]

We explicitly enable optimize_for_performance in this BSP, but the
arch default is optimize_for_size. These are choice options in the
kernel, so they both can't be enabled.

Unless we tell the audit that we don't want optimize_for_size, it
will notice that fact, and warn that it is not set in the final .config.

[YOCTO #14285]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 10414a3ea380a1b107e73f1b85af2aad4d403815..4a4aa2b9d4c80d47eba090a92c4d3397103cc548 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "36889a571fe57fe3561cc23f842b92e4ea9ca264"
-SRCREV_meta ?= "544eb6300c29e7f35551927d63b557f3532f46bf"
+SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
 
 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.10;destsuffix=${KMETA}"

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 6f98e3b54678a07a8ef7f953e54746d9dc91453f..8bb1037476c4d8725eadc148f9152ad98e3e0dbf 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "9d6d37cfe365ebd5b530f9c43c1ace924343bb15"
 SRCREV_machine ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
-SRCREV_meta ?= "544eb6300c29e7f35551927d63b557f3532f46bf"
+SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 

diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 23fe33401638b7e0411327c123432ae138498123..03d7c6a3de51f49a153e0dac2b58d3db3c2177c7 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
 SRCREV_machine_qemux86-64 ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
 SRCREV_machine_qemumips64 ?= "f1c01716513524065f0f231c6e6502cd9a3ecb53"
 SRCREV_machine ?= "8c516ced69f41563404ada0bea315a55bcf1df6f"
-SRCREV_meta ?= "544eb6300c29e7f35551927d63b557f3532f46bf"
+SRCREV_meta ?= "8c8f6a791bed6e8f675236946e805a7fc489e382"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"