aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/arc770
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:52:19 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:52:19 +0000
commitcdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (patch)
treeaeb91c1e1c35fc3c481922ebb7234903b6c855e8 /target/linux/arc770
parent93b50ade934436d00e5f68c3feabf030ace8d98d (diff)
downloadupstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.gz
upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.bz2
upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.zip
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de SVN-Revision: 48224
Diffstat (limited to 'target/linux/arc770')
-rw-r--r--target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch7
-rw-r--r--target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch17
2 files changed, 5 insertions, 19 deletions
diff --git a/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch b/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
index 53f80749bd..135bfb6e2a 100644
--- a/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
+++ b/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
@@ -18,11 +18,9 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
arch/arc/Kconfig | 2 --
1 file changed, 2 deletions(-)
-diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
-index cf96ef2..f0c6d4c 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
-@@ -11,8 +11,6 @@ config ARC
+@@ -12,8 +12,6 @@ config ARC
select BUILDTIME_EXTABLE_SORT
select COMMON_CLK
select CLONE_BACKWARDS
@@ -31,6 +29,3 @@ index cf96ef2..f0c6d4c 100644
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
select GENERIC_FIND_FIRST_BIT
---
-2.4.3
-
diff --git a/target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch b/target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch
index ddb426f15b..a0392cb2f5 100644
--- a/target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch
+++ b/target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch
@@ -19,8 +19,6 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
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 @@
@@ -38,13 +36,11 @@ index 689dd86..51154ae 100644
+END(__image_dtb)
+
.section .init.text, "ax",@progbits
-
- ;----------------------------------------------------------------
-diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
-index c33e77c..96fbfd0 100644
+ .type stext, @function
+ .globl stext
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
-@@ -370,6 +370,8 @@ static inline int is_kernel(unsigned long addr)
+@@ -374,6 +374,8 @@ static inline int is_kernel(unsigned lon
return 0;
}
@@ -53,7 +49,7 @@ index c33e77c..96fbfd0 100644
void __init setup_arch(char **cmdline_p)
{
#ifdef CONFIG_ARC_UBOOT_SUPPORT
-@@ -383,7 +385,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -387,7 +389,7 @@ void __init setup_arch(char **cmdline_p)
#endif
{
/* No, so try the embedded one */
@@ -62,8 +58,6 @@ index c33e77c..96fbfd0 100644
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 dd35bde..f309104 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -30,6 +30,19 @@ SECTIONS
@@ -86,6 +80,3 @@ index dd35bde..f309104 100644
_int_vec_base_lds = .;
.vector : {
*(.vector)
---
-2.4.3
-