aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/conf/machine/raspberrypi4.conf
diff options
context:
space:
mode:
authorLeon Anavi <leon.anavi@konsulko.com>2019-11-07 18:26:02 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-11-19 16:32:44 +0000
commitc37da2ad069781d74eef51f6a760332b47632b17 (patch)
treee570c0aa266d4d05fea8c9b2be9388b6ba935a24 /meta-agl-bsp/conf/machine/raspberrypi4.conf
parent2ed82aa378099d18db268c146d9a53756c5f2890 (diff)
conf/machine/raspberrypi4: Switch to 64-bit
Switch from 32-bit to 64-bit AGL image for Raspberry Pi 4. Machine configuration has been modified according to the existing configurations from meta-raspberrypi branches master and zeus. When AGL moves to a newer release of the Yocto project and the BSP these configurations can be removed from meta-agl. Bug-AGL: SPEC-2936 Change-Id: Iddc3f75be179797e7d56f6806ec6ba52b080d766 Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Diffstat (limited to 'meta-agl-bsp/conf/machine/raspberrypi4.conf')
-rw-r--r--meta-agl-bsp/conf/machine/raspberrypi4.conf36
1 files changed, 23 insertions, 13 deletions
diff --git a/meta-agl-bsp/conf/machine/raspberrypi4.conf b/meta-agl-bsp/conf/machine/raspberrypi4.conf
index 2f759286f..1679fb500 100644
--- a/meta-agl-bsp/conf/machine/raspberrypi4.conf
+++ b/meta-agl-bsp/conf/machine/raspberrypi4.conf
@@ -1,26 +1,36 @@
#@TYPE: Machine
-#@NAME: RaspberryPi 4 Development Board (32bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode
+#@NAME: RaspberryPi 4 Development Board (64bit)
+#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode
-DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
-require conf/machine/include/tune-cortexa7.inc
-include conf/machine/include/rpi-base.inc
+MACHINEOVERRIDES = "raspberrypi4:${MACHINE}"
MACHINE_EXTRA_RRECOMMENDS += "\
linux-firmware-rpidistro-bcm43455 \
bluez-firmware-rpidistro-bcm4345c0-hcd \
- pi-bluetooth \
"
-# 'l' stands for LPAE
-SDIMG_KERNELIMAGE ?= "kernel7l.img"
-UBOOT_MACHINE = "rpi_4_32b_config"
+require conf/machine/include/arm/arch-arm64.inc
+include conf/machine/include/rpi4-base.inc
+
+RPI_KERNEL_DEVICETREE = " \
+ broadcom/bcm2711-rpi-4-b.dtb \
+"
+
+SDIMG_KERNELIMAGE ?= "kernel8.img"
SERIAL_CONSOLES ?= "115200;ttyS0"
MACHINE_FEATURES_append = " vc4graphics"
+UBOOT_MACHINE = "rpi_4_config"
+
VC4DTBO ?= "vc4-fkms-v3d"
-RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi4 = "overlays/lirc-rpi.dtbo"
-RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi4 = " overlays/mcp2515-can0.dtbo overlays/vc4-fkms-v3d.dtbo"
-RPI_KERNEL_DEVICETREE_remove_raspberrypi4 = "bcm2708-rpi-0-w.dtb"
-RPI_KERNEL_DEVICETREE_append_raspberrypi4 = " bcm2708-rpi-zero-w.dtb bcm2711-rpi-4-b.dtb"
+# When u-boot is enabled we need to use the "Image" format and the "booti"
+# command to load the kernel
+KERNEL_IMAGETYPE_UBOOT ?= "Image"
+# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
+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"