From 936ee2ebca427fb05fa3e748ed37412c8e2bdf83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 May 2018 09:12:46 +0200 Subject: linux: bump kernels from 4.4 to 4.16 --- target/linux/Config.in.kernelversion | 8 +- .../linux/patches/4.14.39/alpha-remove-coff.patch | 43 - target/linux/patches/4.14.39/arm-nommu.patch | 81 - target/linux/patches/4.14.39/arm-thumb2.patch | 16 - target/linux/patches/4.14.39/h8300.patch | 12 - .../patches/4.14.39/initramfs-nosizelimit.patch | 21 - .../patches/4.14.39/microblaze-sigaltstack.patch | 12 - target/linux/patches/4.14.39/or1k-more-ram.patch | 12 - target/linux/patches/4.14.39/startup.patch | 34 - .../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.16.12/arm-nommu.patch | 81 + target/linux/patches/4.16.12/arm-thumb2.patch | 16 + target/linux/patches/4.16.12/h8300.patch | 12 + target/linux/patches/4.16.12/or1k-more-ram.patch | 12 + target/linux/patches/4.16.12/startup.patch | 34 + target/linux/patches/4.16.7/arm-nommu.patch | 81 - target/linux/patches/4.16.7/arm-thumb2.patch | 16 - target/linux/patches/4.16.7/h8300.patch | 12 - target/linux/patches/4.16.7/or1k-more-ram.patch | 12 - target/linux/patches/4.16.7/startup.patch | 34 - .../patches/4.4.128/coldfire-sighandler.patch | 100 - target/linux/patches/4.4.128/crisv32.patch | 33 - .../patches/4.4.128/crisv32_ethernet_driver.patch | 4048 --- target/linux/patches/4.4.128/h8300.patch | 44 - .../patches/4.4.128/initramfs-nosizelimit.patch | 57 - target/linux/patches/4.4.128/ld-or1k.patch | 12 - target/linux/patches/4.4.128/macsonic.patch | 11 - target/linux/patches/4.4.128/mips-xz.patch | 12 - target/linux/patches/4.4.128/patch-realtime | 32735 ------------------- target/linux/patches/4.4.128/startup.patch | 34 - .../linux/patches/4.4.128/use-libgcc-for-sh.patch | 29 - target/linux/patches/4.4.128/versatile-nommu.patch | 16 - .../patches/4.4.132/coldfire-sighandler.patch | 100 + target/linux/patches/4.4.132/crisv32.patch | 33 + .../patches/4.4.132/crisv32_ethernet_driver.patch | 4048 +++ target/linux/patches/4.4.132/h8300.patch | 44 + .../patches/4.4.132/initramfs-nosizelimit.patch | 57 + target/linux/patches/4.4.132/ld-or1k.patch | 12 + target/linux/patches/4.4.132/macsonic.patch | 11 + target/linux/patches/4.4.132/mips-xz.patch | 12 + target/linux/patches/4.4.132/patch-realtime | 32735 +++++++++++++++++++ target/linux/patches/4.4.132/startup.patch | 34 + .../linux/patches/4.4.132/use-libgcc-for-sh.patch | 29 + target/linux/patches/4.4.132/versatile-nommu.patch | 16 + .../linux/patches/4.9.103/alpha-remove-coff.patch | 43 + target/linux/patches/4.9.103/arm-nommu.patch | 80 + target/linux/patches/4.9.103/arm-thumb2.patch | 16 + .../patches/4.9.103/crisv32_ethernet_driver.patch | 4048 +++ target/linux/patches/4.9.103/h8300.patch | 44 + .../linux/patches/4.9.103/hppa-remove-debug.patch | 12 + .../patches/4.9.103/initramfs-nosizelimit.patch | 57 + target/linux/patches/4.9.103/ld-or1k.patch | 12 + target/linux/patches/4.9.103/macsonic.patch | 11 + .../patches/4.9.103/microblaze-sigaltstack.patch | 12 + target/linux/patches/4.9.103/or1k-more-ram.patch | 12 + target/linux/patches/4.9.103/patch-realtime | 27718 ++++++++++++++++ target/linux/patches/4.9.103/sh2.patch | 11 + target/linux/patches/4.9.103/startup.patch | 34 + target/linux/patches/4.9.103/vdso2.patch | 27 + .../linux/patches/4.9.98/alpha-remove-coff.patch | 43 - target/linux/patches/4.9.98/arm-nommu.patch | 80 - target/linux/patches/4.9.98/arm-thumb2.patch | 16 - .../patches/4.9.98/crisv32_ethernet_driver.patch | 4048 --- target/linux/patches/4.9.98/h8300.patch | 44 - .../linux/patches/4.9.98/hppa-remove-debug.patch | 12 - .../patches/4.9.98/initramfs-nosizelimit.patch | 57 - target/linux/patches/4.9.98/ld-or1k.patch | 12 - target/linux/patches/4.9.98/macsonic.patch | 11 - .../patches/4.9.98/microblaze-sigaltstack.patch | 12 - target/linux/patches/4.9.98/or1k-more-ram.patch | 12 - target/linux/patches/4.9.98/patch-realtime | 27718 ---------------- target/linux/patches/4.9.98/sh2.patch | 11 - target/linux/patches/4.9.98/startup.patch | 34 - target/linux/patches/4.9.98/vdso2.patch | 27 - 81 files changed, 69658 insertions(+), 69658 deletions(-) delete mode 100644 target/linux/patches/4.14.39/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.14.39/arm-nommu.patch delete mode 100644 target/linux/patches/4.14.39/arm-thumb2.patch delete mode 100644 target/linux/patches/4.14.39/h8300.patch delete mode 100644 target/linux/patches/4.14.39/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.14.39/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.14.39/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.14.39/startup.patch create mode 100644 target/linux/patches/4.14.44/alpha-remove-coff.patch create mode 100644 target/linux/patches/4.14.44/arm-nommu.patch create mode 100644 target/linux/patches/4.14.44/arm-thumb2.patch create mode 100644 target/linux/patches/4.14.44/h8300.patch create mode 100644 target/linux/patches/4.14.44/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.14.44/microblaze-sigaltstack.patch create mode 100644 target/linux/patches/4.14.44/or1k-more-ram.patch create mode 100644 target/linux/patches/4.14.44/startup.patch create mode 100644 target/linux/patches/4.16.12/arm-nommu.patch create mode 100644 target/linux/patches/4.16.12/arm-thumb2.patch create mode 100644 target/linux/patches/4.16.12/h8300.patch create mode 100644 target/linux/patches/4.16.12/or1k-more-ram.patch create mode 100644 target/linux/patches/4.16.12/startup.patch delete mode 100644 target/linux/patches/4.16.7/arm-nommu.patch delete mode 100644 target/linux/patches/4.16.7/arm-thumb2.patch delete mode 100644 target/linux/patches/4.16.7/h8300.patch delete mode 100644 target/linux/patches/4.16.7/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.16.7/startup.patch delete mode 100644 target/linux/patches/4.4.128/coldfire-sighandler.patch delete mode 100644 target/linux/patches/4.4.128/crisv32.patch delete mode 100644 target/linux/patches/4.4.128/crisv32_ethernet_driver.patch delete mode 100644 target/linux/patches/4.4.128/h8300.patch delete mode 100644 target/linux/patches/4.4.128/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.4.128/ld-or1k.patch delete mode 100644 target/linux/patches/4.4.128/macsonic.patch delete mode 100644 target/linux/patches/4.4.128/mips-xz.patch delete mode 100644 target/linux/patches/4.4.128/patch-realtime delete mode 100644 target/linux/patches/4.4.128/startup.patch delete mode 100644 target/linux/patches/4.4.128/use-libgcc-for-sh.patch delete mode 100644 target/linux/patches/4.4.128/versatile-nommu.patch create mode 100644 target/linux/patches/4.4.132/coldfire-sighandler.patch create mode 100644 target/linux/patches/4.4.132/crisv32.patch create mode 100644 target/linux/patches/4.4.132/crisv32_ethernet_driver.patch create mode 100644 target/linux/patches/4.4.132/h8300.patch create mode 100644 target/linux/patches/4.4.132/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.4.132/ld-or1k.patch create mode 100644 target/linux/patches/4.4.132/macsonic.patch create mode 100644 target/linux/patches/4.4.132/mips-xz.patch create mode 100644 target/linux/patches/4.4.132/patch-realtime create mode 100644 target/linux/patches/4.4.132/startup.patch create mode 100644 target/linux/patches/4.4.132/use-libgcc-for-sh.patch create mode 100644 target/linux/patches/4.4.132/versatile-nommu.patch create mode 100644 target/linux/patches/4.9.103/alpha-remove-coff.patch create mode 100644 target/linux/patches/4.9.103/arm-nommu.patch create mode 100644 target/linux/patches/4.9.103/arm-thumb2.patch create mode 100644 target/linux/patches/4.9.103/crisv32_ethernet_driver.patch create mode 100644 target/linux/patches/4.9.103/h8300.patch create mode 100644 target/linux/patches/4.9.103/hppa-remove-debug.patch create mode 100644 target/linux/patches/4.9.103/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.9.103/ld-or1k.patch create mode 100644 target/linux/patches/4.9.103/macsonic.patch create mode 100644 target/linux/patches/4.9.103/microblaze-sigaltstack.patch create mode 100644 target/linux/patches/4.9.103/or1k-more-ram.patch create mode 100644 target/linux/patches/4.9.103/patch-realtime create mode 100644 target/linux/patches/4.9.103/sh2.patch create mode 100644 target/linux/patches/4.9.103/startup.patch create mode 100644 target/linux/patches/4.9.103/vdso2.patch delete mode 100644 target/linux/patches/4.9.98/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.9.98/arm-nommu.patch delete mode 100644 target/linux/patches/4.9.98/arm-thumb2.patch delete mode 100644 target/linux/patches/4.9.98/crisv32_ethernet_driver.patch delete mode 100644 target/linux/patches/4.9.98/h8300.patch delete mode 100644 target/linux/patches/4.9.98/hppa-remove-debug.patch delete mode 100644 target/linux/patches/4.9.98/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.9.98/ld-or1k.patch delete mode 100644 target/linux/patches/4.9.98/macsonic.patch delete mode 100644 target/linux/patches/4.9.98/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.9.98/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.9.98/patch-realtime delete mode 100644 target/linux/patches/4.9.98/sh2.patch delete mode 100644 target/linux/patches/4.9.98/startup.patch delete mode 100644 target/linux/patches/4.9.98/vdso2.patch (limited to 'target/linux') diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 9e8b9c5da..103485cc0 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_16 - bool "4.16.7" + bool "4.16.12" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY @@ -40,7 +40,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_16 depends on !ADK_TARGET_ARCH_RISCV64 config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 - bool "4.14.39" + bool "4.14.44" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY @@ -50,7 +50,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 depends on !ADK_TARGET_ARCH_RISCV64 config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 - bool "4.9.98" + bool "4.9.103" depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_METAG @@ -61,7 +61,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 config ADK_TARGET_LINUX_KERNEL_VERSION_4_4 - bool "4.4.128" + bool "4.4.132" depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_ARCH_NIOS2 diff --git a/target/linux/patches/4.14.39/alpha-remove-coff.patch b/target/linux/patches/4.14.39/alpha-remove-coff.patch deleted file mode 100644 index 51b7bcc14..000000000 --- a/target/linux/patches/4.14.39/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.39/arm-nommu.patch b/target/linux/patches/4.14.39/arm-nommu.patch deleted file mode 100644 index b91aaf712..000000000 --- a/target/linux/patches/4.14.39/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.39/arm-thumb2.patch b/target/linux/patches/4.14.39/arm-thumb2.patch deleted file mode 100644 index d8d1f4984..000000000 --- a/target/linux/patches/4.14.39/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.39/h8300.patch b/target/linux/patches/4.14.39/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.14.39/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.39/initramfs-nosizelimit.patch b/target/linux/patches/4.14.39/initramfs-nosizelimit.patch deleted file mode 100644 index 0e524c1d9..000000000 --- a/target/linux/patches/4.14.39/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.39/microblaze-sigaltstack.patch b/target/linux/patches/4.14.39/microblaze-sigaltstack.patch deleted file mode 100644 index 80413890a..000000000 --- a/target/linux/patches/4.14.39/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.39/or1k-more-ram.patch b/target/linux/patches/4.14.39/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.14.39/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.39/startup.patch b/target/linux/patches/4.14.39/startup.patch deleted file mode 100644 index bac354728..000000000 --- a/target/linux/patches/4.14.39/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/alpha-remove-coff.patch b/target/linux/patches/4.14.44/alpha-remove-coff.patch new file mode 100644 index 000000000..51b7bcc14 --- /dev/null +++ b/target/linux/patches/4.14.44/alpha-remove-coff.patch @@ -0,0 +1,43 @@ +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 new file mode 100644 index 000000000..b91aaf712 --- /dev/null +++ b/target/linux/patches/4.14.44/arm-nommu.patch @@ -0,0 +1,81 @@ +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 new file mode 100644 index 000000000..d8d1f4984 --- /dev/null +++ b/target/linux/patches/4.14.44/arm-thumb2.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.14.44/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.14.44/initramfs-nosizelimit.patch b/target/linux/patches/4.14.44/initramfs-nosizelimit.patch new file mode 100644 index 000000000..0e524c1d9 --- /dev/null +++ b/target/linux/patches/4.14.44/initramfs-nosizelimit.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 000000000..80413890a --- /dev/null +++ b/target/linux/patches/4.14.44/microblaze-sigaltstack.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.14.44/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.14.44/startup.patch b/target/linux/patches/4.14.44/startup.patch new file mode 100644 index 000000000..bac354728 --- /dev/null +++ b/target/linux/patches/4.14.44/startup.patch @@ -0,0 +1,34 @@ +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.16.12/arm-nommu.patch b/target/linux/patches/4.16.12/arm-nommu.patch new file mode 100644 index 000000000..2480b5169 --- /dev/null +++ b/target/linux/patches/4.16.12/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.12/arm-thumb2.patch b/target/linux/patches/4.16.12/arm-thumb2.patch new file mode 100644 index 000000000..a5ae3d260 --- /dev/null +++ b/target/linux/patches/4.16.12/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.12/h8300.patch b/target/linux/patches/4.16.12/h8300.patch new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.16.12/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.12/or1k-more-ram.patch b/target/linux/patches/4.16.12/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.16.12/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.12/startup.patch b/target/linux/patches/4.16.12/startup.patch new file mode 100644 index 000000000..8115b2cc6 --- /dev/null +++ b/target/linux/patches/4.16.12/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.16.7/arm-nommu.patch b/target/linux/patches/4.16.7/arm-nommu.patch deleted file mode 100644 index 2480b5169..000000000 --- a/target/linux/patches/4.16.7/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.7/arm-thumb2.patch b/target/linux/patches/4.16.7/arm-thumb2.patch deleted file mode 100644 index a5ae3d260..000000000 --- a/target/linux/patches/4.16.7/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.7/h8300.patch b/target/linux/patches/4.16.7/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.16.7/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.7/or1k-more-ram.patch b/target/linux/patches/4.16.7/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.16.7/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.7/startup.patch b/target/linux/patches/4.16.7/startup.patch deleted file mode 100644 index 8115b2cc6..000000000 --- a/target/linux/patches/4.16.7/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.4.128/coldfire-sighandler.patch b/target/linux/patches/4.4.128/coldfire-sighandler.patch deleted file mode 100644 index c52a4e228..000000000 --- a/target/linux/patches/4.4.128/coldfire-sighandler.patch +++ /dev/null @@ -1,100 +0,0 @@ -From a95517992a37488c0bc8b629c47c570e580e407d Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Mon, 15 Feb 2016 16:36:29 +1000 -Subject: m68k: Use conventional function parameters for do_sigreturn - -Create conventional stack parameters for the calls to do_sigreturn and -do_rt_sigreturn. The current C code for do_sigreturn and do_rt_sigreturn -dig into the stack to create local pointers to the saved switch stack -and the pt_regs structs. - -The motivation for this change is a problem with non-MMU targets that -have broken signal return paths on newer versions of gcc. It appears as -though gcc has determined that the pointers into the saved stack structs, -and the saved structs themselves, are function parameters and updates to -them will be lost on function return, so they are optimized away. This -results in large parts of restore_sigcontext() and mangle_kernel_stack() -functions being removed. Of course this results in non-functional code -causing kernel oops. This problem has been observed with gcc version -5.2 and 5.3, and probably exists in earlier versions as well. - -Using conventional stack parameter pointers passed to these functions has -the advantage of the code here not needing to know the exact details of -how the underlying entry handler layed these structs out on the stack. -So the rather ugly pointer setup casting and arg referencing can be -removed. - -The resulting code after this change is a few bytes larger (due to the -overhead of creating the stack args and their tear down). Not being hot -paths I don't think this is too much of a problem here. - -An alternative solution is to put a barrier() in the do_sigreturn() code, -but this doesn't feel quite as clean as this solution. - -This change has been compile tested on all defconfigs, and run tested on -Atari (through aranym), ColdFire with MMU (M5407EVB) and ColdFire with -no-MMU (QEMU and M5208EVB). - -Signed-off-by: Greg Ungerer -Acked-by: Andreas Schwab -Signed-off-by: Geert Uytterhoeven ---- - arch/m68k/kernel/entry.S | 6 ++++++ - arch/m68k/kernel/signal.c | 8 ++------ - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S -index b54ac7a..97cd3ea 100644 ---- a/arch/m68k/kernel/entry.S -+++ b/arch/m68k/kernel/entry.S -@@ -71,13 +71,19 @@ ENTRY(__sys_vfork) - - ENTRY(sys_sigreturn) - SAVE_SWITCH_STACK -+ movel %sp,%sp@- | switch_stack pointer -+ pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer - jbsr do_sigreturn -+ addql #8,%sp - RESTORE_SWITCH_STACK - rts - - ENTRY(sys_rt_sigreturn) - SAVE_SWITCH_STACK -+ movel %sp,%sp@- | switch_stack pointer -+ pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer - jbsr do_rt_sigreturn -+ addql #8,%sp - RESTORE_SWITCH_STACK - rts - -diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c -index af1c4f3..2dcee3a 100644 ---- a/arch/m68k/kernel/signal.c -+++ b/arch/m68k/kernel/signal.c -@@ -737,10 +737,8 @@ badframe: - return 1; - } - --asmlinkage int do_sigreturn(unsigned long __unused) -+asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw) - { -- struct switch_stack *sw = (struct switch_stack *) &__unused; -- struct pt_regs *regs = (struct pt_regs *) (sw + 1); - unsigned long usp = rdusp(); - struct sigframe __user *frame = (struct sigframe __user *)(usp - 4); - sigset_t set; -@@ -764,10 +762,8 @@ badframe: - return 0; - } - --asmlinkage int do_rt_sigreturn(unsigned long __unused) -+asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw) - { -- struct switch_stack *sw = (struct switch_stack *) &__unused; -- struct pt_regs *regs = (struct pt_regs *) (sw + 1); - unsigned long usp = rdusp(); - struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(usp - 4); - sigset_t set; --- -cgit v0.12 - diff --git a/target/linux/patches/4.4.128/crisv32.patch b/target/linux/patches/4.4.128/crisv32.patch deleted file mode 100644 index cb9b0d028..000000000 --- a/target/linux/patches/4.4.128/crisv32.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur linux-4.4.13.orig/arch/cris/arch-v32/mm/intmem.c linux-4.4.13/arch/cris/arch-v32/mm/intmem.c ---- linux-4.4.13.orig/arch/cris/arch-v32/mm/intmem.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/cris/arch-v32/mm/intmem.c 2016-06-21 20:40:18.919361891 +0200 -@@ -113,14 +113,14 @@ - - allocation->status = STATUS_FREE; - /* Join with prev and/or next if also free */ -- if ((prev != &intmem_allocations) && -+ if ((&prev->entry != &intmem_allocations) && - (prev->status == STATUS_FREE)) { - prev->size += allocation->size; - list_del(&allocation->entry); - kfree(allocation); - allocation = prev; - } -- if ((next != &intmem_allocations) && -+ if ((&next->entry != &intmem_allocations) && - (next->status == STATUS_FREE)) { - allocation->size += next->size; - list_del(&next->entry); -@@ -145,5 +145,11 @@ - (unsigned long)intmem_virtual + MEM_INTMEM_START + - RESERVED_SIZE); - } --device_initcall(crisv32_intmem_init); - -+static int __init crisv32_intmem_setup(void) -+{ -+ crisv32_intmem_init(); -+ -+ return 0; -+} -+device_initcall(crisv32_intmem_setup); diff --git a/target/linux/patches/4.4.128/crisv32_ethernet_driver.patch b/target/linux/patches/4.4.128/crisv32_ethernet_driver.patch deleted file mode 100644 index 0cef202fc..000000000 --- a/target/linux/patches/4.4.128/crisv32_ethernet_driver.patch +++ /dev/null @@ -1,4048 +0,0 @@ -diff -Nur linux-4.7.3.orig/arch/cris/arch-v32/drivers/Kconfig linux-4.7.3/arch/cris/arch-v32/drivers/Kconfig ---- linux-4.7.3.orig/arch/cris/arch-v32/drivers/Kconfig 2016-09-07 08:35:12.000000000 +0200 -+++ linux-4.7.3/arch/cris/arch-v32/drivers/Kconfig 2016-09-13 01:47:09.507717605 +0200 -@@ -8,9 +8,18 @@ - This option enables the ETRAX FS built-in 10/100Mbit Ethernet - controller. - -+config ETRAX_HAVE_PHY -+ bool "PHY present" -+ default y -+ help -+ Search and use the first PHY available on the MDIO bus. Fail -+ if none is found. Say Y here if you are not in a switched -+ environment (single port device). -+ - config ETRAX_NO_PHY - bool "PHY not present" - depends on ETRAX_ETHERNET -+ default n - help - This option disables all MDIO communication with an ethernet - transceiver connected to the MII interface. This option shall -@@ -18,6 +27,70 @@ - switch. This option should normally be disabled. If enabled, - speed and duplex will be locked to 100 Mbit and full duplex. - -+config ETRAX_PHY_FALLBACK -+ bool "Fixed PHY fallback" -+ depends on ETRAX_ETHERNET -+ default n -+ help -+ If no PHY is found on the MDIO bus, fall back on a fixed -+ 100/Full fixed PHY. Say Y here if you need dynamic PHY -+ presence detection (switch connection where some but not -+ all ports have integrated PHYs), otherwise say N. -+ -+config ETRAX_ETHERNET_IFACE0 -+ depends on ETRAX_ETHERNET -+ bool "Enable network interface 0" -+ -+config ETRAX_ETHERNET_IFACE1 -+ depends on (ETRAX_ETHERNET && ETRAXFS) -+ bool "Enable network interface 1 (uses DMA6 and DMA7)" -+ -+choice -+ prompt "Eth0 led group" -+ depends on ETRAX_ETHERNET_IFACE0 -+ default ETRAX_ETH0_USE_LEDGRP0 -+ -+config ETRAX_ETH0_USE_LEDGRP0 -+ bool "Use LED grp 0" -+ depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO -+ help -+ Use LED grp 0 for eth0 -+ -+config ETRAX_ETH0_USE_LEDGRP1 -+ bool "Use LED grp 1" -+ depends on ETRAX_NBR_LED_GRP_TWO -+ help -+ Use LED grp 1 for eth0 -+ -+config ETRAX_ETH0_USE_LEDGRPNULL -+ bool "Use no LEDs for eth0" -+ help -+ Use no LEDs for eth0 -+endchoice -+ -+choice -+ prompt "Eth1 led group" -+ depends on ETRAX_ETHERNET_IFACE1 -+ default ETRAX_ETH1_USE_LEDGRP1 -+ -+config ETRAX_ETH1_USE_LEDGRP0 -+ bool "Use LED grp 0" -+ depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO -+ help -+ Use LED grp 0 for eth1 -+ -+config ETRAX_ETH1_USE_LEDGRP1 -+ bool "Use LED grp 1" -+ depends on ETRAX_NBR_LED_GRP_TWO -+ help -+ Use LED grp 1 for eth1 -+ -+config ETRAX_ETH1_USE_LEDGRPNULL -+ bool "Use no LEDs for eth1" -+ help -+ Use no LEDs for eth1 -+endchoice -+ - config ETRAXFS_SERIAL - bool "Serial-port support" - depends on ETRAX_ARCH_V32 -diff -Nur linux-4.7.3.orig/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h linux-4.7.3/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h ---- linux-4.7.3.orig/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h 2016-09-07 08:35:12.000000000 +0200 -+++ linux-4.7.3/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h 2016-09-13 01:47:09.527718381 +0200 -@@ -2,69 +2,64 @@ - #define __eth_defs_h - - /* -- * This file is autogenerated from -- * file: eth.r -- * id: eth_regs.r,v 1.16 2005/05/20 15:41:22 perz Exp -- * last modfied: Mon Jan 9 06:06:41 2006 -- * -- * by /n/asic/design/tools/rdesc/rdes2c eth.r -- * id: $Id: eth_defs.h,v 1.7 2006/01/26 13:45:30 karljope Exp $ -- * Any changes here will be lost. -- * -- * -*- buffer-read-only: t -*- -+ * Note: Previously this was autogenerated code from the hardware -+ * implementation. However, to enable the same file to be used -+ * for both ARTPEC-3 and ETRAX FS this file is now hand-edited. -+ * Be careful. - */ -+ - /* Main access macros */ - #ifndef REG_RD - #define REG_RD( scope, inst, reg ) \ -- REG_READ( reg_##scope##_##reg, \ -- (inst) + REG_RD_ADDR_##scope##_##reg ) -+ REG_READ( reg_##scope##_##reg, \ -+ (inst) + REG_RD_ADDR_##scope##_##reg ) - #endif - - #ifndef REG_WR - #define REG_WR( scope, inst, reg, val ) \ -- REG_WRITE( reg_##scope##_##reg, \ -- (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -+ REG_WRITE( reg_##scope##_##reg, \ -+ (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) - #endif - - #ifndef REG_RD_VECT - #define REG_RD_VECT( scope, inst, reg, index ) \ -- REG_READ( reg_##scope##_##reg, \ -- (inst) + REG_RD_ADDR_##scope##_##reg + \ -- (index) * STRIDE_##scope##_##reg ) -+ REG_READ( reg_##scope##_##reg, \ -+ (inst) + REG_RD_ADDR_##scope##_##reg + \ -+ (index) * STRIDE_##scope##_##reg ) - #endif - - #ifndef REG_WR_VECT - #define REG_WR_VECT( scope, inst, reg, index, val ) \ -- REG_WRITE( reg_##scope##_##reg, \ -- (inst) + REG_WR_ADDR_##scope##_##reg + \ -- (index) * STRIDE_##scope##_##reg, (val) ) -+ REG_WRITE( reg_##scope##_##reg, \ -+ (inst) + REG_WR_ADDR_##scope##_##reg + \ -+ (index) * STRIDE_##scope##_##reg, (val) ) - #endif - - #ifndef REG_RD_INT - #define REG_RD_INT( scope, inst, reg ) \ -- REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) -+ REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) - #endif - - #ifndef REG_WR_INT - #define REG_WR_INT( scope, inst, reg, val ) \ -- REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) -+ REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) - #endif - - #ifndef REG_RD_INT_VECT - #define REG_RD_INT_VECT( scope, inst, reg, index ) \ -- REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ -- (index) * STRIDE_##scope##_##reg ) -+ REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ -+ (index) * STRIDE_##scope##_##reg ) - #endif - - #ifndef REG_WR_INT_VECT - #define REG_WR_INT_VECT( scope, inst, reg, index, val ) \ -- REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ -- (index) * STRIDE_##scope##_##reg, (val) ) -+ REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ -+ (index) * STRIDE_##scope##_##reg, (val) ) - #endif - - #ifndef REG_TYPE_CONV - #define REG_TYPE_CONV( type, orgtype, val ) \ -- ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) -+ ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) - #endif - - #ifndef reg_page_size -@@ -73,306 +68,332 @@ - - #ifndef REG_ADDR - #define REG_ADDR( scope, inst, reg ) \ -- ( (inst) + REG_RD_ADDR_##scope##_##reg ) -+ ( (inst) + REG_RD_ADDR_##scope##_##reg ) - #endif - - #ifndef REG_ADDR_VECT - #define REG_ADDR_VECT( scope, inst, reg, index ) \ -- ( (inst) + REG_RD_ADDR_##scope##_##reg + \ -- (index) * STRIDE_##scope##_##reg ) -+ ( (inst) + REG_RD_ADDR_##scope##_##reg + \ -+ (index) * STRIDE_##scope##_##reg ) - #endif - - /* C-code for register scope eth */ - - /* Register rw_ma0_lo, scope eth, type rw */ - typedef struct { -- unsigned int addr : 32; -+ unsigned int addr : 32; - } reg_eth_rw_ma0_lo; - #define REG_RD_ADDR_eth_rw_ma0_lo 0 - #define REG_WR_ADDR_eth_rw_ma0_lo 0 - - /* Register rw_ma0_hi, scope eth, type rw */ - typedef struct { -- unsigned int addr : 16; -- unsigned int dummy1 : 16; -+ unsigned int addr : 16; -+ unsigned int dummy1 : 16; - } reg_eth_rw_ma0_hi; - #define REG_RD_ADDR_eth_rw_ma0_hi 4 - #define REG_WR_ADDR_eth_rw_ma0_hi 4 - - /* Register rw_ma1_lo, scope eth, type rw */ - typedef struct { -- unsigned int addr : 32; -+ unsigned int addr : 32; - } reg_eth_rw_ma1_lo; - #define REG_RD_ADDR_eth_rw_ma1_lo 8 - #define REG_WR_ADDR_eth_rw_ma1_lo 8 - - /* Register rw_ma1_hi, scope eth, type rw */ - typedef struct { -- unsigned int addr : 16; -- unsigned int dummy1 : 16; -+ unsigned int addr : 16; -+ unsigned int dummy1 : 16; - } reg_eth_rw_ma1_hi; - #define REG_RD_ADDR_eth_rw_ma1_hi 12 - #define REG_WR_ADDR_eth_rw_ma1_hi 12 - - /* Register rw_ga_lo, scope eth, type rw */ - typedef struct { -- unsigned int tbl : 32; -+ unsigned int table : 32; - } reg_eth_rw_ga_lo; - #define REG_RD_ADDR_eth_rw_ga_lo 16 - #define REG_WR_ADDR_eth_rw_ga_lo 16 - - /* Register rw_ga_hi, scope eth, type rw */ - typedef struct { -- unsigned int tbl : 32; -+ unsigned int table : 32; - } reg_eth_rw_ga_hi; - #define REG_RD_ADDR_eth_rw_ga_hi 20 - #define REG_WR_ADDR_eth_rw_ga_hi 20 - - /* Register rw_gen_ctrl, scope eth, type rw */ - typedef struct { -- unsigned int en : 1; -- unsigned int phy : 2; -- unsigned int protocol : 1; -- unsigned int loopback : 1; -- unsigned int flow_ctrl : 1; -- unsigned int gtxclk_out : 1; -- unsigned int phyrst_n : 1; -- unsigned int dummy1 : 24; -+ unsigned int en : 1; -+ unsigned int phy : 2; -+ unsigned int protocol : 1; -+ unsigned int loopback : 1; -+ unsigned int flow_ctrl : 1; -+ unsigned int gtxclk_out : 1; -+ unsigned int phyrst_n : 1; -+ unsigned int dummy1 : 24; - } reg_eth_rw_gen_ctrl; - #define REG_RD_ADDR_eth_rw_gen_ctrl 24 - #define REG_WR_ADDR_eth_rw_gen_ctrl 24 - - /* Register rw_rec_ctrl, scope eth, type rw */ - typedef struct { -- unsigned int ma0 : 1; -- unsigned int ma1 : 1; -- unsigned int individual : 1; -- unsigned int broadcast : 1; -- unsigned int undersize : 1; -- unsigned int oversize : 1; -- unsigned int bad_crc : 1; -- unsigned int duplex : 1; -- unsigned int max_size : 16; -- unsigned int dummy1 : 8; -+ unsigned int ma0 : 1; -+ unsigned int ma1 : 1; -+ unsigned int individual : 1; -+ unsigned int broadcast : 1; -+ unsigned int undersize : 1; -+ unsigned int oversize : 1; -+ unsigned int bad_crc : 1; -+ unsigned int duplex : 1; -+#ifdef CONFIG_CRIS_MACH_ARTPEC3 -+ unsigned int max_size : 16; -+ unsigned int dummy1 : 8; -+#else -+ unsigned int max_size : 1; -+ unsigned int dummy1 : 23; -+#endif - } reg_eth_rw_rec_ctrl; - #define REG_RD_ADDR_eth_rw_rec_ctrl 28 - #define REG_WR_ADDR_eth_rw_rec_ctrl 28 - - /* Register rw_tr_ctrl, scope eth, type rw */ - typedef struct { -- unsigned int crc : 1; -- unsigned int pad : 1; -- unsigned int retry : 1; -- unsigned int ignore_col : 1; -- unsigned int cancel : 1; -- unsigned int hsh_delay : 1; -- unsigned int ignore_crs : 1; -- unsigned int carrier_ext : 1; -- unsigned int dummy1 : 24; -+ unsigned int crc : 1; -+ unsigned int pad : 1; -+ unsigned int retry : 1; -+ unsigned int ignore_col : 1; -+ unsigned int cancel : 1; -+ unsigned int hsh_delay : 1; -+ unsigned int ignore_crs : 1; -+ unsigned int carrier_ext : 1; -+ unsigned int dummy1 : 24; - } reg_eth_rw_tr_ctrl; - #define REG_RD_ADDR_eth_rw_tr_ctrl 32 - #define REG_WR_ADDR_eth_rw_tr_ctrl 32 - - /* Register rw_clr_err, scope eth, type rw */ - typedef struct { -- unsigned int clr : 1; -- unsigned int dummy1 : 31; -+ unsigned int clr : 1; -+ unsigned int dummy1 : 31; - } reg_eth_rw_clr_err; - #define REG_RD_ADDR_eth_rw_clr_err 36 - #define REG_WR_ADDR_eth_rw_clr_err 36 - - /* Register rw_mgm_ctrl, scope eth, type rw */ - typedef struct { -- unsigned int mdio : 1; -- unsigned int mdoe : 1; -- unsigned int mdc : 1; -- unsigned int dummy1 : 29; -+ unsigned int mdio : 1; -+ unsigned int mdoe : 1; -+ unsigned int mdc : 1; -+ unsigned int phyclk : 1; -+ unsigned int txdata : 4; -+ unsigned int txen : 1; -+ unsigned int dummy1 : 23; - } reg_eth_rw_mgm