diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-05-11 19:32:45 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-12 23:50:18 +0000 |
| commit | 9ebcdd9ea2144c7112accd9b2a1a56ae7fea4449 (patch) | |
| tree | a47c6b4c974cc2f3c59ed176af66bf0752b274f4 /meta-agl-bsp/conf/machine/raspberrypi4.conf | |
| parent | 4ee8c933aa9726f0493ead14b4e1c97a0844ec28 (diff) | |
Update Raspberry Pi (3/4) templates to match meta-raspberrypi configuration
Update the templates to use the updated flags and configuration present in
meta-raspberrypi.
The previous template did not properly pull-in the u-boot fragments for the RPI4.
v4: the MACHINE in the AGL template for the RPI4 is now
'raspberrypi4-64' as in upstream.
CI will get support-patches through releng-scripts.
Bug-AGL: SPEC-3368
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: Ia2acb54516464d433c64adfc7ba832ccfdf899c3
Diffstat (limited to 'meta-agl-bsp/conf/machine/raspberrypi4.conf')
| -rw-r--r-- | meta-agl-bsp/conf/machine/raspberrypi4.conf | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-agl-bsp/conf/machine/raspberrypi4.conf b/meta-agl-bsp/conf/machine/raspberrypi4.conf deleted file mode 100644 index a09d881df..000000000 --- a/meta-agl-bsp/conf/machine/raspberrypi4.conf +++ /dev/null @@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: RaspberryPi 4 Development Board (64bit) -#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode - -MACHINEOVERRIDES = "raspberrypi4:${MACHINE}" - -MACHINE_EXTRA_RRECOMMENDS += "\ - linux-firmware-rpidistro-bcm43455 \ - bluez-firmware-rpidistro-bcm4345c0-hcd \ - pi-bluetooth \ -" - -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" - -# 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" |