From a4a8ce9af45b8d5aec184cf7bcc57ac856552090 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 21 Jan 2021 10:46:21 +0000 Subject: [PATCH] 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 --- conf/machine/raspberrypi3-64.conf | 2 +- 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 = " \ SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_3_config" +UBOOT_MACHINE = "rpi_arm64_config" # When u-boot is enabled we need to use the "Image" format and the "booti" # 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 = " \ SDIMG_KERNELIMAGE ?= "kernel8.img" SERIAL_CONSOLES ?= "115200;ttyS0" -UBOOT_MACHINE = "rpi_4_config" +UBOOT_MACHINE = "rpi_arm64_config" VC4DTBO ?= "vc4-fkms-v3d"