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-02-27 17:07:48 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-03-05 13:19:43 +0100
commit1cfbf95393decf047900e1b66b076a030704db20 (patch)
tree8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
parentfc45ae44613b41f7328e81d0999f609dd7e81482 (diff)
downloadupstream-1cfbf95393decf047900e1b66b076a030704db20.tar.gz
upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2
upstream-1cfbf95393decf047900e1b66b076a030704db20.zip
kernel: bump 4.14 to 4.14.104
Refreshed all patches. Altered patches: - 332-arc-add-OWRTDTB-section.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, 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.patch28
1 files changed, 14 insertions, 14 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 58f14b6ca5..414dbbc0c1 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
@@ -19,8 +19,8 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
-@@ -49,6 +49,16 @@
- 1:
+@@ -59,6 +59,16 @@
+ #endif
.endm
+; Here "patch-dtb" will embed external .dtb
@@ -38,24 +38,24 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
;----------------------------------------------------------------
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
-@@ -421,6 +421,8 @@ static inline int is_kernel(unsigned lon
- return 0;
- }
-
-+extern struct boot_param_header __image_dtb;
-+
- void __init setup_arch(char **cmdline_p)
- {
- #ifdef CONFIG_ARC_UBOOT_SUPPORT
-@@ -434,7 +436,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -469,7 +469,7 @@ ignore_uboot_args:
#endif
- {
- /* No, so try the embedded one */
+
+ if (use_embedded_dtb) {
- machine_desc = setup_machine_fdt(__dtb_start);
+ machine_desc = setup_machine_fdt(&__image_dtb);
if (!machine_desc)
panic("Embedded DT invalid\n");
+ }
+@@ -485,6 +485,8 @@ ignore_uboot_args:
+ }
+ }
++extern struct boot_param_header __image_dtb;
++
+ void __init setup_arch(char **cmdline_p)
+ {
+ handle_uboot_args();
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -30,6 +30,19 @@ SECTIONS