diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
| commit | 8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405 (patch) | |
| tree | 5039fd0ff8cfb7e66fbbc575c9cf8dacf62eeb17 /target/linux/generic/patches-4.0/997-device_tree_cmdline.patch | |
| parent | d3d69d8a8cee37835d99487e65bb5156ef916dc5 (diff) | |
| download | master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.gz master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.bz2 master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.zip | |
generic: early (incomplete!) 4.0 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/997-device_tree_cmdline.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/997-device_tree_cmdline.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/997-device_tree_cmdline.patch b/target/linux/generic/patches-4.0/997-device_tree_cmdline.patch new file mode 100644 index 0000000000..8063809df1 --- /dev/null +++ b/target/linux/generic/patches-4.0/997-device_tree_cmdline.patch @@ -0,0 +1,24 @@ +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -917,6 +917,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 +@@ -50,6 +50,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; + |