diff options
| author | Paul Barker <pbarker@konsulko.com> | 2021-01-21 10:46:21 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2021-01-21 21:09:49 +0000 |
| commit | a4a8ce9af45b8d5aec184cf7bcc57ac856552090 (patch) | |
| tree | fc2107c6d36cf011b33a0c4f83c6bf556abe8f38 | |
| parent | 9165aa52b601e50c5cd58aa73c1ed329eb031fcb (diff) | |
| download | meta-raspberrypi-a4a8ce9af45b8d5aec184cf7bcc57ac856552090.tar.gz | |
conf: Use unified u-boot config for 64-bit targets
The rpi_arm64 configuration supports both Raspberry Pi 3 & 4 in 64-bit
mode. Switching to this config is a small step towards supporting a
unified build for these targets.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
| -rw-r--r-- | conf/machine/raspberrypi3-64.conf | 2 | ||||
| -rw-r--r-- | conf/machine/raspberrypi4-64.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 65e3302..0c6526a 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf | |||
| @@ -22,7 +22,7 @@ RPI_KERNEL_DEVICETREE = " \ | |||
| 22 | 22 | ||
| 23 | SERIAL_CONSOLES ?= "115200;ttyS0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 24 | 24 | ||
| 25 | UBOOT_MACHINE = "rpi_3_config" | 25 | UBOOT_MACHINE = "rpi_arm64_config" |
| 26 | 26 | ||
| 27 | # When u-boot is enabled we need to use the "Image" format and the "booti" | 27 | # When u-boot is enabled we need to use the "Image" format and the "booti" |
| 28 | # command to load the kernel | 28 | # command to load the kernel |
diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index b4d442e..7c9792c 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf | |||
| @@ -20,7 +20,7 @@ RPI_KERNEL_DEVICETREE = " \ | |||
| 20 | SDIMG_KERNELIMAGE ?= "kernel8.img" | 20 | SDIMG_KERNELIMAGE ?= "kernel8.img" |
| 21 | SERIAL_CONSOLES ?= "115200;ttyS0" | 21 | SERIAL_CONSOLES ?= "115200;ttyS0" |
| 22 | 22 | ||
| 23 | UBOOT_MACHINE = "rpi_4_config" | 23 | UBOOT_MACHINE = "rpi_arm64_config" |
| 24 | 24 | ||
| 25 | VC4DTBO ?= "vc4-fkms-v3d" | 25 | VC4DTBO ?= "vc4-fkms-v3d" |
| 26 | 26 | ||