aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:51:43 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-23 13:22:31 +0200
commit07aaa7e3d62ad32767d7067107db64b6ade81537 (patch)
tree64d96c06ecbeafc04e3b17932767c2a930136978 /target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
parentd27c2452161356d66500a2b96057d2f99a013097 (diff)
downloadupstream-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>
Diffstat (limited to 'target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch')
-rw-r--r--target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch8
1 files changed, 4 insertions, 4 deletions
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) {