summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-yocto-bsp/conf')
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.conf7
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc2
2 files changed, 5 insertions, 4 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 06a49f45f7..459c83f5c2 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -20,10 +20,11 @@ do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do
20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" 20SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
21 21
22PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 22PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
23PREFERRED_VERSION_linux-yocto ?= "6.1%" 23PREFERRED_VERSION_linux-yocto ?= "6.6%"
24 24
25KERNEL_IMAGETYPE = "zImage" 25KERNEL_IMAGETYPE = "zImage"
26KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" 26DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
27KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}'
27 28
28PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" 29PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
29 30
@@ -33,7 +34,7 @@ UBOOT_MACHINE = "am335x_evm_defconfig"
33 34
34MACHINE_FEATURES = "usbgadget usbhost vfat alsa" 35MACHINE_FEATURES = "usbgadget usbhost vfat alsa"
35 36
36IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}" 37IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}"
37 38
38# support runqemu 39# support runqemu
39EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" 40EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 24d427a360..50a233dd8f 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
2require conf/machine/include/x86/qemuboot-x86.inc 2require conf/machine/include/x86/qemuboot-x86.inc
3MACHINE_FEATURES += "wifi efi pcbios" 3MACHINE_FEATURES += "wifi efi pcbios"
4 4
5PREFERRED_VERSION_linux-yocto ?= "6.1%" 5PREFERRED_VERSION_linux-yocto ?= "6.6%"
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
8XSERVER ?= "${XSERVER_X86_BASE} \ 8XSERVER ?= "${XSERVER_X86_BASE} \