aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/arc770
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-15 10:49:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-15 10:49:01 +0000
commit4514589182d1cdb1f2dd6859599c97747b5ca52a (patch)
treea3bbf51f4be526c4710424a2b7d17390b9db246a /target/linux/arc770
parent7f11532c587bdb85924929c4f4d9750761c78562 (diff)
downloadupstream-4514589182d1cdb1f2dd6859599c97747b5ca52a.tar.gz
upstream-4514589182d1cdb1f2dd6859599c97747b5ca52a.tar.bz2
upstream-4514589182d1cdb1f2dd6859599c97747b5ca52a.zip
arc770: bump linux kernel from 4.3 to 4.4
This switch involved: [1] Regeneration of config (few options went away) [2] Regeneration of patches so they apply cleanly (different offsets) [3] Update of .dts files because we now explicitly specify memory regions in use as opposed to previously used offset from 0x8000_0000 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Felix Fietkau <nbd@openwrt.org> Cc: Jo-Philipp Wich <jow@openwrt.org> Cc: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 48240
Diffstat (limited to 'target/linux/arc770')
-rw-r--r--target/linux/arc770/Makefile2
-rw-r--r--target/linux/arc770/config-4.4 (renamed from target/linux/arc770/config-4.3)14
-rw-r--r--target/linux/arc770/dts/axc001.dtsi2
-rw-r--r--target/linux/arc770/dts/axs101.dts2
-rw-r--r--target/linux/arc770/dts/axs10x_mb.dtsi1
-rw-r--r--target/linux/arc770/dts/skeleton.dtsi2
-rw-r--r--target/linux/arc770/patches-4.4/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch (renamed from target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch)9
-rw-r--r--target/linux/arc770/patches-4.4/0002-openwrt-arc-add-OWRTDTB-section.patch (renamed from target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch)23
8 files changed, 30 insertions, 25 deletions
diff --git a/target/linux/arc770/Makefile b/target/linux/arc770/Makefile
index f62bf0efd1..52c5e0008d 100644
--- a/target/linux/arc770/Makefile
+++ b/target/linux/arc770/Makefile
@@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -matomic
MAINTAINER:=Alexey Brodkin <abrodkin@synopsys.com>
SUBTARGETS:=generic
-KERNEL_PATCHVER:=4.3
+KERNEL_PATCHVER:=4.4
DEVICE_TYPE:=developerboard
diff --git a/target/linux/arc770/config-4.3 b/target/linux/arc770/config-4.4
index 7a1348082f..c8f021dce2 100644
--- a/target/linux/arc770/config-4.3
+++ b/target/linux/arc770/config-4.4
@@ -48,12 +48,6 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DTC=y
CONFIG_DWMAC_GENERIC=y
-# CONFIG_DWMAC_IPQ806X is not set
-# CONFIG_DWMAC_LPC18XX is not set
-# CONFIG_DWMAC_MESON is not set
-# CONFIG_DWMAC_ROCKCHIP is not set
-# CONFIG_DWMAC_SOCFPGA is not set
-# CONFIG_DWMAC_STI is not set
# CONFIG_DWMAC_SUNXI is not set
CONFIG_DW_APB_ICTL=y
CONFIG_GENERIC_ATOMIC64=y
@@ -100,17 +94,14 @@ CONFIG_LIBFDT=y
CONFIG_LINUX_LINK_BASE=0x80000000
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
CONFIG_MDIO_BOARDINFO=y
CONFIG_MFD_SYSCON=y
CONFIG_MMC=y
CONFIG_MMC_DW=y
# CONFIG_MMC_DW_EXYNOS is not set
-CONFIG_MMC_DW_IDMAC=y
# CONFIG_MMC_DW_K3 is not set
CONFIG_MMC_DW_PLTFM=y
CONFIG_MMC_SDHCI=y
-# CONFIG_MMC_SDHCI_OF_AT91 is not set
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MODULES_USE_ELF_RELA=y
CONFIG_NATIONAL_PHY=y
@@ -140,7 +131,6 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_MTD=y
CONFIG_OF_NET=y
-CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PERF_USE_VMALLOC=y
CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
@@ -150,6 +140,7 @@ CONFIG_PREEMPT_COUNT=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_RCU=y
CONFIG_PTP_1588_CLOCK=y
+CONFIG_RATIONAL=y
# CONFIG_RCU_BOOST is not set
CONFIG_RCU_STALL_COMMON=y
CONFIG_REGMAP=y
@@ -160,19 +151,18 @@ CONFIG_RESET_CONTROLLER=y
# CONFIG_SCSI_DMA is not set
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_FSL is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_ARC=y
CONFIG_SERIAL_ARC_CONSOLE=y
CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SG_SPLIT is not set
CONFIG_SRCU=y
CONFIG_STACKTRACE=y
CONFIG_STMMAC_ETH=y
CONFIG_STMMAC_PLATFORM=y
# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
CONFIG_TICK_CPU_ACCOUNTING=y
CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_USB_SUPPORT=y
diff --git a/target/linux/arc770/dts/axc001.dtsi b/target/linux/arc770/dts/axc001.dtsi
index a5e2726a06..420dcfde28 100644
--- a/target/linux/arc770/dts/axc001.dtsi
+++ b/target/linux/arc770/dts/axc001.dtsi
@@ -95,6 +95,6 @@
#size-cells = <1>;
ranges = <0x00000000 0x80000000 0x40000000>;
device_type = "memory";
- reg = <0x00000000 0x20000000>; /* 512MiB */
+ reg = <0x80000000 0x20000000>; /* 512MiB */
};
};
diff --git a/target/linux/arc770/dts/axs101.dts b/target/linux/arc770/dts/axs101.dts
index 8718eb46cc..769e81a433 100644
--- a/target/linux/arc770/dts/axs101.dts
+++ b/target/linux/arc770/dts/axs101.dts
@@ -17,6 +17,6 @@
compatible = "snps,axs101", "snps,arc-sdp";
chosen {
- bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=ttyS3,115200n8";
+ bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0";
};
};
diff --git a/target/linux/arc770/dts/axs10x_mb.dtsi b/target/linux/arc770/dts/axs10x_mb.dtsi
index f3db321549..44a578c107 100644
--- a/target/linux/arc770/dts/axs10x_mb.dtsi
+++ b/target/linux/arc770/dts/axs10x_mb.dtsi
@@ -46,6 +46,7 @@
snps,pbl = < 32 >;
clocks = <&apbclk>;
clock-names = "stmmaceth";
+ max-speed = <100>;
};
ehci@0x40000 {
diff --git a/target/linux/arc770/dts/skeleton.dtsi b/target/linux/arc770/dts/skeleton.dtsi
index a870bdd5e4..296d371a33 100644
--- a/target/linux/arc770/dts/skeleton.dtsi
+++ b/target/linux/arc770/dts/skeleton.dtsi
@@ -32,6 +32,6 @@
memory {
device_type = "memory";
- reg = <0x00000000 0x10000000>; /* 256M */
+ reg = <0x80000000 0x10000000>; /* 256M */
};
};
diff --git a/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch b/target/linux/arc770/patches-4.4/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
index 135bfb6e2a..29d9bff8a4 100644
--- a/target/linux/arc770/patches-4.3/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
+++ b/target/linux/arc770/patches-4.4/0001-openwrt-arc-remove-dependency-on-DEVTMPFS.patch
@@ -1,7 +1,7 @@
-From 271777096a31e76b2ffd750bc44efde9656de857 Mon Sep 17 00:00:00 2001
+From adfbf9e6cad93281cffceab078e7f6f2a8e094f9 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <abrodkin@synopsys.com>
Date: Thu, 13 Aug 2015 01:56:02 +0300
-Subject: [PATCH] openwrt: arc - remove dependency on DEVTMPFS
+Subject: [PATCH 1/2] openwrt: arc - remove dependency on DEVTMPFS
OpenWRT builds initramfs so that it doesn't require DEVTMPFS so dropping
this dependency. That helps to escape 2 separate kernel rebuilds with
@@ -18,6 +18,8 @@ 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 6312f60..a95bab3 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -12,8 +12,6 @@ config ARC
@@ -29,3 +31,6 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
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.4/0002-openwrt-arc-add-OWRTDTB-section.patch
index a0392cb2f5..02e919858d 100644
--- a/target/linux/arc770/patches-4.3/0002-openwrt-arc-add-OWRTDTB-section.patch
+++ b/target/linux/arc770/patches-4.4/0002-openwrt-arc-add-OWRTDTB-section.patch
@@ -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 <abrodkin@synopsys.com>
-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 <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 @@
@@ -36,11 +38,13 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+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 <abrodkin@synopsys.com>
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 <abrodkin@synopsys.com>
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 <abrodkin@synopsys.com>
_int_vec_base_lds = .;
.vector : {
*(.vector)
+--
+2.4.3
+