summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-06-22 03:19:56 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2018-06-22 03:20:19 (GMT)
commit54aa43deede441dbd28337b81dc526ab697898a6 (patch)
treebf694791f79486c9063ac764293f4a9d0330970d
parent6ccb660a84c7b2fa10be7e44e4cb3463cdcf3c45 (diff)
linux+arc: update kernel
-rw-r--r--mk/linux-ver.mk8
-rw-r--r--target/arc/Makefile8
-rw-r--r--target/arc/kernel/synopsys-hsdk1
-rw-r--r--target/arc/kernel/synopsys-nsim2
-rw-r--r--target/config/Config.in.rootfs1
-rw-r--r--target/linux/Config.in.kernelversion6
-rw-r--r--target/linux/patches/4.16.17/arc.patch (renamed from target/linux/patches/4.16.15/arc.patch)0
-rw-r--r--target/linux/patches/4.16.17/arm-nommu.patch (renamed from target/linux/patches/4.16.15/arm-nommu.patch)0
-rw-r--r--target/linux/patches/4.16.17/arm-thumb2.patch (renamed from target/linux/patches/4.16.15/arm-thumb2.patch)0
-rw-r--r--target/linux/patches/4.16.17/h8300.patch (renamed from target/linux/patches/4.16.15/h8300.patch)0
-rw-r--r--target/linux/patches/4.16.17/or1k-more-ram.patch (renamed from target/linux/patches/4.16.15/or1k-more-ram.patch)0
-rw-r--r--target/linux/patches/4.16.17/startup.patch (renamed from target/linux/patches/4.16.15/startup.patch)0
-rw-r--r--target/linux/patches/4.17.2/arc.patch (renamed from target/linux/patches/4.17.1/arc.patch)0
-rw-r--r--target/linux/patches/4.17.2/startup.patch (renamed from target/linux/patches/4.17.1/startup.patch)0
14 files changed, 14 insertions, 12 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index df30a0e..7d30e69 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -16,16 +16,16 @@ KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_17),y)
-KERNEL_FILE_VER:= 4.17.1
+KERNEL_FILE_VER:= 4.17.2
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER).0-$(KERNEL_RELEASE)
-KERNEL_HASH:= c93f3fbcbce66b7ed51e1d33d669b0ad56dd5088c23ea77fb8925b328faa7070
+KERNEL_HASH:= 4cebcd6f4ddc49e68543a6d920582d9e0eca431be89f9c1b85fd4ecf1dd87b9c
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_16),y)
-KERNEL_FILE_VER:= 4.16.15
+KERNEL_FILE_VER:= 4.16.17
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 58f2a6732d240a45322495d4839a80c8049eac7caa1f4f44860565665579236c
+KERNEL_HASH:= c93d8d0bab0807469a6720f279eff0a2c8bc02d94f3f1dafadbb5d9ebbbc028c
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
KERNEL_FILE_VER:= 4.14.44
diff --git a/target/arc/Makefile b/target/arc/Makefile
index 2f3e006..34fe42e 100644
--- a/target/arc/Makefile
+++ b/target/arc/Makefile
@@ -30,18 +30,18 @@ ifeq ($(ADK_TARGET_FS),initramfspiggyback)
targethelp:
@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y)
-ifeq ($(ADK_TARGET_SYSTEM_NSIM_ARCV1),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y)
@echo './scripts/nsim.sh arcv1 $(FW_DIR)/${TARGET_KERNEL}'
endif
-ifeq ($(ADK_TARGET_SYSTEM_NSIM_ARCV2),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARCHS),y)
@echo './scripts/nsim.sh arcv2 $(FW_DIR)/${TARGET_KERNEL}'
endif
endif
ifeq ($(ADK_TARGET_BIG_ENDIAN),y)
-ifeq ($(ADK_TARGET_SYSTEM_NSIM_ARCV1),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y)
@echo './scripts/nsim.sh arcv1-be $(FW_DIR)/${TARGET_KERNEL}'
endif
-ifeq ($(ADK_TARGET_SYSTEM_NSIM_ARCV2),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARCHS),y)
@echo './scripts/nsim.sh arcv2-be $(FW_DIR)/${TARGET_KERNEL}'
endif
endif
diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk
index a5064e1..d4166a5 100644
--- a/target/arc/kernel/synopsys-hsdk
+++ b/target/arc/kernel/synopsys-hsdk
@@ -1,3 +1,4 @@
CONFIG_ISA_ARCV2=y
CONFIG_ARC_SOC_HSDK=y
CONFIG_ARC_UBOOT_SUPPORT=y
+CONFIG_ARC_DW2_UNWIND=y
diff --git a/target/arc/kernel/synopsys-nsim b/target/arc/kernel/synopsys-nsim
index 4168672..ad1683b 100644
--- a/target/arc/kernel/synopsys-nsim
+++ b/target/arc/kernel/synopsys-nsim
@@ -1,2 +1,4 @@
CONFIG_ARC=y
CONFIG_ARC_PLAT_SIM=y
+CONFIG_ARC_DBG=y
+CONFIG_ARC_DW2_UNWIND=y
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index b7ea73d..d9a4594 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -38,6 +38,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
depends on \
ADK_TARGET_QEMU || \
ADK_TARGET_ARCH_ALPHA || \
+ ADK_TARGET_ARCH_ARC || \
ADK_TARGET_ARCH_ARM || \
ADK_TARGET_ARCH_M68K || \
ADK_TARGET_ARCH_MICROBLAZE || \
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index d3694bd..c81f507 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -30,7 +30,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
config ADK_TARGET_LINUX_KERNEL_VERSION_4_17
- bool "4.17.1"
+ bool "4.17.2"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY
@@ -39,8 +39,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_17
depends on !ADK_TARGET_ARCH_RISCV64
config ADK_TARGET_LINUX_KERNEL_VERSION_4_16
- bool "4.16.15"
- depends on !ADK_TARGET_ARCH_ARC
+ bool "4.16.17"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY
@@ -51,7 +50,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_16
config ADK_TARGET_LINUX_KERNEL_VERSION_4_14
bool "4.14.44"
- depends on !ADK_TARGET_ARCH_ARC
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_CRIS
depends on !ADK_TARGET_ARCH_CSKY
diff --git a/target/linux/patches/4.16.15/arc.patch b/target/linux/patches/4.16.17/arc.patch
index a2dd8b3..a2dd8b3 100644
--- a/target/linux/patches/4.16.15/arc.patch
+++ b/target/linux/patches/4.16.17/arc.patch
diff --git a/target/linux/patches/4.16.15/arm-nommu.patch b/target/linux/patches/4.16.17/arm-nommu.patch
index 2480b51..2480b51 100644
--- a/target/linux/patches/4.16.15/arm-nommu.patch
+++ b/target/linux/patches/4.16.17/arm-nommu.patch
diff --git a/target/linux/patches/4.16.15/arm-thumb2.patch b/target/linux/patches/4.16.17/arm-thumb2.patch
index a5ae3d2..a5ae3d2 100644
--- a/target/linux/patches/4.16.15/arm-thumb2.patch
+++ b/target/linux/patches/4.16.17/arm-thumb2.patch
diff --git a/target/linux/patches/4.16.15/h8300.patch b/target/linux/patches/4.16.17/h8300.patch
index 836a414..836a414 100644
--- a/target/linux/patches/4.16.15/h8300.patch
+++ b/target/linux/patches/4.16.17/h8300.patch
diff --git a/target/linux/patches/4.16.15/or1k-more-ram.patch b/target/linux/patches/4.16.17/or1k-more-ram.patch
index de848c8..de848c8 100644
--- a/target/linux/patches/4.16.15/or1k-more-ram.patch
+++ b/target/linux/patches/4.16.17/or1k-more-ram.patch
diff --git a/target/linux/patches/4.16.15/startup.patch b/target/linux/patches/4.16.17/startup.patch
index 8115b2c..8115b2c 100644
--- a/target/linux/patches/4.16.15/startup.patch
+++ b/target/linux/patches/4.16.17/startup.patch
diff --git a/target/linux/patches/4.17.1/arc.patch b/target/linux/patches/4.17.2/arc.patch
index 20810ce..20810ce 100644
--- a/target/linux/patches/4.17.1/arc.patch
+++ b/target/linux/patches/4.17.2/arc.patch
diff --git a/target/linux/patches/4.17.1/startup.patch b/target/linux/patches/4.17.2/startup.patch
index dd27de8..dd27de8 100644
--- a/target/linux/patches/4.17.1/startup.patch
+++ b/target/linux/patches/4.17.2/startup.patch