diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-22 21:51:43 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-23 13:22:31 +0200 |
| commit | 07aaa7e3d62ad32767d7067107db64b6ade81537 (patch) | |
| tree | 64d96c06ecbeafc04e3b17932767c2a930136978 | |
| parent | d27c2452161356d66500a2b96057d2f99a013097 (diff) | |
| download | upstream-07aaa7e3d62ad32767d7067107db64b6ade81537.tar.gz upstream-07aaa7e3d62ad32767d7067107db64b6ade81537.tar.bz2 upstream-07aaa7e3d62ad32767d7067107db64b6ade81537.zip | |
kernel: bump 4.14 to 4.14.113
Refreshed all patches.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 9938298427..3b11d3ecb6 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,12 +4,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .136 LINUX_VERSION-4.9 = .170 -LINUX_VERSION-4.14 = .112 +LINUX_VERSION-4.14 = .113 LINUX_VERSION-4.19 = .35 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c LINUX_KERNEL_HASH-4.9.170 = 33887b40fc8e0b71f423bb7afe112a4ae190378145f4a3f3892c563b7e43131d -LINUX_KERNEL_HASH-4.14.112 = 326101e2cc80a0d7e643074fe9e63f0d6a9c8cf97033f8a07848de373203e472 +LINUX_KERNEL_HASH-4.14.113 = b24df2e37faaf2290999c507f9e29de98494f52429bcd35513c5b3e52eaddac2 LINUX_KERNEL_HASH-4.19.35 = 2fa7e560f0e020104c6e09ffb6c2242a8f5c4b5c39e41ed2996fa7b8b42047e0 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch index 6aa90c9eaf..4c8d6e9d37 100644 --- a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch @@ -42,16 +42,16 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -434,6 +434,8 @@ static inline bool uboot_arg_invalid(uns - #define UBOOT_TAG_CMDLINE 1 - #define UBOOT_TAG_DTB 2 +@@ -437,6 +437,8 @@ static inline bool uboot_arg_invalid(uns + /* We always pass 0 as magic from U-boot */ + #define UBOOT_MAGIC_VALUE 0 +extern struct boot_param_header __image_dtb; + void __init handle_uboot_args(void) { bool use_embedded_dtb = true; -@@ -469,7 +471,7 @@ ignore_uboot_args: +@@ -477,7 +479,7 @@ ignore_uboot_args: #endif if (use_embedded_dtb) { |