From 54aa43deede441dbd28337b81dc526ab697898a6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jun 2018 05:19:56 +0200 Subject: [PATCH] linux+arc: update kernel --- mk/linux-ver.mk | 8 ++++---- target/arc/Makefile | 8 ++++---- target/arc/kernel/synopsys-hsdk | 1 + target/arc/kernel/synopsys-nsim | 2 ++ target/config/Config.in.rootfs | 1 + target/linux/Config.in.kernelversion | 6 ++---- target/linux/patches/{4.16.15 => 4.16.17}/arc.patch | 0 target/linux/patches/{4.16.15 => 4.16.17}/arm-nommu.patch | 0 target/linux/patches/{4.16.15 => 4.16.17}/arm-thumb2.patch | 0 target/linux/patches/{4.16.15 => 4.16.17}/h8300.patch | 0 target/linux/patches/{4.16.15 => 4.16.17}/or1k-more-ram.patch | 0 target/linux/patches/{4.16.15 => 4.16.17}/startup.patch | 0 target/linux/patches/{4.17.1 => 4.17.2}/arc.patch | 0 target/linux/patches/{4.17.1 => 4.17.2}/startup.patch | 0 14 files changed, 14 insertions(+), 12 deletions(-) rename target/linux/patches/{4.16.15 => 4.16.17}/arc.patch (100%) rename target/linux/patches/{4.16.15 => 4.16.17}/arm-nommu.patch (100%) rename target/linux/patches/{4.16.15 => 4.16.17}/arm-thumb2.patch (100%) rename target/linux/patches/{4.16.15 => 4.16.17}/h8300.patch (100%) rename target/linux/patches/{4.16.15 => 4.16.17}/or1k-more-ram.patch (100%) rename target/linux/patches/{4.16.15 => 4.16.17}/startup.patch (100%) rename target/linux/patches/{4.17.1 => 4.17.2}/arc.patch (100%) rename target/linux/patches/{4.17.1 => 4.17.2}/startup.patch (100%) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index df30a0e40..7d30e6986 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 2f3e006a6..34fe42e41 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 a5064e185..d4166a500 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 416867241..ad1683b1c 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 b7ea73de3..d9a459455 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 d3694bd2f..c81f507b7 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 similarity index 100% rename from target/linux/patches/4.16.15/arc.patch rename to 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 similarity index 100% rename from target/linux/patches/4.16.15/arm-nommu.patch rename to 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 similarity index 100% rename from target/linux/patches/4.16.15/arm-thumb2.patch rename to 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 similarity index 100% rename from target/linux/patches/4.16.15/h8300.patch rename to 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 similarity index 100% rename from target/linux/patches/4.16.15/or1k-more-ram.patch rename to 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 similarity index 100% rename from target/linux/patches/4.16.15/startup.patch rename to 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 similarity index 100% rename from target/linux/patches/4.17.1/arc.patch rename to 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 similarity index 100% rename from target/linux/patches/4.17.1/startup.patch rename to target/linux/patches/4.17.2/startup.patch -- 2.11.4.GIT