summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2015-01-26 18:15:06 +0100
committerJuergen Borleis <jbe@pengutronix.de>2015-01-31 07:49:41 +0100
commit01e2d1581c0484e298197c8898a32dd6bcfa7a69 (patch)
treebfa0eaca3897fc73c494eaa33f5993f2024c522b
parent513b48e27151d344d273daaaf233d44081b957bb (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-01e2d1581c0484e298197c8898a32dd6bcfa7a69.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-01e2d1581c0484e298197c8898a32dd6bcfa7a69.tar.xz
Kernel-3.14: keep in sync with stable release .29
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini2440/Changelog2
-rw-r--r--configs/platform-friendlyarm-mini2440/kernelconfig-3.142
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.23-24.xzbin0 -> 61696 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.24-25.xzbin0 -> 61236 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.25-26.xzbin0 -> 25516 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.26-27.xzbin0 -> 10628 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.27-28.xzbin0 -> 17740 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.28-29.xzbin0 -> 25080 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/series6
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt2
12 files changed, 12 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 4ec782a..affc362 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -15,6 +15,8 @@
- keep in sync with stable release .105
* Kernel 3.12:
- keep in sync with stable release .36
+ * Kernel 3.14:
+ - keep in sync with stable release .29
2015-01-21 Juergen Borleis <jbe@pengutronix.de
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
index 98a35da..f339dbc 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.23-ptx-master Kernel Configuration
+# Linux/arm 3.14.29-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.23-24.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.23-24.xz
new file mode 100644
index 0000000..6b25a85
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.23-24.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.24-25.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.24-25.xz
new file mode 100644
index 0000000..5220827
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.24-25.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.25-26.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.25-26.xz
new file mode 100644
index 0000000..964caca
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.25-26.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.26-27.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.26-27.xz
new file mode 100644
index 0000000..e5adbca
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.26-27.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.27-28.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.27-28.xz
new file mode 100644
index 0000000..699b92f
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.27-28.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.28-29.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.28-29.xz
new file mode 100644
index 0000000..1f72493
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.28-29.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
index ba5e2ac..5565712 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series
@@ -23,6 +23,12 @@ patch-3.14.19-20.xz
patch-3.14.20-21.xz
patch-3.14.21-22.xz
patch-3.14.22-23.xz
+patch-3.14.23-24.xz
+patch-3.14.24-25.xz
+patch-3.14.25-26.xz
+patch-3.14.26-27.xz
+patch-3.14.27-28.xz
+patch-3.14.28-29.xz
# add full board feature support
fix_new_display_number.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
index 56875b9..02c8690 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.14/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 14
- SUBLEVEL = 23
+ SUBLEVEL = 29
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Shuffling Zombie Juror
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 3bc8335..5c3e945 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -35,7 +35,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\begin{itemize}
\item 3.16 *), stable patch level 7
\item 3.15 *), stable patch level 7
- \item 3.14, stable patch level 23
+ \item 3.14, stable patch level 29
\item 3.13 *), stable patch level 11
\item 3.12, stable patch level 36
\item 3.11 *), stable patch level 10 **)
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 12c58f9..33a41cf 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -46,7 +46,7 @@ Base System
[x] bootloader is a release
[ ] kernel-3.16.7 is a release
[ ] kernel-3.15.7 is a release
-[ ] kernel-3.14.23 is a release
+[ ] kernel-3.14.29 is a release
[ ] kernel-3.13.11 is a release
[ ] kernel-3.12.36 is a release
[ ] kernel-3.11.10 is a release