summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2015-01-26 18:32:30 +0100
committerJuergen Borleis <jbe@pengutronix.de>2015-01-31 07:49:39 +0100
commit2a9d622ba34721fb8663c8d6974d98bb7d9ca2e3 (patch)
tree82df945ce0b075701d7f12ee62999c6bf877e4c2
parent1798346976ae4b7bcfdaea07eb14e9b6f333f918 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-2a9d622ba34721fb8663c8d6974d98bb7d9ca2e3.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-2a9d622ba34721fb8663c8d6974d98bb7d9ca2e3.tar.xz
Kernel-3.2: keep in sync with stable release .66
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini2440/Changelog1
-rw-r--r--configs/platform-friendlyarm-mini2440/kernelconfig-3.22
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.65-66.xzbin0 -> 17476 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/series1
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt2
7 files changed, 6 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 972f3fe..5ca8d70 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -9,6 +9,7 @@
- use ptxdist-2015.01.0
- update to OSELAS.Toolchain()-2014.12
- use the new autoversion feature of PTXdist
+ * Kernel-3.2:
2015-01-21 Juergen Borleis <jbe@pengutronix.de
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
index e62f51f..c345d68 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.65-ptx-master Kernel Configuration
+# Linux/arm 3.2.66-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.65-66.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.65-66.xz
new file mode 100644
index 0000000..3602686
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.65-66.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
index 391a620..514e99e 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
@@ -64,6 +64,7 @@ patch-3.2.61-62.xz
patch-3.2.62-63.xz
patch-3.2.63-64.xz
patch-3.2.64-65.xz
+patch-3.2.65-66.xz
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
add_lcd_w35i.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
index e407c97..2d49b74 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.2/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 2
- SUBLEVEL = 65
+ SUBLEVEL = 66
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 407dedf..e3fb8a3 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -47,7 +47,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.5 *), stable patch level 7
\item 3.4, stable patch level 104
\item 3.3 *), stable patch level 8
- \item 3.2, stable patch level 65
+ \item 3.2, stable patch level 66
\item 3.1 *), stable patch level 10
\item 3.0 *), stable patch level 101
\item 2.6.39 *), stable patch level 4
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index dfb1f52..79e041d 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -58,7 +58,7 @@ Base System
[x] kernel-3.5.7 is a release
[ ] kernel-3.4.104 is a release
[x] kernel-3.3.8 is a release
-[ ] kernel-3.2.65 is a release
+[ ] kernel-3.2.66 is a release
[x] kernel-3.1.10 is a release
[ ] kernel-3.0.101 is a release
[x] kernel-2.6.39.4 is a release