summaryrefslogtreecommitdiff
path: root/meta-raspberrypi/conf/machine/raspberrypi4-64.conf
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-02-13 00:30:38 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-02-25 23:15:06 +0300
commit1110521700bbfe9ffd32338fed19492114e8bbd4 (patch)
tree221c6e94762edafee7d048ee338048f1b72cbf61 /meta-raspberrypi/conf/machine/raspberrypi4-64.conf
parentaaf90cd0e100b42993db670cf30b21cfa48be72a (diff)
downloadopenbmc-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/raspberrypi4-64.conf')
-rw-r--r--meta-raspberrypi/conf/machine/raspberrypi4-64.conf6
1 files changed, 3 insertions, 3 deletions
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"