In message: [linux-yocto][yocto-kernel-cache][master && yocto-6.1][PATCH 1/2] intel-x86: correct KARCH option for intel-x86 bsp on 26/02/2024 Liwei Song wrote:
> Adjust KARCH to x86_64 and i386 accordingly to avoid condition > check failed in some scc files like features/thermal/coretemp.scc > This will ensure some kernel options be correcly set for intel-x86 > bsp. I was going to point out that KARCH doesn't actively do anything and is only a variable used within the fragments .. and then I re-read your description and see that it is being used in that way. I've merged this to 6.1, 6.6 and master. Bruce > > Signed-off-by: Liwei Song <[email protected]> > --- > bsp/intel-x86/intel-x86-32-preempt-rt.scc | 2 +- > bsp/intel-x86/intel-x86-32-standard.scc | 2 +- > bsp/intel-x86/intel-x86-32-tiny.scc | 2 +- > bsp/intel-x86/intel-x86-64-preempt-rt.scc | 2 +- > bsp/intel-x86/intel-x86-64-standard.scc | 2 +- > bsp/intel-x86/intel-x86-64-tiny.scc | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/bsp/intel-x86/intel-x86-32-preempt-rt.scc > b/bsp/intel-x86/intel-x86-32-preempt-rt.scc > index 1f21f316f088..34f76ad7b5e4 100644 > --- a/bsp/intel-x86/intel-x86-32-preempt-rt.scc > +++ b/bsp/intel-x86/intel-x86-32-preempt-rt.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-32 > define KTYPE preempt-rt > -define KARCH x86 > +define KARCH i386 > > include ktypes/preempt-rt > branch x86 > diff --git a/bsp/intel-x86/intel-x86-32-standard.scc > b/bsp/intel-x86/intel-x86-32-standard.scc > index 472b070c7420..4b038ac073f1 100644 > --- a/bsp/intel-x86/intel-x86-32-standard.scc > +++ b/bsp/intel-x86/intel-x86-32-standard.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-32 > define KTYPE standard > -define KARCH x86 > +define KARCH i386 > > include ktypes/standard > branch x86 > diff --git a/bsp/intel-x86/intel-x86-32-tiny.scc > b/bsp/intel-x86/intel-x86-32-tiny.scc > index 58b1c75c083e..2263c27f40b1 100644 > --- a/bsp/intel-x86/intel-x86-32-tiny.scc > +++ b/bsp/intel-x86/intel-x86-32-tiny.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-32 > define KTYPE tiny > -define KARCH x86 > +define KARCH i386 > > include ktypes/tiny/tiny.scc > branch x86 > diff --git a/bsp/intel-x86/intel-x86-64-preempt-rt.scc > b/bsp/intel-x86/intel-x86-64-preempt-rt.scc > index 197b50645627..63d517ec19d1 100644 > --- a/bsp/intel-x86/intel-x86-64-preempt-rt.scc > +++ b/bsp/intel-x86/intel-x86-64-preempt-rt.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-64 > define KTYPE preempt-rt > -define KARCH x86 > +define KARCH x86_64 > > include ktypes/preempt-rt > > diff --git a/bsp/intel-x86/intel-x86-64-standard.scc > b/bsp/intel-x86/intel-x86-64-standard.scc > index c366dab34399..ba29fa80238c 100644 > --- a/bsp/intel-x86/intel-x86-64-standard.scc > +++ b/bsp/intel-x86/intel-x86-64-standard.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-64 > define KTYPE standard > -define KARCH x86 > +define KARCH x86_64 > > include ktypes/standard > include features/transparent-hugepage/transparent-hugepage.scc > diff --git a/bsp/intel-x86/intel-x86-64-tiny.scc > b/bsp/intel-x86/intel-x86-64-tiny.scc > index 798c4a1fdea6..5eaa689cb44a 100644 > --- a/bsp/intel-x86/intel-x86-64-tiny.scc > +++ b/bsp/intel-x86/intel-x86-64-tiny.scc > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: MIT > define KMACHINE intel-x86-64 > define KTYPE tiny > -define KARCH x86 > +define KARCH x86_64 > > include ktypes/tiny/tiny.scc > > -- > 2.40.0 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13614): https://lists.yoctoproject.org/g/linux-yocto/message/13614 Mute This Topic: https://lists.yoctoproject.org/mt/104578498/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
