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 --- meta-raspberrypi/conf/machine/include/rpi-base.inc | 2 +- meta-raspberrypi/conf/machine/include/rpi-default-versions.inc | 2 +- meta-raspberrypi/conf/machine/raspberrypi3-64.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-raspberrypi/conf/machine') diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 4bbd576b9..cc6a54ecf 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -25,7 +25,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/i2c-rtc.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ - overlays/lirc-rpi.dtbo \ + overlays/mcp2515-can0.dtbo \ overlays/pi3-disable-bt.dtbo \ overlays/pi3-miniuart-bt.dtbo \ overlays/pitft22.dtbo \ diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index a5fe6d707..9983b61a6 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "4.14.%" +PREFERRED_VERSION_linux-raspberrypi ??= "4.19.%" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 635e4f67f..80b6bc463 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -11,7 +11,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ bluez-firmware-rpidistro-bcm4345c0-hcd \ " -require conf/machine/include/arm/arch-armv8.inc +require conf/machine/include/tune-cortexa53.inc include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ -- cgit v1.2.1