|
|
@@ -1,7 +1,7 @@
|
|
|
-From 142abc9f7b8860638e39cf3850cf7ba328c26b42 Mon Sep 17 00:00:00 2001
|
|
|
+From 690e7f2cad271595ff68cace1c45fb10779bde41 Mon Sep 17 00:00:00 2001
|
|
|
From: Alexey Brodkin <[email protected]>
|
|
|
-Date: Sat, 31 Oct 2015 15:58:20 +0300
|
|
|
-Subject: [PATCH] openwrt: arc - add OWRTDTB section
|
|
|
+Date: Fri, 15 Jan 2016 00:34:01 +0300
|
|
|
+Subject: [PATCH 2/2] openwrt: arc - add OWRTDTB section
|
|
|
|
|
|
This change allows OpenWRT to patch resulting kernel binary with
|
|
|
external .dtb.
|
|
|
@@ -19,6 +19,8 @@ Signed-off-by: Alexey Brodkin <[email protected]>
|
|
|
arch/arc/kernel/vmlinux.lds.S | 13 +++++++++++++
|
|
|
3 files changed, 26 insertions(+), 1 deletion(-)
|
|
|
|
|
|
+diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
|
|
|
+index 689dd86..51154ae 100644
|
|
|
--- a/arch/arc/kernel/head.S
|
|
|
+++ b/arch/arc/kernel/head.S
|
|
|
@@ -49,6 +49,16 @@
|
|
|
@@ -36,11 +38,13 @@ Signed-off-by: Alexey Brodkin <[email protected]>
|
|
|
+END(__image_dtb)
|
|
|
+
|
|
|
.section .init.text, "ax",@progbits
|
|
|
- .type stext, @function
|
|
|
- .globl stext
|
|
|
+
|
|
|
+ ;----------------------------------------------------------------
|
|
|
+diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
|
|
|
+index e1b8744..9481c9d 100644
|
|
|
--- a/arch/arc/kernel/setup.c
|
|
|
+++ b/arch/arc/kernel/setup.c
|
|
|
-@@ -374,6 +374,8 @@ static inline int is_kernel(unsigned lon
|
|
|
+@@ -370,6 +370,8 @@ static inline int is_kernel(unsigned long addr)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -49,7 +53,7 @@ Signed-off-by: Alexey Brodkin <[email protected]>
|
|
|
void __init setup_arch(char **cmdline_p)
|
|
|
{
|
|
|
#ifdef CONFIG_ARC_UBOOT_SUPPORT
|
|
|
-@@ -387,7 +389,7 @@ void __init setup_arch(char **cmdline_p)
|
|
|
+@@ -383,7 +385,7 @@ void __init setup_arch(char **cmdline_p)
|
|
|
#endif
|
|
|
{
|
|
|
/* No, so try the embedded one */
|
|
|
@@ -58,6 +62,8 @@ Signed-off-by: Alexey Brodkin <[email protected]>
|
|
|
if (!machine_desc)
|
|
|
panic("Embedded DT invalid\n");
|
|
|
|
|
|
+diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
|
|
|
+index 894e696..ecfc284 100644
|
|
|
--- a/arch/arc/kernel/vmlinux.lds.S
|
|
|
+++ b/arch/arc/kernel/vmlinux.lds.S
|
|
|
@@ -30,6 +30,19 @@ SECTIONS
|
|
|
@@ -80,3 +86,6 @@ Signed-off-by: Alexey Brodkin <[email protected]>
|
|
|
_int_vec_base_lds = .;
|
|
|
.vector : {
|
|
|
*(.vector)
|
|
|
+--
|
|
|
+2.4.3
|
|
|
+
|