From c8fb7cd7f6b46b42d588eed80abd1fe6422b1896 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Sep 2019 12:13:47 +0200 Subject: move kernel patches Signed-off-by: Waldemar Brodkorb --- .../linux/patches/4.14.44/alpha-remove-coff.patch | 43 ------------ target/linux/patches/4.14.44/arm-nommu.patch | 81 ---------------------- target/linux/patches/4.14.44/arm-thumb2.patch | 16 ----- target/linux/patches/4.14.44/h8300.patch | 12 ---- .../patches/4.14.44/initramfs-nosizelimit.patch | 21 ------ .../patches/4.14.44/microblaze-sigaltstack.patch | 12 ---- target/linux/patches/4.14.44/or1k-more-ram.patch | 12 ---- target/linux/patches/4.14.44/startup.patch | 34 --------- target/linux/patches/4.14.44/vdso2.patch | 27 -------- 9 files changed, 258 deletions(-) delete mode 100644 target/linux/patches/4.14.44/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.14.44/arm-nommu.patch delete mode 100644 target/linux/patches/4.14.44/arm-thumb2.patch delete mode 100644 target/linux/patches/4.14.44/h8300.patch delete mode 100644 target/linux/patches/4.14.44/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.14.44/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.14.44/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.14.44/startup.patch delete mode 100644 target/linux/patches/4.14.44/vdso2.patch (limited to 'target/linux/patches/4.14.44') diff --git a/target/linux/patches/4.14.44/alpha-remove-coff.patch b/target/linux/patches/4.14.44/alpha-remove-coff.patch deleted file mode 100644 index 51b7bcc14..000000000 --- a/target/linux/patches/4.14.44/alpha-remove-coff.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c linux-4.14.39/arch/alpha/boot/tools/objstrip.c ---- linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/alpha/boot/tools/objstrip.c 2018-05-22 12:36:55.166124565 +0200 -@@ -192,38 +192,8 @@ - prog_name, (long) elf_phdr->p_vaddr, - elf_phdr->p_vaddr + fil_size, offset); - } -- } else --#endif -- { -- aout = (struct exec *) buf; -- -- if (!(aout->fh.f_flags & COFF_F_EXEC)) { -- fprintf(stderr, "%s: %s is not in executable format\n", -- prog_name, inname); -- exit(1); -- } -- -- if (aout->fh.f_opthdr != sizeof(aout->ah)) { -- fprintf(stderr, "%s: %s has unexpected optional header size\n", -- prog_name, inname); -- exit(1); -- } -- -- if (N_MAGIC(*aout) != OMAGIC) { -- fprintf(stderr, "%s: %s is not an OMAGIC file\n", -- prog_name, inname); -- exit(1); -- } -- offset = N_TXTOFF(*aout); -- fil_size = aout->ah.tsize + aout->ah.dsize; -- mem_size = fil_size + aout->ah.bsize; -- -- if (verbose) { -- fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", -- prog_name, aout->ah.text_start, -- aout->ah.text_start + fil_size, offset); -- } - } -+#endif - - if (lseek(fd, offset, SEEK_SET) != offset) { - perror("lseek"); diff --git a/target/linux/patches/4.14.44/arm-nommu.patch b/target/linux/patches/4.14.44/arm-nommu.patch deleted file mode 100644 index b91aaf712..000000000 --- a/target/linux/patches/4.14.44/arm-nommu.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig ---- linux-4.14.30.orig/arch/arm/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig 2018-04-01 04:14:15.989043313 +0100 -@@ -363,6 +363,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.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug ---- linux-4.14.30.orig/arch/arm/Kconfig.debug 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig.debug 2018-04-01 04:14:15.990043300 +0100 -@@ -1777,7 +1777,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.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h ---- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/include/asm/mach/map.h 2018-04-01 04:14:15.991043288 +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.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig ---- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Kconfig 2018-04-01 04:14:15.992043275 +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.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot ---- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot 2018-04-01 04:14:15.992043275 +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.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 04:14:15.992043275 +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.14.44/arm-thumb2.patch b/target/linux/patches/4.14.44/arm-thumb2.patch deleted file mode 100644 index d8d1f4984..000000000 --- a/target/linux/patches/4.14.44/arm-thumb2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h ---- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 -+++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +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.14.44/h8300.patch b/target/linux/patches/4.14.44/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.14.44/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.14.44/initramfs-nosizelimit.patch b/target/linux/patches/4.14.44/initramfs-nosizelimit.patch deleted file mode 100644 index 0e524c1d9..000000000 --- a/target/linux/patches/4.14.44/initramfs-nosizelimit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c ---- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 -@@ -604,6 +604,7 @@ - } - - static bool is_tmpfs; -+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; - static struct dentry *rootfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) - { -@@ -616,6 +617,9 @@ - if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) - fill = shmem_fill_super; - -+ if (is_tmpfs) -+ data = tmpfs_rootflags; -+ - return mount_nodev(fs_type, flags, data, fill); - } - diff --git a/target/linux/patches/4.14.44/microblaze-sigaltstack.patch b/target/linux/patches/4.14.44/microblaze-sigaltstack.patch deleted file mode 100644 index 80413890a..000000000 --- a/target/linux/patches/4.14.44/microblaze-sigaltstack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S linux-4.14.39/arch/microblaze/kernel/syscall_table.S ---- linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/microblaze/kernel/syscall_table.S 2018-05-06 21:16:14.830349827 +0200 -@@ -187,7 +187,7 @@ - .long sys_getcwd - .long sys_capget - .long sys_capset /* 185 */ -- .long sys_ni_syscall /* sigaltstack */ -+ .long sys_sigaltstack - .long sys_sendfile - .long sys_ni_syscall /* reserved for streams1 */ - .long sys_ni_syscall /* reserved for streams2 */ diff --git a/target/linux/patches/4.14.44/or1k-more-ram.patch b/target/linux/patches/4.14.44/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.14.44/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.14.44/startup.patch b/target/linux/patches/4.14.44/startup.patch deleted file mode 100644 index bac354728..000000000 --- a/target/linux/patches/4.14.44/startup.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c ---- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +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.14.24.orig/init/main.c linux-4.14.24/init/main.c ---- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 -@@ -1069,6 +1069,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); - /* -@@ -1077,7 +1079,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.14.44/vdso2.patch b/target/linux/patches/4.14.44/vdso2.patch deleted file mode 100644 index b6c32f31b..000000000 --- a/target/linux/patches/4.14.44/vdso2.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c linux-4.14.44/arch/x86/entry/vdso/vdso2c.c ---- linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c 2018-05-25 16:18:02.000000000 +0200 -+++ linux-4.14.44/arch/x86/entry/vdso/vdso2c.c 2018-05-31 02:09:00.000000000 +0200 -@@ -64,7 +64,15 @@ - #include - - #include -+#ifdef __linux__ - #include -+#else -+typedef _Bool bool; -+enum { -+ false = 0, -+ true = 1 -+}; -+#endif - - const char *outfilename; - -@@ -86,6 +94,7 @@ - sym_hvclock_page, - }; - -+ - struct vdso_sym { - const char *name; - bool export; -- cgit v1.2.3