summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-01-25 17:29:41 +0000
committerLuka Perkov <luka@openwrt.org>2015-01-25 17:29:41 +0000
commitee3eade28597b7fe4157c55b816af69a94ca4d0a (patch)
tree9114f91c9f960eacee4cab43bc85c0cf23c0bde1 /target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
parent6fbf35501e410aef676e14a0ce19942fc7f58940 (diff)
downloadmtk-20170518-ee3eade28597b7fe4157c55b816af69a94ca4d0a.zip
mtk-20170518-ee3eade28597b7fe4157c55b816af69a94ca4d0a.tar.gz
mtk-20170518-ee3eade28597b7fe4157c55b816af69a94ca4d0a.tar.bz2
kernel: update 3.14 to 3.14.29
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44137
Diffstat (limited to 'target/linux/generic/patches-3.14/997-device_tree_cmdline.patch')
-rw-r--r--target/linux/generic/patches-3.14/997-device_tree_cmdline.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
index 9a52e15..053c425 100644
--- a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
@@ -1,8 +1,6 @@
-Index: linux-3.14.28/drivers/of/fdt.c
-===================================================================
---- linux-3.14.28.orig/drivers/of/fdt.c 2015-01-08 10:01:03.000000000 -0800
-+++ linux-3.14.28/drivers/of/fdt.c 2015-01-17 20:29:51.674740290 -0800
-@@ -817,6 +817,9 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
@@ -12,11 +10,9 @@ Index: linux-3.14.28/drivers/of/fdt.c
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else
-Index: linux-3.14.28/arch/mips/kernel/prom.c
-===================================================================
---- linux-3.14.28.orig/arch/mips/kernel/prom.c 2015-01-17 20:30:09.922830766 -0800
-+++ linux-3.14.28/arch/mips/kernel/prom.c 2015-01-17 20:30:54.095049815 -0800
-@@ -49,6 +49,9 @@
+--- a/arch/mips/kernel/prom.c
++++ b/arch/mips/kernel/prom.c
+@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
void __init __dt_setup_arch(struct boot_param_header *bph)
{