index : openwrt/em-br6478acv2/master-187ad058	master
	openwrt master 187ad058	James

aboutsummaryrefslogtreecommitdiffstats

log msg author committer range

path: root/target/linux/generic/patches-4.1/785-hso-support-0af0-9300.patch

	Commit message (Expand)	Author	Age	Files	Lines
*	generic: add linux 4.1 support	Jonas Gorski	2015-06-22	1	-0/+25

generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 17:09:20 +0000

--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -935,6 +935,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;