{linux, linux-headers}: add version 5.14

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Michael Walle 2021-09-06 17:55:25 +02:00 committed by Peter Korsgaard
parent d8bc9b4d86
commit 47523da623
5 changed files with 24 additions and 5 deletions

View File

@ -28,7 +28,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
bool "Latest version (5.13)"
bool "Latest version (5.14)"
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (4.19.198-cip54)"
@ -125,7 +125,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "5.13.9" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.14" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.198-cip54" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "4.19.198-cip54-rt21" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \

View File

@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2 linux-5.14.tar.xz
sha256 72fe7cc1f0363523061659a21e24754697b27f405cb88a41a63038629636159a linux-5.13.9.tar.xz
sha256 e9381cd3525a02f5b895f74147e2440be443ecd45484c6c64075046bc6f94c73 linux-5.12.19.tar.xz
sha256 11027c6114eb916edbcc37897226fb6263b2931911d2d5093550473ce1a57600 linux-5.11.22.tar.xz

View File

@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_5_13
default BR2_KERNEL_HEADERS_5_14
help
Select the kernel version to get headers from.
@ -69,6 +69,10 @@ config BR2_KERNEL_HEADERS_5_12
config BR2_KERNEL_HEADERS_5_13
bool "Linux 5.13.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
config BR2_KERNEL_HEADERS_5_14
bool "Linux 5.14.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION
@ -143,8 +147,12 @@ choice
If your kernel headers are more recent than the latest version
in the choice, then select the latest version.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14
bool "5.14.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13
bool "5.13.x or later"
bool "5.13.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12
@ -379,6 +387,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.11.22" if BR2_KERNEL_HEADERS_5_11
default "5.12.19" if BR2_KERNEL_HEADERS_5_12
default "5.13.9" if BR2_KERNEL_HEADERS_5_13
default "5.14" if BR2_KERNEL_HEADERS_5_14
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

View File

@ -545,6 +545,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@ -558,6 +562,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
default "5.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
default "5.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_12
default "5.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11

View File

@ -123,8 +123,12 @@ choice
If your toolchain uses headers newer than the latest version
in the choice, then select the latest version.
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_14
bool "5.14.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_13
bool "5.13.x or later"
bool "5.13.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_13
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_12