summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-4.3/997-device_tree_cmdline.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-10-11 19:08:08 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-10-11 19:08:08 +0000
commitb5842aed82e0c9101e99ec4bcf5959b931e98989 (patch)
treef9749eb8ce7d61f284cc4d91bac5aafd07de8344 /target/linux/generic/patches-4.3/997-device_tree_cmdline.patch
parent3d1a65adb41db2758827fe81f36d92ab61618ea3 (diff)
downloadmtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.zip
mtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.gz
mtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.bz2
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47182
Diffstat (limited to 'target/linux/generic/patches-4.3/997-device_tree_cmdline.patch')
-rw-r--r--target/linux/generic/patches-4.3/997-device_tree_cmdline.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/997-device_tree_cmdline.patch b/target/linux/generic/patches-4.3/997-device_tree_cmdline.patch
new file mode 100644
index 0000000..5708085
--- /dev/null
+++ b/target/linux/generic/patches-4.3/997-device_tree_cmdline.patch
@@ -0,0 +1,24 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -947,6 +947,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));
++ p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++ if (p != NULL && l > 0)
++ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
+
+ /*
+ * CONFIG_CMDLINE is meant to be a default in case nothing else
+--- a/arch/mips/kernel/prom.c
++++ b/arch/mips/kernel/prom.c
+@@ -51,6 +51,9 @@ void * __init early_init_dt_alloc_memory
+
+ void __init __dt_setup_arch(void *bph)
+ {
++ if (boot_command_line[0] == '\0')
++ strcpy(boot_command_line, arcs_cmdline);
++
+ if (!early_init_dt_scan(bph))
+ return;
+