diff options
| author | Matt Spencer <matthew@thespencers.me.uk> | 2021-01-14 16:23:13 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2021-03-16 22:25:08 +0000 |
| commit | e20e770049d4151473faf08560dfb83e3bfdcf0c (patch) | |
| tree | 6dff53bf55fd55819e171f080278410c0176fe48 /conf/machine | |
| parent | 22e9750971ac24a49651b014f14819f481dd3318 (diff) | |
| download | meta-raspberrypi-e20e770049d4151473faf08560dfb83e3bfdcf0c.tar.gz | |
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 <ricardo@foundries.io>
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/raspberrypi4-64.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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" | |||
| 31 | KERNEL_IMAGETYPE_DIRECT ?= "Image" | 31 | KERNEL_IMAGETYPE_DIRECT ?= "Image" |
| 32 | KERNEL_BOOTCMD ?= "booti" | 32 | KERNEL_BOOTCMD ?= "booti" |
| 33 | 33 | ||
| 34 | RPI_EXTRA_CONFIG ?= "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" | 34 | RPI_EXTRA_CONFIG += "\n# Force arm in 64bit mode. See: https://github.com/raspberrypi/firmware/issues/1193.\narm_64bit=1" |
| 35 | 35 | ||
| 36 | ARMSTUB ?= "armstub8-gic.bin" | 36 | ARMSTUB ?= "armstub8-gic.bin" |