toolchain: add 4.18.x choice for headers

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 7f62d8122bc42b84608cad34fb005b4870c143d5)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/toolchain/Config.in b/toolchain/Config.in
index ad02af5215c986b96bbc97a39152ca2bbc93e7db..c2192a52b1f3854acc40ec61c6054518669d4b16 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -357,10 +357,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
        bool
        select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+       bool
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
        string
+       default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
        default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
        default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
        default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15

diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 6a9921c1490437aa76ecae7dcb538291fa346bf7..4639232bfbaec5831fa39114fe4032b7d8de6213 100644 (file)
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -123,6 +123,10 @@ choice
            m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
            p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_18
+       bool "4.18.x"
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_17
        bool "4.17.x"
        select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17