diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
| commit | 88655056656fdbd9d021d8de11a6077fb49428da (patch) | |
| tree | d3b641c3c5876ee5e79c67034a95a8fd532a4077 /target/linux/generic/patches-3.14/997-device_tree_cmdline.patch | |
| parent | b66b0ae6323fea7dedd400785c556a39a30cdf4f (diff) | |
| download | mtk-20170518-88655056656fdbd9d021d8de11a6077fb49428da.zip mtk-20170518-88655056656fdbd9d021d8de11a6077fb49428da.tar.gz mtk-20170518-88655056656fdbd9d021d8de11a6077fb49428da.tar.bz2 | |
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 45375
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.patch | 24 |
1 files changed, 0 insertions, 24 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 deleted file mode 100644 index 053c425..0000000 --- a/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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)); -+ 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 -@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory - - void __init __dt_setup_arch(struct boot_param_header *bph) - { -+ if (boot_command_line[0] == '\0') -+ strcpy(boot_command_line, arcs_cmdline); -+ - if (!early_init_dt_scan(bph)) - return; - |