summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-02-20 22:07:53 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-02-20 22:07:53 +0100
commit3430a34a89f7fe2b49ad572fa094e1a8c0f83128 (patch)
tree7bd615e0b1919767ea4815053876e14eb8c79b97 /target
parentdf2a309446830f36b688cba5b777e996792aa14e (diff)
kernel: update to latest
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.kernelversion21
-rw-r--r--target/linux/patches/4.2.6/cris-header.patch12
-rw-r--r--target/linux/patches/4.2.6/initramfs-nosizelimit.patch57
-rw-r--r--target/linux/patches/4.2.6/startup.patch37
-rw-r--r--target/linux/patches/4.3.5/cris-header.patch12
-rw-r--r--target/linux/patches/4.3.5/h8300.patch29
-rw-r--r--target/linux/patches/4.3.5/initramfs-nosizelimit.patch57
-rw-r--r--target/linux/patches/4.3.5/startup.patch37
8 files changed, 7 insertions, 255 deletions
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 2b758d9c9..65173d7c0 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -4,25 +4,21 @@
choice
prompt "Kernel Version"
depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_TARGET_KERNEL_VERSION_4_3_5 if ADK_TARGET_ARCH_ARC
-default ADK_TARGET_KERNEL_VERSION_4_3_5 if ADK_TARGET_ARCH_SPARC
-default ADK_TARGET_KERNEL_VERSION_4_3_5 if ADK_TARGET_ARCH_BFIN
-default ADK_TARGET_KERNEL_VERSION_4_3_5 if ADK_TARGET_ARCH_H8300
-default ADK_TARGET_KERNEL_VERSION_4_3_5 if ADK_TARGET_ARCH_PPC64
+default ADK_TARGET_KERNEL_VERSION_4_4_2 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_KERNEL_VERSION_4_4_2 if ADK_TARGET_ARCH_SPARC
+default ADK_TARGET_KERNEL_VERSION_4_4_2 if ADK_TARGET_ARCH_BFIN
+default ADK_TARGET_KERNEL_VERSION_4_4_2 if ADK_TARGET_ARCH_H8300
+default ADK_TARGET_KERNEL_VERSION_4_4_2 if ADK_TARGET_ARCH_PPC64
default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
default ADK_TARGET_KERNEL_VERSION_4_1_16
config ADK_TARGET_KERNEL_VERSION_GIT
bool "linux-git"
-config ADK_TARGET_KERNEL_VERSION_4_4_1
- bool "4.4.1"
+config ADK_TARGET_KERNEL_VERSION_4_4_2
+ bool "4.4.2"
select ADK_TARGET_KERNEL_VERSION_4_4
-config ADK_TARGET_KERNEL_VERSION_4_3_5
- bool "4.3.5"
- select ADK_TARGET_KERNEL_VERSION_4_3
-
config ADK_TARGET_KERNEL_VERSION_4_1_16
bool "4.1.16"
depends on !ADK_TARGET_ARCH_ARC
@@ -147,9 +143,6 @@ config ADK_TARGET_KERNEL_HASH
config ADK_TARGET_KERNEL_VERSION_4_4
bool
-config ADK_TARGET_KERNEL_VERSION_4_3
- bool
-
config ADK_TARGET_KERNEL_VERSION_4_1
bool
diff --git a/target/linux/patches/4.2.6/cris-header.patch b/target/linux/patches/4.2.6/cris-header.patch
deleted file mode 100644
index 2b5a88461..000000000
--- a/target/linux/patches/4.2.6/cris-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild
---- linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200
-+++ linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild 2014-09-26 19:24:50.000000000 +0200
-@@ -1 +1,2 @@
- # CRISv10 arch
-+header-y += ptrace.h
-diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild
---- linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200
-+++ linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild 2014-09-26 19:24:31.000000000 +0200
-@@ -1 +1,2 @@
- # CRISv32 arch
-+header-y += ptrace.h
diff --git a/target/linux/patches/4.2.6/initramfs-nosizelimit.patch b/target/linux/patches/4.2.6/initramfs-nosizelimit.patch
deleted file mode 100644
index 40d2f6bd8..000000000
--- a/target/linux/patches/4.2.6/initramfs-nosizelimit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9a18df7a71bfa620b1278777d64783a359d7eb4e Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@mirbsd.org>
-Date: Sun, 4 May 2014 01:37:54 +0200
-Subject: [PATCH] mount tmpfs-as-rootfs (initramfs) with -o
- nr_blocks=0,nr_inodes=0
-
-I would have preferred to write this patch to be able to pass
-rootflags=nr_blocks=0,nr_inodes=0 on the kernel command line,
-and then hand these rootflags over to the initramfs (tmpfs)
-mount in the same way the kernel hands them over to the block
-device rootfs mount. But at least the Debian/m68k initrd also
-parses $rootflags from the environment and adds it to the call
-to the user-space mount for the eventual root device, which
-would make the kernel command line rootflags option be used in
-both places (tmpfs and e.g. ext4) which is guaranteed to error
-out in at least one of them.
-
-This change is intended to aid people in a setup where the
-initrd is the final root filesystem, i.e. not mounted over.
-This is especially useful in automated tests running on qemu
-for boards with constrained memory (e.g. 64 MiB on sh4).
-
-Considering that the initramfs is normally emptied out then
-overmounted, this change is probably safe for setups where
-initramfs just hosts early userspace, too, since the tmpfs
-backing it is not accessible any more later on, AFAICT.
-
-Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
----
- init/do_mounts.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..55a4cfe 100644
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -594,6 +594,7 @@ out:
- }
-
- 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)
- {
-@@ -606,6 +607,9 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- 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);
- }
-
---
-2.0.0.rc0
-
diff --git a/target/linux/patches/4.2.6/startup.patch b/target/linux/patches/4.2.6/startup.patch
deleted file mode 100644
index d396b75e4..000000000
--- a/target/linux/patches/4.2.6/startup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
---- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100
-@@ -916,6 +917,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);
- /*
-diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c
---- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100
-@@ -622,6 +622,9 @@
- */
- load_default_modules();
- }
-+#ifdef CONFIG_DEVTMPFS_MOUNT
-+ devtmpfs_mount("dev");
-+#endif
- return 0;
- }
- rootfs_initcall(populate_rootfs);
-diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c
---- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100
-@@ -924,7 +924,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.3.5/cris-header.patch b/target/linux/patches/4.3.5/cris-header.patch
deleted file mode 100644
index 2b5a88461..000000000
--- a/target/linux/patches/4.3.5/cris-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild
---- linux-3.16.2.orig/arch/cris/include/arch-v10/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200
-+++ linux-3.16.2/arch/cris/include/arch-v10/arch/Kbuild 2014-09-26 19:24:50.000000000 +0200
-@@ -1 +1,2 @@
- # CRISv10 arch
-+header-y += ptrace.h
-diff -Nur linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild
---- linux-3.16.2.orig/arch/cris/include/arch-v32/arch/Kbuild 2014-09-06 01:37:11.000000000 +0200
-+++ linux-3.16.2/arch/cris/include/arch-v32/arch/Kbuild 2014-09-26 19:24:31.000000000 +0200
-@@ -1 +1,2 @@
- # CRISv32 arch
-+header-y += ptrace.h
diff --git a/target/linux/patches/4.3.5/h8300.patch b/target/linux/patches/4.3.5/h8300.patch
deleted file mode 100644
index fc45e6529..000000000
--- a/target/linux/patches/4.3.5/h8300.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur linux-4.3.orig/include/asm-generic/uaccess.h linux-4.3/include/asm-generic/uaccess.h
---- linux-4.3.orig/include/asm-generic/uaccess.h 2015-11-02 01:05:25.000000000 +0100
-+++ linux-4.3/include/asm-generic/uaccess.h 2015-11-17 13:01:11.745876944 +0100
-@@ -163,9 +163,10 @@
-
- #define put_user(x, ptr) \
- ({ \
-+ __typeof__((ptr)) __p = (ptr); \
- might_fault(); \
-- access_ok(VERIFY_WRITE, ptr, sizeof(*ptr)) ? \
-- __put_user(x, ptr) : \
-+ access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ? \
-+ __put_user((x), __p) : \
- -EFAULT; \
- })
-
-@@ -225,9 +226,10 @@
-
- #define get_user(x, ptr) \
- ({ \
-+ __typeof__((ptr)) __p = (ptr); \
- might_fault(); \
-- access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \
-- __get_user(x, ptr) : \
-+ access_ok(VERIFY_READ, __p, sizeof(*__p)) ? \
-+ __get_user((x), __p) : \
- -EFAULT; \
- })
-
diff --git a/target/linux/patches/4.3.5/initramfs-nosizelimit.patch b/target/linux/patches/4.3.5/initramfs-nosizelimit.patch
deleted file mode 100644
index 40d2f6bd8..000000000
--- a/target/linux/patches/4.3.5/initramfs-nosizelimit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9a18df7a71bfa620b1278777d64783a359d7eb4e Mon Sep 17 00:00:00 2001
-From: Thorsten Glaser <tg@mirbsd.org>
-Date: Sun, 4 May 2014 01:37:54 +0200
-Subject: [PATCH] mount tmpfs-as-rootfs (initramfs) with -o
- nr_blocks=0,nr_inodes=0
-
-I would have preferred to write this patch to be able to pass
-rootflags=nr_blocks=0,nr_inodes=0 on the kernel command line,
-and then hand these rootflags over to the initramfs (tmpfs)
-mount in the same way the kernel hands them over to the block
-device rootfs mount. But at least the Debian/m68k initrd also
-parses $rootflags from the environment and adds it to the call
-to the user-space mount for the eventual root device, which
-would make the kernel command line rootflags option be used in
-both places (tmpfs and e.g. ext4) which is guaranteed to error
-out in at least one of them.
-
-This change is intended to aid people in a setup where the
-initrd is the final root filesystem, i.e. not mounted over.
-This is especially useful in automated tests running on qemu
-for boards with constrained memory (e.g. 64 MiB on sh4).
-
-Considering that the initramfs is normally emptied out then
-overmounted, this change is probably safe for setups where
-initramfs just hosts early userspace, too, since the tmpfs
-backing it is not accessible any more later on, AFAICT.
-
-Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
----
- init/do_mounts.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 82f2288..55a4cfe 100644
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -594,6 +594,7 @@ out:
- }
-
- 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)
- {
-@@ -606,6 +607,9 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type,
- 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);
- }
-
---
-2.0.0.rc0
-
diff --git a/target/linux/patches/4.3.5/startup.patch b/target/linux/patches/4.3.5/startup.patch
deleted file mode 100644
index d396b75e4..000000000
--- a/target/linux/patches/4.3.5/startup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
---- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100
-+++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100
-@@ -916,6 +917,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);
- /*
-diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c
---- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100
-@@ -622,6 +622,9 @@
- */
- load_default_modules();
- }
-+#ifdef CONFIG_DEVTMPFS_MOUNT
-+ devtmpfs_mount("dev");
-+#endif
- return 0;
- }
- rootfs_initcall(populate_rootfs);
-diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c
---- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100
-+++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100
-@@ -924,7 +924,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;