diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-03-04 20:25:09 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-05 22:58:48 +0000 |
commit | 42c37a2228c1e12e5dbde4afff36f4f30cfe0d5a (patch) | |
tree | 1aa0fe56ae07dfeeb84ebc96c0469279c24646cc /meta | |
parent | 0c6d55e4eba07801ca2010c80c43339b5633aa3b (diff) | |
download | poky-42c37a2228c1e12e5dbde4afff36f4f30cfe0d5a.tar.gz |
linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 9b652a797b..22385ad38c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "c5b3006ccedbb8397aa58b667b981e0c2435b943" | 14 | SRCREV_machine ?= "c5b3006ccedbb8397aa58b667b981e0c2435b943" |
15 | SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0" | 15 | SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 754dbc7d60..ae72f34c26 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine:qemuarm ?= "66d56b3bcc1391639a84e35be3ef00c5197089a8" | 18 | SRCREV_machine:qemuarm ?= "66d56b3bcc1391639a84e35be3ef00c5197089a8" |
19 | SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705" | 19 | SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705" |
20 | SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0" | 20 | SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 4b5e332c37..43409fb45e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "7f685244afb3acd13e94968312580b63d7296705" | |||
23 | SRCREV_machine:qemux86-64 ?= "7f685244afb3acd13e94968312580b63d7296705" | 23 | SRCREV_machine:qemux86-64 ?= "7f685244afb3acd13e94968312580b63d7296705" |
24 | SRCREV_machine:qemumips64 ?= "1d269d782d6b6effed2437ad6b11ae4f4e789259" | 24 | SRCREV_machine:qemumips64 ?= "1d269d782d6b6effed2437ad6b11ae4f4e789259" |
25 | SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705" | 25 | SRCREV_machine ?= "7f685244afb3acd13e94968312580b63d7296705" |
26 | SRCREV_meta ?= "2d38a472b21ae343707c8bd64ac68a9eaca066a0" | 26 | SRCREV_meta ?= "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |