From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta-yocto-bsp/conf/layer.conf | 2 +- poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 5 +++-- poky/meta-yocto-bsp/conf/machine/edgerouter.conf | 4 ++-- poky/meta-yocto-bsp/conf/machine/genericx86-64.conf | 5 ++--- poky/meta-yocto-bsp/conf/machine/genericx86.conf | 5 ++--- poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 5 +++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'poky/meta-yocto-bsp/conf') diff --git a/poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf index 53e8722e81..3c8f775bc4 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 = "thud" +LAYERSERIES_COMPAT_yoctobsp = "warrior" diff --git a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index e911e75004..70d3cfea3d 100644 --- a/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -20,10 +20,11 @@ WKS_FILE ?= "beaglebone-yocto.wks" IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -SERIAL_CONSOLES = "115200;ttyO0" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" 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 b7a94e9cbb..88592dbc85 100644 --- a/poky/meta-yocto-bsp/conf/machine/edgerouter.conf +++ b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Edgerouter -#@DESCRIPTION: Edgerouter +#@DESCRIPTION: Machine configuration for a generic edgerouter require conf/machine/include/tune-mips64.inc @@ -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 ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" 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 12f7c0d200..c489462dca 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf @@ -1,7 +1,6 @@ #@TYPE: Machine -#@NAME: Generic X86_64. - -#@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. +#@NAME: Generic x86_64 +#@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 diff --git a/poky/meta-yocto-bsp/conf/machine/genericx86.conf b/poky/meta-yocto-bsp/conf/machine/genericx86.conf index 798b62ec2b..9929d2788a 100644 --- a/poky/meta-yocto-bsp/conf/machine/genericx86.conf +++ b/poky/meta-yocto-bsp/conf/machine/genericx86.conf @@ -1,7 +1,6 @@ #@TYPE: Machine -#@NAME: Generic X86. - -#@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. +#@NAME: Generic x86 +#@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 diff --git a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf index 6f5b9859d7..e2dce56738 100644 --- a/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +++ b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf @@ -1,5 +1,6 @@ #@TYPE: Machine -#@DESCRIPTION: Machine configuration for running +#@NAME: Freescale MPC8315E-RDB +#@DESCRIPTION: Machine configuration for Freescale MPC8315E-RDB TARGET_FPU = "" @@ -14,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "4.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -- cgit v1.2.3