summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/cc/gcc.in7
-rw-r--r--config/kernel/linux.in36
2 files changed, 25 insertions, 18 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index d915f58..e9641b7 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -77,6 +77,12 @@ config CC_GCC_V_5_3_0
prompt "5.3.0"
select CC_GCC_5
+config CC_GCC_V_linaro_5_2
+ bool
+ prompt "linaro-5.2-2015.11"
+ depends on CC_GCC_SHOW_LINARO
+ select CC_GCC_5
+
config CC_GCC_V_linaro_4_9
bool
prompt "linaro-4.9-2015.06"
@@ -261,6 +267,7 @@ config CC_GCC_VERSION
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "5.3.0" if CC_GCC_V_5_3_0
+ default "linaro-5.2-2015.11" if CC_GCC_V_linaro_5_2
default "linaro-4.9-2015.06" if CC_GCC_V_linaro_4_9
default "4.9.3" if CC_GCC_V_4_9_3
default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 2669951..777b05e 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -46,31 +46,31 @@ choice
config KERNEL_V_4_3
bool
- prompt "4.3 (mainline)"
+ prompt "4.3.3 (stable)"
config KERNEL_V_4_2
bool
- prompt "4.2.6 (stable)"
+ prompt "4.2.8 (EOL)"
config KERNEL_V_4_1
bool
- prompt "4.1.13"
+ prompt "4.1.15"
config KERNEL_V_3_18
bool
- prompt "3.18.24"
+ prompt "3.18.25"
config KERNEL_V_3_14
bool
- prompt "3.14.57"
+ prompt "3.14.58"
config KERNEL_V_3_12
bool
- prompt "3.12.50"
+ prompt "3.12.51"
config KERNEL_V_3_10
bool
- prompt "3.10.93"
+ prompt "3.10.94"
config KERNEL_V_3_4
bool
@@ -78,11 +78,11 @@ config KERNEL_V_3_4
config KERNEL_V_3_2
bool
- prompt "3.2.72"
+ prompt "3.2.75"
config KERNEL_V_2_6_32
bool
- prompt "2.6.32.68"
+ prompt "2.6.32.69"
help
endchoice
@@ -91,15 +91,15 @@ config KERNEL_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "4.3" if KERNEL_V_4_3
- default "4.2.6" if KERNEL_V_4_2
- default "4.1.13" if KERNEL_V_4_1
- default "3.18.24" if KERNEL_V_3_18
- default "3.14.57" if KERNEL_V_3_14
- default "3.12.50" if KERNEL_V_3_12
- default "3.10.93" if KERNEL_V_3_10
+ default "4.3.3" if KERNEL_V_4_3
+ default "4.2.8" if KERNEL_V_4_2
+ default "4.1.15" if KERNEL_V_4_1
+ default "3.18.25" if KERNEL_V_3_18
+ default "3.14.58" if KERNEL_V_3_14
+ default "3.12.51" if KERNEL_V_3_12
+ default "3.10.94" if KERNEL_V_3_10
default "3.4.110" if KERNEL_V_3_4
- default "3.2.72" if KERNEL_V_3_2
- default "2.6.32.68" if KERNEL_V_2_6_32
+ default "3.2.75" if KERNEL_V_3_2
+ default "2.6.32.69" if KERNEL_V_2_6_32
endif # ! KERNEL_LINUX_CUSTOM