Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: Update arc-add-OWRTDTB-section patch for 4.14

Browse source 
In 4.14.104 commit "e7264579eb80" (ARC: U-boot: check arguments paranoidly)
was introduced, which together with 332-arc-add-OWRTDTB-section.patch
caused build failure.

This commit updates 332-arc-add-OWRTDTB-section.patch.

Fixes:
http://phase1.builds.openwrt.org/builders/archs38%2Fgeneric/builds/1290
http://phase1.builds.openwrt.org/builders/archs38%2Fgeneric/builds/1269

Signed-off-by: Evgeniy Didin <evgeniy.didin@synopsys.com>
[Updated patch for kernel 4.19 in addition]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: John Crispin <john@phrozen.org>
This commit is contained in:
Evgeniy Didin 2019-03-20 11:30:40 +03:00 committed by Hauke Mehrtens
parent 38860fe2e4
commit 6c7b49c8b9
2 changed files with 55 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
View file

@ -1,5 +1,7 @@
From: Alexey Brodkin <abrodkin@synopsys.com> From 34ef04f3845ed2b47d57dd9d3b795b16e1f8185a Mon Sep 17 00:00:00 2001
Subject: openwrt: arc - add OWRTDTB section From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
Date: Fri, 15 Mar 2019 18:53:38 +0300
Subject: [PATCH] arc add OWRTDTB section
This change allows OpenWRT to patch resulting kernel binary with This change allows OpenWRT to patch resulting kernel binary with
external .dtb. external .dtb.
@ -10,7 +12,9 @@ given its ARC core configurations match (at least cache line sizes etc).
""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external ""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external
.dtb right after it, keeping the string in place. .dtb right after it, keeping the string in place.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
--- ---
arch/arc/kernel/head.S | 10 ++++++++++ arch/arc/kernel/head.S | 10 ++++++++++
arch/arc/kernel/setup.c | 4 +++- arch/arc/kernel/setup.c | 4 +++-
@ -38,7 +42,16 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
;---------------------------------------------------------------- ;----------------------------------------------------------------
--- a/arch/arc/kernel/setup.c --- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c
@@ -469,7 +469,7 @@ ignore_uboot_args: @@ -434,6 +434,8 @@ static inline bool uboot_arg_invalid(uns
#define UBOOT_TAG_CMDLINE 1
#define UBOOT_TAG_DTB 2
+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:
#endif #endif
if (use_embedded_dtb) { if (use_embedded_dtb) {
@ -47,21 +60,12 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
if (!machine_desc) if (!machine_desc)
panic("Embedded DT invalid\n"); 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 --- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S +++ b/arch/arc/kernel/vmlinux.lds.S
@@ -30,6 +30,19 @@ SECTIONS @@ -29,6 +29,19 @@ SECTIONS
*/
. = CONFIG_LINUX_LINK_BASE; . = CONFIG_LINUX_LINK_BASE;
+ /* + /*
+ * In OpenWRT we want to patch built binary embedding .dtb of choice. + * In OpenWRT we want to patch built binary embedding .dtb of choice.
+ * This is implemented with "patch-dtb" utility which searches for + * This is implemented with "patch-dtb" utility which searches for
@ -75,6 +79,6 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+ . = ALIGN(PAGE_SIZE); + . = ALIGN(PAGE_SIZE);
+ } + }
+ +
_int_vec_base_lds = .; _int_vec_base_lds = .;
.vector : { .vector : {
*(.vector)

8
target/linux/generic/pending-4.19/332-arc-add-OWRTDTB-section.patch
View file

@ -1,5 +1,7 @@
From: Alexey Brodkin <abrodkin@synopsys.com> From 34ef04f3845ed2b47d57dd9d3b795b16e1f8185a Mon Sep 17 00:00:00 2001
Subject: openwrt: arc - add OWRTDTB section From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
Date: Fri, 15 Mar 2019 18:53:38 +0300
Subject: [PATCH] arc add OWRTDTB section
This change allows OpenWRT to patch resulting kernel binary with This change allows OpenWRT to patch resulting kernel binary with
external .dtb. external .dtb.
@ -10,7 +12,9 @@ given its ARC core configurations match (at least cache line sizes etc).
""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external ""patch-dtb" searches for ASCII "OWRTDTB:" strign and copies external
.dtb right after it, keeping the string in place. .dtb right after it, keeping the string in place.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
--- ---
arch/arc/kernel/head.S | 10 ++++++++++ arch/arc/kernel/head.S | 10 ++++++++++
arch/arc/kernel/setup.c | 4 +++- arch/arc/kernel/setup.c | 4 +++-