diff options
| -rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 | ||||
| -rw-r--r-- | meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 50a233dd8f..943604c01c 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
| @@ -2,7 +2,7 @@ include conf/machine/include/x86/x86-base.inc | |||
| 2 | require conf/machine/include/x86/qemuboot-x86.inc | 2 | require conf/machine/include/x86/qemuboot-x86.inc |
| 3 | MACHINE_FEATURES += "wifi efi pcbios" | 3 | MACHINE_FEATURES += "wifi efi pcbios" |
| 4 | 4 | ||
| 5 | PREFERRED_VERSION_linux-yocto ?= "6.6%" | 5 | PREFERRED_VERSION_linux-yocto ?= "6.12%" |
| 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 8 | XSERVER ?= "${XSERVER_X86_BASE} \ | 8 | XSERVER ?= "${XSERVER_X86_BASE} \ |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend index 768f100067..b47b3aa5a9 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_6.12.bbappend | |||
| @@ -1,7 +1,11 @@ | |||
| 1 | COMPATIBLE_MACHINE:genericarm64 = "genericarm64" | 1 | COMPATIBLE_MACHINE:genericarm64 = "genericarm64" |
| 2 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" | 2 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" |
| 3 | COMPATIBLE_MACHINE:genericx86 = "genericx86" | ||
| 4 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" | ||
| 3 | 5 | ||
| 4 | KMACHINE:beaglebone-yocto ?= "beaglebone" | 6 | KMACHINE:beaglebone-yocto ?= "beaglebone" |
| 7 | KMACHINE:genericx86 ?= "common-pc" | ||
| 8 | KMACHINE:genericx86-64 ?= "common-pc-64" | ||
| 5 | 9 | ||
| 6 | # Incorporate fixes post 6.12.3 | 10 | # Incorporate fixes post 6.12.3 |
| 7 | SRCREV_meta:genericarm64 = "9ee4baec963b10d213c060622fce6d2b34166f40" | 11 | SRCREV_meta:genericarm64 = "9ee4baec963b10d213c060622fce6d2b34166f40" |
