diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:30:38 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 1110521700bbfe9ffd32338fed19492114e8bbd4 (patch) | |
tree | 221c6e94762edafee7d048ee338048f1b72cbf61 /meta-raspberrypi/conf/machine | |
parent | aaf90cd0e100b42993db670cf30b21cfa48be72a (diff) | |
download | openbmc-1110521700bbfe9ffd32338fed19492114e8bbd4.tar.xz |
meta-raspberrypi: subtree update:a7cc636d4e..f5fe02c30c
Aaron Shaw (5):
overlays: reorder in alphabetical order
overlays: add justboom overlays
overlays: add overlay to allow 64 bit usage with CM3
overlays: add overlays for pi 400 and cm4
overlays: add missing device overlays
Aurelian Zanoschi (2):
rpi-config: Add support for CM4 host USB
[documentation]Add USB host support in documentation
Bartłomiej Burdukiewicz (1):
rpi-cmdline: remove unnecessary spaces from cmdline.txt
Christopher Clark (1):
machine: use weak default for kernel and KERNEL_DEVICETREE settings
Jonas Vautherin (1):
linux-raspberrypi: Superfluous 'inherit kernel'
Martin Jansa (6):
rpi-config: fix do_deploy
rpi-config: use CONFIG shell variable
linux-raspberrypi: add recipe for 5.10 version
linux-raspberrypi: update LIC_FILES_CHKSUM in .inc file and drop from 5.10 and dev recipe
rpi-default-versions: Switch default kernel to 5.10
raspberrypi-firmware.inc: upgrade to latest for 5.10.13 kernel
Matt Spencer (1):
linux-raspberrypi: Enable use of 'RPI_EXTRA_CONFIG += ...' in local.conf
Ovidiu Panait (1):
linux-raspberrypi: pass dtc flags via KERNEL_DTC_FLAGS
Paul Barker (5):
conf: Use unified u-boot config for 64-bit targets
raspberrypi4-64: No need to force arm_64bit=1
linux-raspberrypi: Uprev to v5.4.83
linux-raspberrypi: Uprev yocto-kernel-cache
kas-poky-rpi.yml: Make git ignore layers cloned by kas
SCVready (1):
rpi-config: Relocated "start_x=1" in config.txt
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ie1a8cd049694b5f3158b63cedc30c9df24f82120
Diffstat (limited to 'meta-raspberrypi/conf/machine')
5 files changed, 23 insertions, 14 deletions
diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 18368c621..ac945f6a2 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -18,46 +18,54 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/at86rf233.dtbo \ overlays/disable-bt.dtbo \ overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ overlays/gpio-key.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ overlays/hifiberry-digi.dtbo \ + overlays/justboom-both.dtbo \ + overlays/justboom-dac.dtbo \ + overlays/justboom-digi.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ - overlays/miniuart-bt.dtbo \ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ + overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ - overlays/pitft28-resistive.dtbo \ overlays/pitft28-capacitive.dtbo \ + overlays/pitft28-resistive.dtbo \ overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/vc4-kms-v3d.dtbo \ overlays/vc4-fkms-v3d.dtbo \ - overlays/w1-gpio-pullup.dtbo \ + overlays/vc4-kms-v3d.dtbo \ overlays/w1-gpio.dtbo \ - overlays/gpio-ir.dtbo \ - overlays/gpio-ir-tx.dtbo \ - overlays/imx219.dtbo \ + overlays/w1-gpio-pullup.dtbo \ " RPI_KERNEL_DEVICETREE ?= " \ + bcm2708-rpi-zero.dtb \ bcm2708-rpi-zero-w.dtb \ bcm2708-rpi-b.dtb \ + bcm2708-rpi-b-rev1.dtb \ bcm2708-rpi-b-plus.dtb \ bcm2709-rpi-2-b.dtb \ + bcm2710-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ bcm2710-rpi-3-b-plus.dtb \ bcm2711-rpi-4-b.dtb \ + bcm2711-rpi-400.dtb \ bcm2708-rpi-cm.dtb \ bcm2710-rpi-cm3.dtb \ + bcm2711-rpi-cm4.dtb \ " -KERNEL_DEVICETREE ?= " \ +KERNEL_DEVICETREE ??= " \ ${RPI_KERNEL_DEVICETREE} \ ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ " diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc index 181b9364b..c02d24879 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc @@ -1,6 +1,6 @@ # RaspberryPi BSP default providers -PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index e57c702b3..17d5bd6d5 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 ??= "5.4.%" +PREFERRED_VERSION_linux-raspberrypi ??= "5.10.%" diff --git a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 65e3302c3..539413219 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -18,11 +18,12 @@ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2710-rpi-3-b.dtb \ broadcom/bcm2710-rpi-3-b-plus.dtb \ broadcom/bcm2837-rpi-3-b.dtb \ + broadcom/bcm2710-rpi-cm3.dtb \ " SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_3_config" +UBOOT_MACHINE = "rpi_arm64_config" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel diff --git a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf index 633d18801..12c8954d9 100644 --- a/meta-raspberrypi/conf/machine/raspberrypi4-64.conf +++ b/meta-raspberrypi/conf/machine/raspberrypi4-64.conf @@ -15,12 +15,14 @@ include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2711-rpi-4-b.dtb \ + broadcom/bcm2711-rpi-400.dtb \ + broadcom/bcm2711-rpi-cm4.dtb \ " SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_4_config" +UBOOT_MACHINE = "rpi_arm64_config" VC4DTBO ?= "vc4-fkms-v3d" @@ -31,6 +33,4 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" -RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" - ARMSTUB ?= "armstub8-gic.bin" |