summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2014-11-02 18:29:53 +0100
committerJuergen Borleis <jbe@pengutronix.de>2015-01-31 07:49:32 +0100
commit29d94868141f232e08c7a7f2427564bc1a74a696 (patch)
tree33d27021c61edf1b88288829b27842a3a2c44125
parentd406c361b45bed215641c86649d69eaa6a1f7614 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-29d94868141f232e08c7a7f2427564bc1a74a696.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-29d94868141f232e08c7a7f2427564bc1a74a696.tar.xz
Kernel-3.16: keep in sync with stable release .7
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.162
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/0029-set-marker.diff.patch2
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.3-4.xzbin0 -> 111224 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.4-5.xzbin0 -> 10848 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.5-6.xzbin0 -> 23568 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.6-7.xzbin0 -> 55648 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.16/series4
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt2
10 files changed, 10 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 2710c2b..8c49d12 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -4,6 +4,8 @@
- keep in sync with stable release .31
* Kernel 3.14:
- keep in sync with stable release .23
+ * Kernel 3.16:
+ - keep in sync with stabel release .7
2014-09-29 Juergen Borleis <jbe@pengutronix.de
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.16 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.16
index 747089b..012da0d 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.16
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.16
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.16.3-ptx-master Kernel Configuration
+# Linux/arm 3.16.7-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/0029-set-marker.diff.patch b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/0029-set-marker.diff.patch
index 99249a4..5c3ae82 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/0029-set-marker.diff.patch
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/0029-set-marker.diff.patch
@@ -13,7 +13,7 @@ index d0901b46b4bf..615df649327f 100644
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 16
- SUBLEVEL = 3
+ SUBLEVEL = 7
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Shuffling Zombie Juror
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.3-4.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.3-4.xz
new file mode 100644
index 0000000..e711c42
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.3-4.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.4-5.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.4-5.xz
new file mode 100644
index 0000000..15cb4ec
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.4-5.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.5-6.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.5-6.xz
new file mode 100644
index 0000000..50a79fd
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.5-6.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.6-7.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.6-7.xz
new file mode 100644
index 0000000..9bc73aa
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/patch-3.16.6-7.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/series
index 1a1ab8e..bf4c73e 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.16/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.16/series
@@ -4,6 +4,10 @@ patch-3.16.1.xz
fix_name.diff
patch-3.16.1-2.xz
patch-3.16.2-3.xz
+patch-3.16.3-4.xz
+patch-3.16.4-5.xz
+patch-3.16.5-6.xz
+patch-3.16.6-7.xz
#tag:base --start-number 1
0001-Just-cosmetic.patch
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 33aeaba..f1ad2e0 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -33,7 +33,7 @@ they are still available and also some of them are still maintained. Here is a
list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\begin{itemize}
- \item \curKernelRev{}, stable patch level 3 (default)
+ \item \curKernelRev{}, stable patch level 7 (default)
\item 3.15, stable patch level 7
\item 3.14, stable patch level 23
\item 3.13 *), stable patch level 11
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 902abc4..1840ecd 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -44,7 +44,7 @@ Base System
[x] qml demo is a release
[x] rule file uses the release
[x] bootloader is a release
-[ ] kernel-3.16.3 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.13.11 is a release