From bf689c60caa905eb8866101b9e99dd4ae246a2ca Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 11 Sep 2012 15:04:41 +0000 Subject: linux-yocto/3.4: add x32 configuration fragment When x32 is the tuning for a x86 MACHINE, the kernel should also have CONFIG_X86_X32=y. This adds a x32 fragment that can be used to trigger the right ABI. The commit also contains a check for mx32 in TUNE_FEATURES, and if present, the new fragment will be appended to KERNEL_FEATURES and trigger the support in the kernel. cc: Saul Wold Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 3 ++- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 4fd3845d5e..bbde730f77 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb @@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "a35693b1287c0e50cdca33a1b95af0ff48b43cd0" SRCREV_machine_qemuppc ?= "85a1190530cb5749f5f831670976b163438dc301" -SRCREV_meta ?= "d9d5fc63d8b38705036e946ea77d971d95de11ad" +SRCREV_meta ?= "e0374ce012e7e6fc8e5bb8b957addb0478950898" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}" @@ -27,3 +27,4 @@ KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append = " features/taskstats" KERNEL_FEATURES_append_qemux86 = " cfg/sound" KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 59ad4b27be..f4f23182dd 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "b9a720ca38d298ed457f37d099c85771f9164b19" SRCREV_machine_qemux86 ?= "46d8c757b3be1953f30d6745505d24436e2d6844" SRCREV_machine_qemux86-64 ?= "46d8c757b3be1953f30d6745505d24436e2d6844" SRCREV_machine ?= "46d8c757b3be1953f30d6745505d24436e2d6844" -SRCREV_meta ?= "a82db2f0fc3ceebf3cb47e9dd05e4856ff9966ab" +SRCREV_meta ?= "e0374ce012e7e6fc8e5bb8b957addb0478950898" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" @@ -27,3 +27,4 @@ KERNEL_REVISION_CHECKING="" KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}" -- cgit 1.2.3-korg