mirror of
https://git.yoctoproject.org/poky
synced 2026-03-12 02:09:39 +01:00
42c37a2228
Integrating the following commit(s) to linux-yocto:
commit e1b976ee4fb5af517cf01a9f2dd4a32f560ca894
Author: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue Feb 15 23:27:31 2022 -0500
riscv64: drop MAXPHYSMEM_128GB
The MAXPHYSMEM config options have been removed upstream via the
following commit, so we drop our setting.
commit 6250ecf5ba42292b652cd01c9fcb2239010c5c44
Author: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Date: Mon Jan 17 10:57:16 2022 +0100
riscv: Get rid of MAXPHYSMEM configs
commit db1503d355a79d1d4255a9996f20e72848b74a56 upstream.
CONFIG_MAXPHYSMEM_* are actually never used, even the nommu defconfigs
selecting the MAXPHYSMEM_2GB had no effects on PAGE_OFFSET since it was
preempted by !MMU case right before.
In addition, the move of the kernel mapping at the end of the address
space broke the use of MAXPHYSMEM_2G with MMU since it defines PAGE_OFFSET
at the same address as the kernel mapping.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: 2bfc6cd81bd1 ("riscv: Move kernel mapping outside of linear mapping")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Conor Dooley <Conor.Dooley@microchip.com>
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(From OE-Core rev: da19366b44af8521b0f311581793fc89d554cd40)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
69 lines
3.3 KiB
BlitzBasic
69 lines
3.3 KiB
BlitzBasic
KBRANCH ?= "v5.15/standard/base"
|
|
|
|
require recipes-kernel/linux/linux-yocto.inc
|
|
|
|
# board specific branches
|
|
KBRANCH:qemuarm ?= "v5.15/standard/arm-versatile-926ejs"
|
|
KBRANCH:qemuarm64 ?= "v5.15/standard/qemuarm64"
|
|
KBRANCH:qemumips ?= "v5.15/standard/mti-malta32"
|
|
KBRANCH:qemuppc ?= "v5.15/standard/qemuppc"
|
|
KBRANCH:qemuriscv64 ?= "v5.15/standard/base"
|
|
KBRANCH:qemuriscv32 ?= "v5.15/standard/base"
|
|
KBRANCH:qemux86 ?= "v5.15/standard/base"
|
|
KBRANCH:qemux86-64 ?= "v5.15/standard/base"
|
|
KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64"
|
|
|
|
SRCREV_machine:qemuarm ?= "6be018aeb5fd86986bc560e2e6ca59b774784bdb"
|
|
SRCREV_machine:qemuarm64 ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemumips ?= "2b861aef3af1f8b09f1345a308e6e6fe213e1fef"
|
|
SRCREV_machine:qemuppc ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemuriscv64 ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemuriscv32 ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemux86 ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemux86-64 ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_machine:qemumips64 ?= "1d269d782d6b6effed2437ad6b11ae4f4e789259"
|
|
SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705"
|
|
SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894"
|
|
|
|
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
|
|
# get the <version>/base branch, which is pure upstream -stable, and the same
|
|
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
|
|
# normal PREFERRED_VERSION settings.
|
|
BBCLASSEXTEND = "devupstream:target"
|
|
DEFAULT_PREFERENCE:class-devupstream = "-1"
|
|
SRCREV_machine:class-devupstream ?= "0bf5b7cc9848b5494b2ca4eb1ca6e05865e8cdf1"
|
|
PN:class-devupstream = "linux-yocto-upstream"
|
|
KBRANCH:class-devupstream = "v5.15/base"
|
|
|
|
# remap qemuarm to qemuarma15 for the 5.8 kernel
|
|
# KMACHINE:qemuarm ?= "qemuarma15"
|
|
|
|
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
|
|
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
|
|
|
|
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
|
LINUX_VERSION ?= "5.15.22"
|
|
|
|
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
|
|
DEPENDS += "openssl-native util-linux-native"
|
|
DEPENDS += "gmp-native libmpc-native"
|
|
|
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
|
|
|
KMETA = "kernel-meta"
|
|
KCONF_BSP_AUDIT_LEVEL = "1"
|
|
|
|
KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
|
|
|
|
COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32"
|
|
|
|
# Functionality flags
|
|
KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
|
|
KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
|
|
KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
|
|
KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
|
|
KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
|
|
KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
|