diff options
Diffstat (limited to 'poky/meta-yocto-bsp/conf/machine')
| -rw-r--r-- | poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 | ||||
| -rw-r--r-- | poky/meta-yocto-bsp/conf/machine/edgerouter.conf | 2 | ||||
| -rw-r--r-- | poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index b7defb0d0..f8368ebd0 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" @@ -38,7 +38,7 @@ UBOOT_LOADADDRESS = "0x80008000" MACHINE_FEATURES = "usbgadget usbhost vfat alsa" -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" # support runqemu EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index 75bc5e5f2..fbe33be9d 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto ?= "5.10%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index a6c396c79..1de069011 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -2,6 +2,7 @@ include conf/machine/include/x86-base.inc require conf/machine/include/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" +PREFERRED_VERSION_linux-yocto ?= "5.10%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ |