From 5d59ec7e23513a3a7f86280a2610ba3d2123f9a1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 24 Jul 2020 16:09:26 -0500 Subject: meta-raspberrypi: subtree update:0d398a3b71..e2c1992955 Christopher Clark (1): rpi-base: add SERIAL_CONSOLES_CHECK to default to SERIAL_CONSOLES Khem Raj (1): userland: Update to 2020-06-24 top commit Pierre-Jean Texier (2): linux-raspberrypi: bump to Linux version 5.4.51 raspberrypi-firmware: update to current HEAD colin (3): conf/machine/include/rpi-base.inc: Added can1 interface to bsp rpi-config_git: Added ENABLE_DUAL_CAN build configuration docs: Added documentation for Pican2 Duo support Signed-off-by: Andrew Geissler Change-Id: I5e0c26ab7cabb4c931cbfef190b5b4b3ce257fdf --- meta-raspberrypi/conf/machine/include/rpi-base.inc | 2 ++ 1 file changed, 2 insertions(+) (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 044f09df2..5f9a1e310 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -28,6 +28,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/iqaudio-dacplus.dtbo \ overlays/miniuart-bt.dtbo \ overlays/mcp2515-can0.dtbo \ + overlays/mcp2515-can1.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-resistive.dtbo \ overlays/pitft28-capacitive.dtbo \ @@ -82,6 +83,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_IR', '1', 'kernel-module-gpio-ir kernel-module-gpio-ir-tx', '', d)}" +SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" # Set Raspberrypi splash image SPLASH = "psplash-raspberrypi" -- cgit v1.2.3