diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
| commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
| tree | 8019999b0ca042482e5193d6cabc06220c71d776 /poky/meta-yocto-bsp/conf | |
| parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
| parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
| download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz | |
Update
Diffstat (limited to 'poky/meta-yocto-bsp/conf')
6 files changed, 13 insertions, 13 deletions
diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index caf3e4bcb..3053a5ef6 100644 --- a/poky/meta-yocto-bsp/conf/layer.conf +++ b/poky/meta-yocto-bsp/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" LAYERVERSION_yoctobsp = "4" -LAYERSERIES_COMPAT_yoctobsp = "hardknott" +LAYERSERIES_COMPAT_yoctobsp = "honister" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index 04cbd3b5b..618af4030 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -12,19 +12,19 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" EXTRA_IMAGEDEPENDS += "virtual/bootloader" DEFAULTTUNE ?= "cortexa8hf-neon" -include conf/machine/include/tune-cortexa8.inc +include conf/machine/include/arm/armv7a/tune-cortexa8.inc IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" -EXTRA_IMAGECMD_jffs2 = "-lnp " +EXTRA_IMAGECMD:jffs2 = "-lnp " WKS_FILE ?= "beaglebone-yocto.wks" -IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" +IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "5.10%" +PREFERRED_VERSION_linux-yocto ?= "5.13%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" diff --git a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf index fbe33be9d..9c95f4632 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -2,7 +2,7 @@ #@NAME: Edgerouter #@DESCRIPTION: Machine configuration for a generic edgerouter -require conf/machine/include/tune-mips64.inc +require conf/machine/include/mips/tune-mips64.inc MACHINE_FEATURES = "pci ext2 ext3 serial" @@ -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.10%" +PREFERRED_VERSION_linux-yocto ?= "5.13%" SERIAL_CONSOLES = "115200;ttyS0" USE_VT ?= "0" diff --git a/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf index 81ec24e97..14913ea1f 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for generic x86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-64" -require conf/machine/include/tune-core2.inc +require conf/machine/include/x86/tune-core2.inc require conf/machine/include/genericx86-common.inc SERIAL_CONSOLES_CHECK = "ttyS0" diff --git a/poky/meta-yocto-bsp/conf/machine/genericx86.conf b/poky/meta-yocto-bsp/conf/machine/genericx86.conf index 1387bde85..ed4fc8a3d 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for generic x86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. DEFAULTTUNE ?= "core2-32" -require conf/machine/include/tune-core2.inc +require conf/machine/include/x86/tune-core2.inc require conf/machine/include/genericx86-common.inc MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" 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 1de069011..adc8ca879 100644 --- a/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc @@ -1,8 +1,8 @@ -include conf/machine/include/x86-base.inc -require conf/machine/include/qemuboot-x86.inc +include conf/machine/include/x86/x86-base.inc +require conf/machine/include/x86/qemuboot-x86.inc MACHINE_FEATURES += "wifi efi pcbios" -PREFERRED_VERSION_linux-yocto ?= "5.10%" +PREFERRED_VERSION_linux-yocto ?= "5.13%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "${XSERVER_X86_BASE} \ @@ -18,7 +18,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" GLIBC_ADDONS = "nptl" -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= "genericx86.wks.in" |