From c775e7ff3a94e336eafa00bd3f84cecbbe1d7abd Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 12 Jul 2019 14:59:11 +0100 Subject: raspberrypi4-64.conf: Uboot configuration and drop armstub We drop armstub configuration because the new firmware includes them. Signed-off-by: Andrei Gherzan --- conf/machine/raspberrypi4-64.conf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index ea1f6c2..36509a9 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf @@ -19,10 +19,16 @@ RPI_KERNEL_DEVICETREE = " \ SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" -MACHINE_FEATURES_append = " armstub vc4graphics" +UBOOT_MACHINE = "rpi_4_config" +MACHINE_FEATURES_append = " vc4graphics" + VC4DTBO ?= "vc4-fkms-v3d" -ARMSTUB ?= "armstub8-gic.bin" +# 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# RPi4 64bit has some limitation - see https://github.com/raspberrypi/linux/commit/cdb78ce891f6c6367a69c0a46b5779a58164bd4b\ntotal_mem=1024\narm_64bit=1" -- cgit v1.2.3-54-g00ecf