diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2014-09-29 21:53:25 +0200 |
---|---|---|
committer | Juergen Borleis <jbe@pengutronix.de> | 2014-09-29 21:53:25 +0200 |
commit | 69d77434ebc73d57b077ac7ddb2890fa49282f5e (patch) | |
tree | d5653ec5d551932a613701bf8249fb771dd25a00 | |
parent | 5b2c83bd6a3ef46442505c594c22f82831d650a7 (diff) | |
download | OSELAS.BSP-Pengutronix-Mini2440-69d77434ebc73d57b077ac7ddb2890fa49282f5e.tar.gz OSELAS.BSP-Pengutronix-Mini2440-69d77434ebc73d57b077ac7ddb2890fa49282f5e.tar.xz |
Kernel-3.14: keep in sync with stable release .19
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
12 files changed, 12 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog index d1d13b3..200ff56 100644 --- a/configs/platform-friendlyarm-mini2440/Changelog +++ b/configs/platform-friendlyarm-mini2440/Changelog @@ -6,6 +6,8 @@ - keep in sync with stable release .104 * Kernel 3.12: - keep in sync with stable release .28 + * Kernel 3.14: + - keep in sync with stable release .19 2014-07-20 Juergen Borleis <jbe@pengutronix.de diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 index 6b8cc30..8522f42 100644 --- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 +++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.14 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.13-ptx-master Kernel Configuration +# Linux/arm 3.14.19-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.13-14.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.13-14.xz Binary files differnew file mode 100644 index 0000000..82ad0c2 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.13-14.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.14-15.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.14-15.xz Binary files differnew file mode 100644 index 0000000..06dd72d --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.14-15.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.15-16.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.15-16.xz Binary files differnew file mode 100644 index 0000000..3e306c0 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.15-16.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.16-17.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.16-17.xz Binary files differnew file mode 100644 index 0000000..5e76bc3 --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.16-17.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.17-18.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.17-18.xz Binary files differnew file mode 100644 index 0000000..ca8d03a --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.17-18.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.18-19.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.18-19.xz Binary files differnew file mode 100644 index 0000000..5eb469b --- /dev/null +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/patch-3.14.18-19.xz diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series index c81d176..ec28db6 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/series @@ -13,6 +13,12 @@ patch-3.14.9-10.xz patch-3.14.10-11.xz patch-3.14.11-12.xz patch-3.14.12-13.xz +patch-3.14.13-14.xz +patch-3.14.14-15.xz +patch-3.14.15-16.xz +patch-3.14.16-17.xz +patch-3.14.17-18.xz +patch-3.14.18-19.xz # add full board feature support fix_new_display_number.diff diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff index 7bc62a0..eedbe20 100644 --- a/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff +++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.14/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.14/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 14 - SUBLEVEL = 13 + SUBLEVEL = 19 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Shuffling Zombie Juror diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 951753d..4a32394 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -33,7 +33,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}: \begin{itemize} \item \curKernelRev{}, stable patch level 6 (default) - \item 3.14, stable patch level 13 + \item 3.14, stable patch level 19 \item 3.13 *), stable patch level 11 \item 3.12, stable patch level 28 \item 3.11 *), stable patch level 10 **) diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt index 14f93c0..a34a7e8 100644 --- a/protocol/acceptance-test.txt +++ b/protocol/acceptance-test.txt @@ -45,7 +45,7 @@ Base System [x] rule file uses the release [x] bootloader is a release [ ] kernel-3.15.6 is a release -[ ] kernel-3.14.13 is a release +[ ] kernel-3.14.19 is a release [ ] kernel-3.13.11 is a release [ ] kernel-3.12.28 is a release [ ] kernel-3.11.10 is a release |