summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2014-09-29 21:49:11 +0200
committerJuergen Borleis <jbe@pengutronix.de>2014-09-29 21:49:11 +0200
commit58edc950ea05a94952cba4c28d7bdc0984f69ecc (patch)
treeb49b16e2495649c3363f53fdb7fb45255f453d03
parent2f33d735ff60cd6ffb00ed5ee0828ffced51b8ea (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-58edc950ea05a94952cba4c28d7bdc0984f69ecc.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-58edc950ea05a94952cba4c28d7bdc0984f69ecc.tar.xz
Kernel-3.2: keep in sync with stable release .63
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini2440/Changelog5
-rw-r--r--configs/platform-friendlyarm-mini2440/kernelconfig-3.22
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.61-62.xzbin0 -> 30616 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.62-63.xzbin0 -> 51220 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.2/series2
-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
8 files changed, 11 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 87daee6..e65dd1f 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,8 @@
+2014-09-29 Juergen Borleis <jbe@pengutronix.de
+
+ * Kernel-3.2:
+ - keep in sync with stable release .63
+
2014-07-20 Juergen Borleis <jbe@pengutronix.de
* Platform: use ptxdist-2014.07.0
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
index 0923e4a..bb19453 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.61-ptx-master Kernel Configuration
+# Linux/arm 3.2.63-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.61-62.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.61-62.xz
new file mode 100644
index 0000000..27efc62
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.61-62.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.62-63.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.62-63.xz
new file mode 100644
index 0000000..3967df3
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.62-63.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 f733ed2..386bd6a 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
@@ -60,6 +60,8 @@ patch-3.2.57-58.xz
patch-3.2.58-59.xz
patch-3.2.59-60.xz
patch-3.2.60-61.xz
+patch-3.2.61-62.xz
+patch-3.2.62-63.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 45292ff..2a9248c 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 = 61
+ SUBLEVEL = 63
-EXTRAVERSION =
+EXTRAVERSION = -ptx-marker
NAME = Saber-toothed Squirrel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index a73aa82..f81100a 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -45,7 +45,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.5 *), stable patch level 7
\item 3.4, stable patch level 99
\item 3.3 *), stable patch level 8
- \item 3.2, stable patch level 61
+ \item 3.2, stable patch level 63
\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 8e6a92e..a1acabb 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -57,7 +57,7 @@ Base System
[x] kernel-3.5.7 is a release
[ ] kernel-3.4.99 is a release
[x] kernel-3.3.8 is a release
-[ ] kernel-3.2.61 is a release
+[ ] kernel-3.2.63 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