summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2011-12-26 14:27:51 +0100
committerJuergen Beisert <jbe@pengutronix.de>2012-07-17 16:52:51 +0200
commitda07c17a6d0aa07096b3745e37ffd1a39b134bd2 (patch)
tree1e370da1d7c8c24c37e733ce4a9a76432640d3c2
parenteee02a4f4b8bf1dfc66d7b47f2d2363355c8324e (diff)
downloadOSELAS.BSP-Pengutronix-Mini6410-da07c17a6d0aa07096b3745e37ffd1a39b134bd2.tar.gz
OSELAS.BSP-Pengutronix-Mini6410-da07c17a6d0aa07096b3745e37ffd1a39b134bd2.tar.xz
Kernel-3.1: keep in sync with stable release 3.1.6
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini6410/Changelog2
-rw-r--r--configs/platform-friendlyarm-mini6410/kernelconfig-3.12
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.5-6.bz2bin0 -> 20282 bytes
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.1/series1
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt4
7 files changed, 8 insertions, 5 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index cda6396..fb85251 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -4,6 +4,8 @@
- use the November release of the OSELAS.Toolchain
* Kernel 3.0:
- keep in sync with stable release .14
+ * Kernel 3.1:
+ - keep in sync with stable release .6
2011-12-21 Juergen Beisert <jbe@pengutronix.de>
diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
index d064ba9..4aca130 100644
--- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
+++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.5-ptx-master Kernel Configuration
+# Linux/arm 3.1.6-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.5-6.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.5-6.bz2
new file mode 100644
index 0000000..6c2468e
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.5-6.bz2
Binary files differ
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
index 939349c..a666968 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series
@@ -4,6 +4,7 @@ patch-3.1.1-2.bz2
patch-3.1.2-3.bz2
patch-3.1.3-4.bz2
patch-3.1.4-5.bz2
+patch-3.1.5-6.bz2
# some fixes, occured on LKML/ALKML
PATCH_2_3_rtc-s3c_Disable_alarm_entries_that_are_not_chosen.diff
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
index 3746a51..2a64ecf 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.1/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
- SUBLEVEL = 5
+ SUBLEVEL = 6
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = "Divemaster Edition"
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 95c15d0..288ff5e 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -32,7 +32,7 @@ they are also available. Here is a list of currently available Linux kernel
releases in the \ptxdistBSPName{}:
\begin{itemize}
- \item \curKernelRev{}, stable patch level 5 (defaultl)
+ \item \curKernelRev{}, stable patch level 6 (defaultl)
\item 3.0, stable patch level 14
\item 2.6.39, stable patch level 4
\end{itemize}
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 9b04062..7efc430 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -26,9 +26,9 @@ Preparations
Base System
-----------
-[x] kernel-2.6.39.4 is a release
-[!] kernel-3.1 is a release
+[ ] kernel-3.1.6 is a release
[ ] kernel-3.0.14 is a release
+[x] kernel-2.6.39.4 is a release
[x] u-boot-1.1.6 is a release
OSELAS BSP