helium-3rd-party/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi synced 2026-09-16 18:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-raspberrypi: Enable use of 'RPI_EXTRA_CONFIG += ...' in local.conf

Browse Source 
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 <ricardo@foundries.io>
This commit is contained in:
Matt Spencer 2021-01-14 16:23:13 +00:00 committed by Andrei Gherzan
parent 22e9750971
commit e20e770049
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/raspberrypi4-64.conf
View File

@ -31,6 +31,6 @@ KERNEL_IMAGETYPE_UBOOT ?= "Image"
KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image"
KERNEL_BOOTCMD ?= "booti" 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" ARMSTUB ?= "armstub8-gic.bin"