summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2014-07-19 22:49:14 +0200
committerJuergen Borleis <jbe@pengutronix.de>2014-07-19 22:49:14 +0200
commitc4ea1fb4bf5434a9029a8285194454f009b7acdd (patch)
tree08000781102a5f560d4a961fbbd40333d881c3cf
parentc0f439669a554f2041cf45c6752a5f415d287ab3 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-c4ea1fb4bf5434a9029a8285194454f009b7acdd.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-c4ea1fb4bf5434a9029a8285194454f009b7acdd.tar.xz
Kernel-3.4: keep in sync with stable release .99
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.42
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.88-89.xzbin0 -> 13052 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.89-90.xzbin0 -> 11168 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.90-91.xzbin0 -> 5008 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.91-92.xzbin0 -> 68928 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.92-93.xzbin0 -> 21188 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.93-94.xzbin0 -> 3420 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.94-95.xzbin0 -> 13820 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.95-96.xzbin0 -> 12472 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.96-97.xzbin0 -> 5876 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.97-98.xzbin0 -> 14776 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.98-99.xzbin0 -> 7632 bytes
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/series11
-rw-r--r--configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt2
17 files changed, 17 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 2d979e7..4481bbe 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -2,6 +2,8 @@
* Kernel-3.2:
- keep in sync with stable release .61
+ * Kernel-3.4:
+ - keep in sync with stable release .99
2014-04-30 Juergen Borleis <jbe@pengutronix.de
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
index 38ebb42..c2f7c36 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.88-ptx-master Kernel Configuration
+# Linux/arm 3.4.99-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.88-89.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.88-89.xz
new file mode 100644
index 0000000..52ade00
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.88-89.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.89-90.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.89-90.xz
new file mode 100644
index 0000000..19adbe3
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.89-90.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.90-91.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.90-91.xz
new file mode 100644
index 0000000..f05825a
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.90-91.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.91-92.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.91-92.xz
new file mode 100644
index 0000000..5d22522
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.91-92.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.92-93.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.92-93.xz
new file mode 100644
index 0000000..5228242
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.92-93.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.93-94.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.93-94.xz
new file mode 100644
index 0000000..1809b17
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.93-94.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.94-95.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.94-95.xz
new file mode 100644
index 0000000..6a62e98
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.94-95.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.95-96.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.95-96.xz
new file mode 100644
index 0000000..d6a87ab
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.95-96.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.96-97.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.96-97.xz
new file mode 100644
index 0000000..64fafd5
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.96-97.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.97-98.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.97-98.xz
new file mode 100644
index 0000000..f3560d8
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.97-98.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.98-99.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.98-99.xz
new file mode 100644
index 0000000..4c0289c
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.98-99.xz
Binary files differ
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
index e8f12b6..4c2635c 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
@@ -87,6 +87,17 @@ patch-3.4.84-85.xz
patch-3.4.85-86.xz
patch-3.4.86-87.xz
patch-3.4.87-88.xz
+patch-3.4.88-89.xz
+patch-3.4.89-90.xz
+patch-3.4.90-91.xz
+patch-3.4.91-92.xz
+patch-3.4.92-93.xz
+patch-3.4.93-94.xz
+patch-3.4.94-95.xz
+patch-3.4.95-96.xz
+patch-3.4.96-97.xz
+patch-3.4.97-98.xz
+patch-3.4.98-99.xz
fix_new_display_number.diff
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
index dda611e..7d950fa 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.4/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 4
- SUBLEVEL = 88
+ SUBLEVEL = 99
-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 bbdf21f..1472414 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -42,7 +42,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.7 *), stable patch level 10
\item 3.6 *), stable patch level 11
\item 3.5 *), stable patch level 7
- \item 3.4, stable patch level 88
+ \item 3.4, stable patch level 99
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 61
\item 3.1 *), stable patch level 10
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index d1dcb66..fc42236 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -54,7 +54,7 @@ Base System
[x] kernel-3.7.10 is a release
[x] kernel-3.6.11 is a release
[x] kernel-3.5.7 is a release
-[ ] kernel-3.4.88 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
[x] kernel-3.1.10 is a release