diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-12 14:59:11 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-20 21:56:21 +0100 |
commit | c775e7ff3a94e336eafa00bd3f84cecbbe1d7abd (patch) | |
tree | 8c437c3f913a21a549a7f0c817de74642731aa11 | |
parent | 5d412e616cc9250da84c7ac118d78703f6002560 (diff) | |
download | meta-raspberrypi-c775e7ff3a94e336eafa00bd3f84cecbbe1d7abd.tar.gz |
raspberrypi4-64.conf: Uboot configuration and drop armstub
We drop armstub configuration because the new firmware includes them.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r-- | conf/machine/raspberrypi4-64.conf | 10 |
1 files 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 = " \ | |||
19 | SDIMG_KERNELIMAGE ?= "kernel8.img" | 19 | SDIMG_KERNELIMAGE ?= "kernel8.img" |
20 | SERIAL_CONSOLES ?= "115200;ttyS0" | 20 | SERIAL_CONSOLES ?= "115200;ttyS0" |
21 | 21 | ||
22 | MACHINE_FEATURES_append = " armstub vc4graphics" | 22 | UBOOT_MACHINE = "rpi_4_config" |
23 | MACHINE_FEATURES_append = " vc4graphics" | ||
24 | |||
23 | VC4DTBO ?= "vc4-fkms-v3d" | 25 | VC4DTBO ?= "vc4-fkms-v3d" |
24 | ARMSTUB ?= "armstub8-gic.bin" | ||
25 | 26 | ||
27 | # When u-boot is enabled we need to use the "Image" format and the "booti" | ||
28 | # command to load the kernel | ||
29 | KERNEL_IMAGETYPE_UBOOT ?= "Image" | ||
30 | # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet | ||
26 | KERNEL_IMAGETYPE_DIRECT ?= "Image" | 31 | KERNEL_IMAGETYPE_DIRECT ?= "Image" |
32 | KERNEL_BOOTCMD ?= "booti" | ||
27 | 33 | ||
28 | RPI_EXTRA_CONFIG ?= "\n# RPi4 64bit has some limitation - see https://github.com/raspberrypi/linux/commit/cdb78ce891f6c6367a69c0a46b5779a58164bd4b\ntotal_mem=1024\narm_64bit=1" | 34 | RPI_EXTRA_CONFIG ?= "\n# RPi4 64bit has some limitation - see https://github.com/raspberrypi/linux/commit/cdb78ce891f6c6367a69c0a46b5779a58164bd4b\ntotal_mem=1024\narm_64bit=1" |