From e20e770049d4151473faf08560dfb83e3bfdcf0c Mon Sep 17 00:00:00 2001 From: Matt Spencer Date: Thu, 14 Jan 2021 16:23:13 +0000 Subject: [PATCH] linux-raspberrypi: Enable use of 'RPI_EXTRA_CONFIG += ...' in local.conf Before this patch, use of RPI_EXTRA_CONFIG += in a local.conf would overwrite the needed 'arm_64bit=1' defined in the core recipes. The net result would be a system that did not boot. This patch fixes the assignment of 'arm_64bit=1' even if RPI_EXTRA_CONFIG has been set elsewhere. Signed-off-by: matthew@thespencers.me.uk (cherry picked from commit 881e603ca240576f63ecaf9ca0f6370e8c3dd549) Signed-off-by: Ricardo Salveti --- conf/machine/raspberrypi4-64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/raspberrypi4-64.conf b/conf/machine/raspberrypi4-64.conf index 633d188..b4d442e 100644 --- a/conf/machine/raspberrypi4-64.conf +++ b/conf/machine/raspberrypi4-64.conf @@ -31,6 +31,6 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image" 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" +RPI_EXTRA_CONFIG += "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" ARMSTUB ?= "armstub8-gic.bin"