From 54aa43deede441dbd28337b81dc526ab697898a6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Jun 2018 05:19:56 +0200 Subject: 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/arc.patch | 12 ---- target/linux/patches/4.16.15/arm-nommu.patch | 81 ------------------------ target/linux/patches/4.16.15/arm-thumb2.patch | 16 ----- target/linux/patches/4.16.15/h8300.patch | 12 ---- target/linux/patches/4.16.15/or1k-more-ram.patch | 12 ---- target/linux/patches/4.16.15/startup.patch | 34 ---------- target/linux/patches/4.16.17/arc.patch | 12 ++++ target/linux/patches/4.16.17/arm-nommu.patch | 81 ++++++++++++++++++++++++ target/linux/patches/4.16.17/arm-thumb2.patch | 16 +++++ target/linux/patches/4.16.17/h8300.patch | 12 ++++ target/linux/patches/4.16.17/or1k-more-ram.patch | 12 ++++ target/linux/patches/4.16.17/startup.patch | 34 ++++++++++ target/linux/patches/4.17.1/arc.patch | 12 ---- target/linux/patches/4.17.1/startup.patch | 34 ---------- target/linux/patches/4.17.2/arc.patch | 12 ++++ target/linux/patches/4.17.2/startup.patch | 34 ++++++++++ 22 files changed, 227 insertions(+), 225 deletions(-) delete mode 100644 target/linux/patches/4.16.15/arc.patch delete mode 100644 target/linux/patches/4.16.15/arm-nommu.patch delete mode 100644 target/linux/patches/4.16.15/arm-thumb2.patch delete mode 100644 target/linux/patches/4.16.15/h8300.patch delete mode 100644 target/linux/patches/4.16.15/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.16.15/startup.patch create mode 100644 target/linux/patches/4.16.17/arc.patch create mode 100644 target/linux/patches/4.16.17/arm-nommu.patch create mode 100644 target/linux/patches/4.16.17/arm-thumb2.patch create mode 100644 target/linux/patches/4.16.17/h8300.patch create mode 100644 target/linux/patches/4.16.17/or1k-more-ram.patch create mode 100644 target/linux/patches/4.16.17/startup.patch delete mode 100644 target/linux/patches/4.17.1/arc.patch delete mode 100644 target/linux/patches/4.17.1/startup.patch create mode 100644 target/linux/patches/4.17.2/arc.patch create mode 100644 target/linux/patches/4.17.2/startup.patch 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.15/arc.patch deleted file mode 100644 index a2dd8b327..000000000 --- a/target/linux/patches/4.16.15/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.16.12.orig/arch/arc/boot/Makefile linux-4.16.12/arch/arc/boot/Makefile ---- linux-4.16.12.orig/arch/arc/boot/Makefile 2018-05-25 16:46:20.000000000 +0200 -+++ linux-4.16.12/arch/arc/boot/Makefile 2018-06-13 00:27:38.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.16.15/arm-nommu.patch b/target/linux/patches/4.16.15/arm-nommu.patch deleted file mode 100644 index 2480b5169..000000000 --- a/target/linux/patches/4.16.15/arm-nommu.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig ---- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100 -@@ -355,6 +355,17 @@ - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select CLKSRC_OF -+ select COMMON_CLK -+ select GENERIC_CLOCKEVENTS -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET -diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug ---- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100 -@@ -1795,7 +1795,8 @@ - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h ---- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100 -@@ -62,6 +62,7 @@ - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig ---- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100 -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot ---- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100 -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100 -@@ -37,7 +37,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* diff --git a/target/linux/patches/4.16.15/arm-thumb2.patch b/target/linux/patches/4.16.15/arm-thumb2.patch deleted file mode 100644 index a5ae3d260..000000000 --- a/target/linux/patches/4.16.15/arm-thumb2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur linux-4.15.17.orig/arch/arm/include/asm/assembler.h linux-4.15.17/arch/arm/include/asm/assembler.h ---- linux-4.15.17.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:31:21.000000000 +0100 -+++ linux-4.15.17/arch/arm/include/asm/assembler.h 2018-04-22 02:14:24.155580474 +0100 -@@ -194,10 +194,9 @@ - */ - .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo - .macro badr\c, rd, sym --#ifdef CONFIG_THUMB2_KERNEL -- adr\c \rd, \sym + 1 --#else - adr\c \rd, \sym -+#ifdef CONFIG_THUMB2_KERNEL -+ orr\c \rd, \rd, 1 - #endif - .endm - .endr diff --git a/target/linux/patches/4.16.15/h8300.patch b/target/linux/patches/4.16.15/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.16.15/h8300.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu ---- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 -+++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 -@@ -96,4 +96,8 @@ - hex "Load offset" - default 0 - -+config RAMBASE -+ hex "RAM base address" -+ default 0x400000 -+ - endmenu diff --git a/target/linux/patches/4.16.15/or1k-more-ram.patch b/target/linux/patches/4.16.15/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.16.15/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.16.15/startup.patch b/target/linux/patches/4.16.15/startup.patch deleted file mode 100644 index 8115b2cc6..000000000 --- a/target/linux/patches/4.16.15/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.15.13.orig/init/initramfs.c linux-4.15.13/init/initramfs.c ---- linux-4.15.13.orig/init/initramfs.c 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/init/initramfs.c 2018-04-04 21:05:40.670682792 +0100 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.15.13.orig/init/main.c linux-4.15.13/init/main.c ---- linux-4.15.13.orig/init/main.c 2018-03-24 11:02:53.000000000 +0100 -+++ linux-4.15.13/init/main.c 2018-04-04 21:05:40.671682779 +0100 -@@ -1075,6 +1075,8 @@ - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) sys_dup(0); - (void) sys_dup(0); - /* -@@ -1083,7 +1085,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { - ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.16.17/arc.patch b/target/linux/patches/4.16.17/arc.patch new file mode 100644 index 000000000..a2dd8b327 --- /dev/null +++ b/target/linux/patches/4.16.17/arc.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.16.12.orig/arch/arc/boot/Makefile linux-4.16.12/arch/arc/boot/Makefile +--- linux-4.16.12.orig/arch/arc/boot/Makefile 2018-05-25 16:46:20.000000000 +0200 ++++ linux-4.16.12/arch/arc/boot/Makefile 2018-06-13 00:27:38.000000000 +0200 +@@ -7,7 +7,7 @@ + + OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S + +-LINUX_START_TEXT = $$(readelf -h vmlinux | \ ++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ + grep "Entry point address" | grep -o 0x.*) + + UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.16.17/arm-nommu.patch b/target/linux/patches/4.16.17/arm-nommu.patch new file mode 100644 index 000000000..2480b5169 --- /dev/null +++ b/target/linux/patches/4.16.17/arm-nommu.patch @@ -0,0 +1,81 @@ +diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig +--- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100 +@@ -355,6 +355,17 @@ + select SPARSE_IRQ + select USE_OF + ++config ARM_SINGLE_ARCH_VERSATILE ++ bool "ARM Ltd. Versatile family" ++ depends on !MMU ++ select AUTO_ZRELADDR ++ select CLKSRC_OF ++ select COMMON_CLK ++ select GENERIC_CLOCKEVENTS ++ select GPIOLIB ++ select SPARSE_IRQ ++ select USE_OF ++ + config ARCH_EBSA110 + bool "EBSA-110" + select ARCH_USES_GETTIMEOFFSET +diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug +--- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100 +@@ -1795,7 +1795,8 @@ + config UNCOMPRESS_INCLUDE + string + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ +- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M ++ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ ++ ARM_SINGLE_ARCH_VERSATILE + default "mach/uncompress.h" + + config EARLY_PRINTK +diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h +--- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100 +@@ -62,6 +62,7 @@ + #else + #define iotable_init(map,num) do { } while (0) + #define vm_reserve_area_early(a,s,c) do { } while (0) ++#define debug_ll_io_init() do { } while (0) + #endif + + #endif +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig +--- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100 +@@ -1,7 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + config ARCH_VERSATILE +- bool "ARM Ltd. Versatile family" +- depends on ARCH_MULTI_V5 ++ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 ++ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE ++ default y if ARM_SINGLE_ARCH_VERSATILE + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot +--- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100 +@@ -0,0 +1,3 @@ ++# Empty file waiting for deletion once Makefile.boot isn't needed any more. ++# Patch waits for application at ++# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . +diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c +--- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100 +@@ -37,7 +37,11 @@ + #include + + /* macro to get at MMIO space when running virtually */ ++#ifdef CONFIG_MMU + #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) ++#else ++#define IO_ADDRESS(x) (x) ++#endif + #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + + /* diff --git a/target/linux/patches/4.16.17/arm-thumb2.patch b/target/linux/patches/4.16.17/arm-thumb2.patch new file mode 100644 index 000000000..a5ae3d260 --- /dev/null +++ b/target/linux/patches/4.16.17/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.15.17.orig/arch/arm/include/asm/assembler.h linux-4.15.17/arch/arm/include/asm/assembler.h +--- linux-4.15.17.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:31:21.000000000 +0100 ++++ linux-4.15.17/arch/arm/include/asm/assembler.h 2018-04-22 02:14:24.155580474 +0100 +@@ -194,10 +194,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr diff --git a/target/linux/patches/4.16.17/h8300.patch b/target/linux/patches/4.16.17/h8300.patch new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.16.17/h8300.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu +--- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 ++++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 +@@ -96,4 +96,8 @@ + hex "Load offset" + default 0 + ++config RAMBASE ++ hex "RAM base address" ++ default 0x400000 ++ + endmenu diff --git a/target/linux/patches/4.16.17/or1k-more-ram.patch b/target/linux/patches/4.16.17/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.16.17/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { diff --git a/target/linux/patches/4.16.17/startup.patch b/target/linux/patches/4.16.17/startup.patch new file mode 100644 index 000000000..8115b2cc6 --- /dev/null +++ b/target/linux/patches/4.16.17/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.15.13.orig/init/initramfs.c linux-4.15.13/init/initramfs.c +--- linux-4.15.13.orig/init/initramfs.c 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/init/initramfs.c 2018-04-04 21:05:40.670682792 +0100 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.15.13.orig/init/main.c linux-4.15.13/init/main.c +--- linux-4.15.13.orig/init/main.c 2018-03-24 11:02:53.000000000 +0100 ++++ linux-4.15.13/init/main.c 2018-04-04 21:05:40.671682779 +0100 +@@ -1075,6 +1075,8 @@ + if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) sys_dup(0); + (void) sys_dup(0); + /* +@@ -1083,7 +1085,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/4.17.1/arc.patch b/target/linux/patches/4.17.1/arc.patch deleted file mode 100644 index 20810ce64..000000000 --- a/target/linux/patches/4.17.1/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile ---- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 -+++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.17.1/startup.patch b/target/linux/patches/4.17.1/startup.patch deleted file mode 100644 index dd27de856..000000000 --- a/target/linux/patches/4.17.1/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c ---- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c ---- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 -+++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 -@@ -1138,6 +1138,8 @@ - if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) ksys_dup(0); - (void) ksys_dup(0); - /* -@@ -1146,7 +1148,7 @@ - */ - - if (!ramdisk_execute_command) -- ramdisk_execute_command = "/init"; -+ ramdisk_execute_command = "/sbin/init"; - - if (ksys_access((const char __user *) - ramdisk_execute_command, 0) != 0) { diff --git a/target/linux/patches/4.17.2/arc.patch b/target/linux/patches/4.17.2/arc.patch new file mode 100644 index 000000000..20810ce64 --- /dev/null +++ b/target/linux/patches/4.17.2/arc.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile +--- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 ++++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 +@@ -7,7 +7,7 @@ + + OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S + +-LINUX_START_TEXT = $$(readelf -h vmlinux | \ ++LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ + grep "Entry point address" | grep -o 0x.*) + + UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.17.2/startup.patch b/target/linux/patches/4.17.2/startup.patch new file mode 100644 index 000000000..dd27de856 --- /dev/null +++ b/target/linux/patches/4.17.2/startup.patch @@ -0,0 +1,34 @@ +diff -Nur linux-4.17.orig/init/initramfs.c linux-4.17/init/initramfs.c +--- linux-4.17.orig/init/initramfs.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/initramfs.c 2018-06-10 17:01:16.000000000 +0200 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.17.orig/init/main.c linux-4.17/init/main.c +--- linux-4.17.orig/init/main.c 2018-06-03 23:15:21.000000000 +0200 ++++ linux-4.17/init/main.c 2018-06-10 17:01:52.000000000 +0200 +@@ -1138,6 +1138,8 @@ + if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) ksys_dup(0); + (void) ksys_dup(0); + /* +@@ -1146,7 +1148,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (ksys_access((const char __user *) + ramdisk_execute_command, 0) != 0) { -- cgit v1.2.3